merge

p2p/client.go

@@ -158,6 +158,18 @@ func (c *Client) StartWithHost(ctx context.Context, h host.Host, isSequencer boo
 			return err
 		}
 	}
+
+	if !c.conf.BlockSyncEnabled {
+		c.logger.Info("Block sync protocol disabled")
+		return nil
+	}
+
+	c.logger.Debug("Setting up block sync protocol")
+	err = c.startBlockSync(ctx)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 

testutil/block.go

@@ -128,7 +128,8 @@ func GetManagerWithProposerKey(conf config.BlockManagerConfig, proposerKey crypt
 	p2pClient.SetTxValidator(p2pValidator.TxValidator(mp, mpIDs))
 	p2pClient.SetBlockValidator(p2pValidator.BlockValidator())
 
-	if err = p2pClient.Start(context.Background(), false); err != nil {
+	manager.P2PClient = p2pClient
+	if err = p2pClient.Start(context.Background()); err != nil {
 		return nil, err
 	}