From 24e27bf50f9b00c85faf6563cac33394395e6f0d Mon Sep 17 00:00:00 2001 From: Yoav Tock Date: Tue, 6 Jun 2023 13:32:18 +0300 Subject: [PATCH] Follower: revert check of join block different from fetched block Signed-off-by: Yoav Tock Change-Id: I7089df4f1bfc200a5f17582df0da7d4172f8f09b --- orderer/common/follower/follower_chain.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/orderer/common/follower/follower_chain.go b/orderer/common/follower/follower_chain.go index 5d4bae31291..e6df88210de 100644 --- a/orderer/common/follower/follower_chain.go +++ b/orderer/common/follower/follower_chain.go @@ -11,8 +11,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" - "github.com/hyperledger/fabric-protos-go/common" "github.com/hyperledger/fabric/bccsp" "github.com/hyperledger/fabric/common/flogging" @@ -347,10 +345,6 @@ func (c *Chain) pull() error { c.logger.Info("Onboarding finished successfully, pulled blocks up to join-block") } - if c.joinBlock != nil && !proto.Equal(c.ledgerResources.Block(c.joinBlock.Header.Number).Data, c.joinBlock.Data) { - c.logger.Panicf("Join block (%d) we pulled mismatches block we joined with", c.joinBlock.Header.Number) - } - err = c.pullAfterJoin() if err != nil { return errors.WithMessage(err, "failed to pull after join block")