Fix proposal pool not updated when received block by sync (#4644)

* proposalpool and blockbuilder as blockchain subscriber

* fix test

---------

Co-authored-by: CoderZhi <[email protected]>

Author: envestcc

consensus/scheme/rolldpos/chainmanager.go

@@ -109,13 +109,16 @@ func NewChainManager(bc blockchain.Blockchain, srf StateReaderFactory, bbf Block
 	if err != nil {
 		log.L().Panic("Failed to generate prometheus timer factory.", zap.Error(err))
 	}
+	pool := newProposalPool()
+	bc.AddSubscriber(bbf)
+	bc.AddSubscriber(pool)
 
 	return &chainManager{
 		bc:           bc,
 		bbf:          bbf,
 		timerFactory: timerFactory,
 		srf:          srf,
-		pool:         newProposalPool(),
+		pool:         pool,
 	}
 }
 
@@ -243,18 +246,7 @@ func (cm *chainManager) ValidateBlock(blk *block.Block) error {
 
 // CommitBlock validates and appends a block to the chain
 func (cm *chainManager) CommitBlock(blk *block.Block) error {
-	if err := cm.bc.CommitBlock(blk); err != nil {
-		return err
-	}
-	if err := cm.bbf.ReceiveBlock(blk); err != nil {
-		blkHash := blk.HashBlock()
-		log.L().Error("failed to receive block", zap.Error(err), zap.Uint64("height", blk.Height()), log.Hex("hash", blkHash[:]))
-	}
-	if err := cm.pool.ReceiveBlock(blk); err != nil {
-		blkHash := blk.HashBlock()
-		log.L().Error("failed to receive block", zap.Error(err), zap.Uint64("height", blk.Height()), log.Hex("hash", blkHash[:]))
-	}
-	return nil
+	return cm.bc.CommitBlock(blk)
 }
 
 func (cm *chainManager) Start(ctx context.Context) error {

consensus/scheme/rolldpos/rolldpos_test.go

@@ -77,6 +77,7 @@ func TestNewRollDPoS(t *testing.T) {
 		sk := identityset.PrivateKey(0)
 		chain := mock_blockchain.NewMockBlockchain(ctrl)
 		chain.EXPECT().ChainID().Return(uint32(1)).AnyTimes()
+		chain.EXPECT().AddSubscriber(gomock.Any()).Return(nil).AnyTimes()
 		r, err := NewRollDPoSBuilder().
 			SetConfig(builderCfg).
 			SetPriKey(sk).
@@ -95,6 +96,7 @@ func TestNewRollDPoS(t *testing.T) {
 		sk := identityset.PrivateKey(0)
 		chain := mock_blockchain.NewMockBlockchain(ctrl)
 		chain.EXPECT().ChainID().Return(uint32(1)).AnyTimes()
+		chain.EXPECT().AddSubscriber(gomock.Any()).Return(nil).AnyTimes()
 		r, err := NewRollDPoSBuilder().
 			SetConfig(builderCfg).
 			SetPriKey(sk).
@@ -117,6 +119,7 @@ func TestNewRollDPoS(t *testing.T) {
 		sk := identityset.PrivateKey(0)
 		chain := mock_blockchain.NewMockBlockchain(ctrl)
 		chain.EXPECT().ChainID().Return(uint32(1)).AnyTimes()
+		chain.EXPECT().AddSubscriber(gomock.Any()).Return(nil).AnyTimes()
 		r, err := NewRollDPoSBuilder().
 			SetConfig(builderCfg).
 			SetPriKey(sk).
@@ -209,6 +212,7 @@ func TestValidateBlockFooter(t *testing.T) {
 	bc.EXPECT().TipHeight().Return(blockHeight).AnyTimes()
 	bc.EXPECT().BlockHeaderByHeight(blockHeight).Return(&block.Header{}, nil).AnyTimes()
 	bc.EXPECT().TipHash().Return(hash.ZeroHash256).AnyTimes()
+	bc.EXPECT().AddSubscriber(gomock.Any()).Return(nil).AnyTimes()
 	sk1 := identityset.PrivateKey(1)
 	g := genesis.TestDefault()
 	g.NumDelegates = 4
@@ -303,6 +307,7 @@ func TestRollDPoS_Metrics(t *testing.T) {
 	bc.EXPECT().BlockFooterByHeight(blockHeight).Return(footer, nil).AnyTimes()
 	bc.EXPECT().ChainID().Return(uint32(1)).AnyTimes()
 	bc.EXPECT().BlockHeaderByHeight(blockHeight).Return(&block.Header{}, nil).AnyTimes()
+	bc.EXPECT().AddSubscriber(gomock.Any()).Return(nil).AnyTimes()
 
 	sk1 := identityset.PrivateKey(1)
 	cfg := DefaultConfig