Skip to content

Commit

Permalink
fix consensus.Start()
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinxie committed May 11, 2022
1 parent f31753e commit 6a17a08
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions consensus/scheme/rolldpos/endorsementmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6a17a08

Please sign in to comment.