Insist on policy

Signed-off-by: Yoav Tock <tock@il.ibm.com>
hyperledger · Jun 4, 2024 · 62e1af9 · 62e1af9
1 parent e905423
commit 62e1af9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/core/deliverservice/deliveryclient.go b/core/deliverservice/deliveryclient.go
@@ -133,7 +133,7 @@ func (d *deliverServiceImpl) StartDeliverForChannel(chainID string, ledgerInfo b
 		d.blockDeliverer, err = d.createBlockDelivererCFT(chainID, ledgerInfo)
 	case "BFT":
 		switch d.conf.DeliverServiceConfig.Policy {
-		case "cluster", "":
+		case "cluster":
 			d.blockDeliverer, err = d.createBlockDelivererBFT(chainID, ledgerInfo)
 		case "simple":
 			d.blockDeliverer, err = d.createBlockDelivererCFT(chainID, ledgerInfo)

diff --git a/core/deliverservice/deliveryclient_test.go b/core/deliverservice/deliveryclient_test.go
@@ -178,6 +178,7 @@ func TestStartDeliverForChannel_BFT(t *testing.T) {
 		ds := NewDeliverService(&Config{
 			DeliverServiceConfig: &DeliverServiceConfig{
 				SecOpts: secOpts,
+				Policy:  DefaultPolicy,
 			},
 			ChannelConfig:  channelConfigProto,
 			CryptoProvider: cryptoProvider,
@@ -203,9 +204,11 @@ func TestStartDeliverForChannel_BFT(t *testing.T) {
 
 	t.Run("Green Path without mutual TLS", func(t *testing.T) {
 		ds := NewDeliverService(&Config{
-			DeliverServiceConfig: &DeliverServiceConfig{},
-			ChannelConfig:        channelConfigProto,
-			CryptoProvider:       cryptoProvider,
+			DeliverServiceConfig: &DeliverServiceConfig{
+				Policy: DefaultPolicy,
+			},
+			ChannelConfig:  channelConfigProto,
+			CryptoProvider: cryptoProvider,
 		}).(*deliverServiceImpl)
 
 		finalized := make(chan struct{})
@@ -227,9 +230,11 @@ func TestStartDeliverForChannel_BFT(t *testing.T) {
 
 	t.Run("Can restart for channel: Start->Stop->Start", func(t *testing.T) {
 		ds := NewDeliverService(&Config{
-			DeliverServiceConfig: &DeliverServiceConfig{},
-			ChannelConfig:        channelConfigProto,
-			CryptoProvider:       cryptoProvider,
+			DeliverServiceConfig: &DeliverServiceConfig{
+				Policy: DefaultPolicy,
+			},
+			ChannelConfig:  channelConfigProto,
+			CryptoProvider: cryptoProvider,
 		}).(*deliverServiceImpl)
 
 		finalized := make(chan struct{})
@@ -268,9 +273,11 @@ func TestStartDeliverForChannel_BFT(t *testing.T) {
 		fakeLedgerInfo := fakeLedgerInfoCreator()
 
 		ds := NewDeliverService(&Config{
-			DeliverServiceConfig: &DeliverServiceConfig{},
-			ChannelConfig:        channelConfigProto,
-			CryptoProvider:       cryptoProvider,
+			DeliverServiceConfig: &DeliverServiceConfig{
+				Policy: DefaultPolicy,
+			},
+			ChannelConfig:  channelConfigProto,
+			CryptoProvider: cryptoProvider,
 		}).(*deliverServiceImpl)
 
 		err := ds.StartDeliverForChannel("channel-id", fakeLedgerInfo, func() {})
@@ -290,6 +297,21 @@ func TestStartDeliverForChannel_BFT(t *testing.T) {
 		err := ds.StartDeliverForChannel("channel-id", fakeLedgerInfoCreator(), func() {})
 		require.EqualError(t, err, "block deliverer for channel `channel-id` is stopping")
 	})
+
+	t.Run("Bad policy", func(t *testing.T) {
+		fakeLedgerInfo := fakeLedgerInfoCreator()
+
+		ds := NewDeliverService(&Config{
+			DeliverServiceConfig: &DeliverServiceConfig{
+				Policy: "bogus",
+			},
+			ChannelConfig:  channelConfigProto,
+			CryptoProvider: cryptoProvider,
+		}).(*deliverServiceImpl)
+
+		err := ds.StartDeliverForChannel("channel-id", fakeLedgerInfo, func() {})
+		require.EqualError(t, err, "unexpected delivey service policy: `bogus`")
+	})
 }
 
 func TestStopDeliverForChannel(t *testing.T) {