[FAB-1844] Move common SBFT config parameters

https://jira.hyperledger.org/browse/FAB-1844

There are SBFT config parameters that are shared between
replicas. These were moved to the Genesis block of the
config.

Change-Id: I2b72d3977f20aaccc9996aedafee214a39c0cdfe
Signed-off-by: Gabor Hosszu <[email protected]>

Author: gaborh-da

orderer/localconfig/config.go

@@ -67,6 +67,7 @@ type Genesis struct {
 	OrdererType  string
 	BatchTimeout time.Duration
 	BatchSize    BatchSize
+	SbftShared   SbftShared
 }
 
 // BatchSize contains configuration affecting the size of batches
@@ -101,16 +102,18 @@ type Kafka struct {
 	Version sarama.KafkaVersion
 }
 
-// Sbft contains config for the SBFT orderer
-type Sbft struct {
-	PeerCommAddr       string
-	CertFile           string
-	KeyFile            string
-	DataDir            string
+// SbftLocal contains config for the SBFT peer/replica
+type SbftLocal struct {
+	PeerCommAddr string
+	CertFile     string
+	KeyFile      string
+	DataDir      string
+}
+
+// SbftShared contains config for the SBFT network
+type SbftShared struct {
 	N                  uint64
 	F                  uint64
-	BatchDurationNsec  uint64
-	BatchSizeBytes     uint64
 	RequestTimeoutNsec uint64
 	Peers              map[string]string // Address to Cert mapping
 }
@@ -132,7 +135,7 @@ type TopLevel struct {
 	FileLedger FileLedger
 	Kafka      Kafka
 	Genesis    Genesis
-	Sbft       Sbft
+	SbftLocal  SbftLocal
 }
 
 var defaults = TopLevel{
@@ -175,20 +178,18 @@ var defaults = TopLevel{
 			AbsoluteMaxBytes:  100000000,
 			PreferredMaxBytes: 512 * 1024,
 		},
+		SbftShared: SbftShared{
+			N:                  1,
+			F:                  0,
+			RequestTimeoutNsec: uint64(time.Second.Nanoseconds()),
+			Peers:              map[string]string{":6101": "sbft/testdata/cert1.pem"},
+		},
 	},
-	// TODO move the appropriate parts to Genesis
-	// and use BatchSizeMaxBytes
-	Sbft: Sbft{
-		PeerCommAddr:       ":6101",
-		CertFile:           "sbft/testdata/cert1.pem",
-		KeyFile:            "sbft/testdata/key.pem",
-		DataDir:            "/tmp",
-		N:                  1,
-		F:                  0,
-		BatchDurationNsec:  1000,
-		BatchSizeBytes:     1000000000,
-		RequestTimeoutNsec: 1000000000,
-		Peers:              map[string]string{":6101": "sbft/testdata/cert1.pem"},
+	SbftLocal: SbftLocal{
+		PeerCommAddr: ":6101",
+		CertFile:     "sbft/testdata/cert1.pem",
+		KeyFile:      "sbft/testdata/key.pem",
+		DataDir:      "/tmp",
 	},
 }
 

orderer/main.go

@@ -164,19 +164,20 @@ func main() {
 }
 
 func makeSbftConsensusConfig(conf *config.TopLevel) *sbft.ConsensusConfig {
-	cfg := simplebft.Config{N: conf.Sbft.N, F: conf.Sbft.F, BatchDurationNsec: conf.Sbft.BatchDurationNsec,
-		BatchSizeBytes:     conf.Sbft.BatchSizeBytes,
-		RequestTimeoutNsec: conf.Sbft.RequestTimeoutNsec}
+	cfg := simplebft.Config{N: conf.Genesis.SbftShared.N, F: conf.Genesis.SbftShared.F,
+		BatchDurationNsec:  uint64(conf.Genesis.BatchTimeout),
+		BatchSizeBytes:     uint64(conf.Genesis.BatchSize.AbsoluteMaxBytes),
+		RequestTimeoutNsec: conf.Genesis.SbftShared.RequestTimeoutNsec}
 	peers := make(map[string][]byte)
-	for addr, cert := range conf.Sbft.Peers {
+	for addr, cert := range conf.Genesis.SbftShared.Peers {
 		peers[addr], _ = sbftcrypto.ParseCertPEM(cert)
 	}
 	return &sbft.ConsensusConfig{Consensus: &cfg, Peers: peers}
 }
 
 func makeSbftStackConfig(conf *config.TopLevel) *backend.StackConfig {
-	return &backend.StackConfig{ListenAddr: conf.Sbft.PeerCommAddr,
-		CertFile: conf.Sbft.CertFile,
-		KeyFile:  conf.Sbft.KeyFile,
-		DataDir:  conf.Sbft.DataDir}
+	return &backend.StackConfig{ListenAddr: conf.SbftLocal.PeerCommAddr,
+		CertFile: conf.SbftLocal.CertFile,
+		KeyFile:  conf.SbftLocal.KeyFile,
+		DataDir:  conf.SbftLocal.DataDir}
 }

orderer/network_test.go

@@ -305,19 +305,19 @@ func generateConfigEnv(peerNum uint64, grpcPort int, peerCommPort string, certFi
 	panicOnError(err)
 	envs := []string{}
 	envs = append(envs, fmt.Sprintf("ORDERER_CFG_PATH=%s", ordererDir))
-	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_ORDERERTYPE=%s", "sbft"))
 	envs = append(envs, fmt.Sprintf("ORDERER_GENERAL_LISTENPORT=%d", grpcPort))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_PEERCOMMADDR=%s", peerCommPort))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_CERTFILE=%s", certFile))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_KEYFILE=%s", keyfile))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_DATADIR=%s", tempDir))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_BATCHDURATIONNSEC=%d", 1000))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_BATCHSIZEBYTES=%d", 1000000000))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_REQUESTTIMEOUTNSEC=%d", 1000000000))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_N=%d", peerNum))
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_F=%d", (peerNum-1)/3))
+	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_ORDERERTYPE=%s", "sbft"))
+	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_BATCHTIMEOUT=%d", 1000))
+	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_BATCHSIZE_ABSOLUTEMAXBYTES=%d", 1000000000))
+	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_SBFTSHARED_REQUESTTIMEOUTNSEC=%d", 1000000000))
+	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_SBFTSHARED_N=%d", peerNum))
+	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_SBFTSHARED_F=%d", (peerNum-1)/3))
 	js, _ := json.Marshal(peersWithCerts)
