Raft to BFT migration: functions + tests updates

Signed-off-by: May Rosenbaum <mayro1595@gmail.com>

orderer/common/msgprocessor/maintenancefilter.go

@@ -8,11 +8,14 @@ package msgprocessor
 
 import (
 	"bytes"
+	"time"
+
+	"github.com/SmartBFT-Go/consensus/pkg/types"
 
 	"github.com/golang/protobuf/proto"
 	cb "github.com/hyperledger/fabric-protos-go/common"
 	"github.com/hyperledger/fabric-protos-go/orderer"
-	protoetcdraft "github.com/hyperledger/fabric-protos-go/orderer/etcdraft"
+	"github.com/hyperledger/fabric-protos-go/orderer/smartbft"
 	"github.com/hyperledger/fabric/bccsp"
 	"github.com/hyperledger/fabric/common/channelconfig"
 	"github.com/hyperledger/fabric/common/configtx"
@@ -45,7 +48,6 @@ func NewMaintenanceFilter(support MaintenanceFilterSupport, bccsp bccsp.BCCSP) *
 		permittedTargetConsensusTypes: make(map[string]bool),
 		bccsp:                         bccsp,
 	}
-	mf.permittedTargetConsensusTypes["etcdraft"] = true
 	mf.permittedTargetConsensusTypes["BFT"] = true
 	return mf
 }
@@ -117,7 +119,7 @@ func (mf *MaintenanceFilter) inspect(configEnvelope *cb.ConfigEnvelope, ordererC
 	}
 
 	// ConsensusType.Type can only change in maintenance-mode, and only within the set of permitted types.
-	// Note: only solo to etcdraft transitions are supported.
+	// Note: only etcdraft to BFT transitions are supported.
 	if ordererConfig.ConsensusType() != nextOrdererConfig.ConsensusType() {
 		if ordererConfig.ConsensusState() == orderer.ConsensusType_STATE_NORMAL {
 			return errors.Errorf("attempted to change consensus type from %s to %s, but current config ConsensusType.State is not in maintenance mode",
@@ -133,10 +135,15 @@ func (mf *MaintenanceFilter) inspect(configEnvelope *cb.ConfigEnvelope, ordererC
 				ordererConfig.ConsensusType(), nextOrdererConfig.ConsensusType())
 		}
 
-		if nextOrdererConfig.ConsensusType() == "etcdraft" {
-			updatedMetadata := &protoetcdraft.ConfigMetadata{}
+		if nextOrdererConfig.ConsensusType() == "BFT" {
+			updatedMetadata := &smartbft.Options{}
 			if err := proto.Unmarshal(nextOrdererConfig.ConsensusMetadata(), updatedMetadata); err != nil {
-				return errors.Wrap(err, "failed to unmarshal etcdraft metadata configuration")
+				return errors.Wrap(err, "failed to unmarshal BFT metadata configuration")
+			}
+
+			_, err := validateBFTMetadataOptions(1, updatedMetadata)
+			if updatedMetadata.XXX_unrecognized != nil || err != nil {
+				return errors.New("invalid BFT metadata configuration")
 			}
 		}
 
@@ -197,3 +204,59 @@ func (mf *MaintenanceFilter) ensureConsensusTypeChangeOnly(configEnvelope *cb.Co
 
 	return nil
 }
+
+func validateBFTMetadataOptions(selfID uint64, options *smartbft.Options) (types.Configuration, error) {
+	var err error
+
+	config := types.DefaultConfig
+	config.SelfID = selfID
+
+	if options == nil {
+		return config, errors.New("config metadata options field is nil")
+	}
+
+	config.RequestBatchMaxCount = options.RequestBatchMaxCount
+	config.RequestBatchMaxBytes = options.RequestBatchMaxBytes
+	if config.RequestBatchMaxInterval, err = time.ParseDuration(options.RequestBatchMaxInterval); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option RequestBatchMaxInterval")
+	}
+	config.IncomingMessageBufferSize = options.IncomingMessageBufferSize
+	config.RequestPoolSize = options.RequestPoolSize
+	if config.RequestForwardTimeout, err = time.ParseDuration(options.RequestForwardTimeout); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option RequestForwardTimeout")
+	}
+	if config.RequestComplainTimeout, err = time.ParseDuration(options.RequestComplainTimeout); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option RequestComplainTimeout")
+	}
+	if config.RequestAutoRemoveTimeout, err = time.ParseDuration(options.RequestAutoRemoveTimeout); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option RequestAutoRemoveTimeout")
+	}
+	if config.ViewChangeResendInterval, err = time.ParseDuration(options.ViewChangeResendInterval); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option ViewChangeResendInterval")
+	}
+	if config.ViewChangeTimeout, err = time.ParseDuration(options.ViewChangeTimeout); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option ViewChangeTimeout")
+	}
+	if config.LeaderHeartbeatTimeout, err = time.ParseDuration(options.LeaderHeartbeatTimeout); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option LeaderHeartbeatTimeout")
+	}
+	config.LeaderHeartbeatCount = options.LeaderHeartbeatCount
+	if config.CollectTimeout, err = time.ParseDuration(options.CollectTimeout); err != nil {
+		return config, errors.Wrap(err, "bad config metadata option CollectTimeout")
+	}
+	config.SyncOnStart = options.SyncOnStart
+	config.SpeedUpViewChange = options.SpeedUpViewChange
+
+	config.LeaderRotation = false
+	config.DecisionsPerLeader = 0
+
+	if err = config.Validate(); err != nil {
+		return config, errors.Wrap(err, "config validation failed")
+	}
+
+	if options.RequestMaxBytes == 0 {
+		config.RequestMaxBytes = config.RequestBatchMaxBytes
+	}
+
+	return config, nil
+}