Ordere v3: remove sys chan: clean consensus (hyperledger#4190)

Change-Id: I600362026a64d792782b3bf9d4037348821a4a4e Signed-off-by: Yoav Tock <[email protected]>
chl-git · May 1, 2023 · d2007e7 · d2007e7
1 parent 6612020
commit d2007e7
Show file tree

Hide file tree

Showing 32 changed files with 266 additions and 791 deletions.
diff --git a/orderer/common/follower/mocks/block_puller_factory.go b/orderer/common/follower/mocks/block_puller_factory.go
diff --git a/orderer/common/follower/mocks/chain_creator.go b/orderer/common/follower/mocks/chain_creator.go
diff --git a/orderer/common/follower/mocks/channel_participation_metrics_reporter.go b/orderer/common/follower/mocks/channel_participation_metrics_reporter.go
diff --git a/orderer/common/follower/mocks/channel_puller.go b/orderer/common/follower/mocks/channel_puller.go
diff --git a/orderer/common/follower/mocks/cluster_consenter.go b/orderer/common/follower/mocks/cluster_consenter.go
diff --git a/orderer/common/follower/mocks/ledger_resources.go b/orderer/common/follower/mocks/ledger_resources.go
diff --git a/orderer/common/follower/mocks/signer_serializer.go b/orderer/common/follower/mocks/signer_serializer.go
diff --git a/orderer/common/follower/mocks/time_after.go b/orderer/common/follower/mocks/time_after.go
diff --git a/orderer/common/multichannel/chainsupport.go b/orderer/common/multichannel/chainsupport.go
@@ -12,11 +12,9 @@ import (
 	"github.com/hyperledger/fabric/common/ledger/blockledger"
 	"github.com/hyperledger/fabric/internal/pkg/identity"
 	"github.com/hyperledger/fabric/orderer/common/blockcutter"
-	"github.com/hyperledger/fabric/orderer/common/localconfig"
 	"github.com/hyperledger/fabric/orderer/common/msgprocessor"
 	"github.com/hyperledger/fabric/orderer/common/types"
 	"github.com/hyperledger/fabric/orderer/consensus"
-	"github.com/hyperledger/fabric/orderer/consensus/inactive"
 	"github.com/hyperledger/fabric/protoutil"
 	"github.com/pkg/errors"
 )
@@ -183,18 +181,3 @@ func (cs *ChainSupport) Sequence() uint64 {
 func (cs *ChainSupport) Append(block *cb.Block) error {
 	return cs.ledgerResources.ReadWriter.Append(block)
 }
-
-func newOnBoardingChainSupport(
-	ledgerResources *ledgerResources,
-	config localconfig.TopLevel,
-	bccsp bccsp.BCCSP,
-) (*ChainSupport, error) {
-	cs := &ChainSupport{ledgerResources: ledgerResources}
-	cs.Processor = msgprocessor.NewStandardChannel(cs, msgprocessor.CreateStandardChannelFilters(cs, config), bccsp)
-	cs.Chain = &inactive.Chain{Err: errors.New("system channel creation pending: server requires restart")}
-	cs.StatusReporter = consensus.StaticStatusReporter{ConsensusRelation: types.ConsensusRelationConsenter, Status: types.StatusInactive}
-
-	logger.Debugf("[channel: %s] Done creating onboarding channel support resources", cs.ChannelID())
-
-	return cs, nil
-}