-	envs = append(envs, fmt.Sprintf("ORDERER_SBFT_PEERS=%s", js))
+	envs = append(envs, fmt.Sprintf("ORDERER_GENESIS_SBFTSHARED_PEERS=%s", js))
+	envs = append(envs, fmt.Sprintf("ORDERER_SBFTLOCAL_PEERCOMMADDR=%s", peerCommPort))
+	envs = append(envs, fmt.Sprintf("ORDERER_SBFTLOCAL_CERTFILE=%s", certFile))
+	envs = append(envs, fmt.Sprintf("ORDERER_SBFTLOCAL_KEYFILE=%s", keyfile))
+	envs = append(envs, fmt.Sprintf("ORDERER_SBFTLOCAL_DATADIR=%s", tempDir))
 	return envs
 }
 

orderer/orderer.yaml

@@ -116,28 +116,18 @@ Kafka:
 
 ################################################################################
 #
-#   SECTION: Sbft
+#   SECTION: Sbft local
 #
 #   - This section applies to the configuration of the Sbft-backed orderer
 #
 ################################################################################
-Sbft:
+SbftLocal:
     # Address to use for SBFT internal communication
     PeerCommAddr: ":6101"
     CertFile: "sbft/testdata/cert1.pem"
     KeyFile: "sbft/testdata/key.pem"
     # Directory for SBFT data (persistence)
     DataDir: "/tmp"
-    # Number of peers
-    "N": 1
-    # Fault tolerance
-    F: 0
-    BatchDurationNsec: 1000
-    BatchSizeBytes: 1000000000
-    RequestTimeoutNsec: 1000000000
-    # Peers (PeerCommAddr) with the path of their cert
-    Peers:
-        ":6101": "sbft/testdata/cert1.pem"
 
 ################################################################################
 #
@@ -169,3 +159,15 @@ Genesis:
         # the serialized messages in a batch. A message larger than the preferred
         # max bytes will result in a batch larger than preferred max bytes.
         PreferredMaxBytes: 512 KB
+
+    # Defines the SBFT parameters when 'sbft' is specified as the 'OrdererType'
+    SbftShared:
+        # Number of peers
+        "N": 1
+        # Fault tolerance
+        F: 0
+        # Timeout of requests (seconds)
+        RequestTimeoutNsec: 1000000000
+        # Peers (PeerCommAddr) with the path of their cert
+        Peers:
+            ":6101": "sbft/testdata/cert1.pem"