From 6a17a08afb40edc228fa69612ca8dc83ac931493 Mon Sep 17 00:00:00 2001 From: Dustin Xie Date: Mon, 9 May 2022 19:06:47 -0700 Subject: [PATCH] fix consensus.Start() --- consensus/scheme/rolldpos/endorsementmanager.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/consensus/scheme/rolldpos/endorsementmanager.go b/consensus/scheme/rolldpos/endorsementmanager.go index cd23df110b..814b64d1bb 100644 --- a/consensus/scheme/rolldpos/endorsementmanager.go +++ b/consensus/scheme/rolldpos/endorsementmanager.go @@ -120,11 +120,12 @@ func newBlockEndorsementCollection(blk *block.Block) *blockEndorsementCollection } } -func (bc *blockEndorsementCollection) fromProto(blockPro *endorsementpb.BlockEndorsementCollection, withChainID bool) error { +func (bc *blockEndorsementCollection) fromProto(blockPro *endorsementpb.BlockEndorsementCollection, checker chainIDChecker) error { bc.endorsers = make(map[string]*endorserEndorsementCollection) if blockPro.Blk == nil { bc.blk = nil } else { + withChainID := checker(blockPro.Blk.Header.Core.Height) blk, err := (&block.Deserializer{}).WithChainID(withChainID).FromBlockProto(blockPro.Blk) if err != nil { return err @@ -283,7 +284,7 @@ func (m *endorsementManager) fromProto(managerPro *endorsementpb.EndorsementMana m.collections = make(map[string]*blockEndorsementCollection) for i, block := range managerPro.BlockEndorsements { bc := &blockEndorsementCollection{} - if err := bc.fromProto(block, checker(block.Blk.Header.Core.Height)); err != nil { + if err := bc.fromProto(block, checker); err != nil { return err } m.collections[managerPro.BlkHash[i]] = bc