Address review comments for Remove global endpoints (#4887)

Address review comments for Remove global endpoints. Signed-off-by: David Enyeart <enyeart@us.ibm.com>
hyperledger · Jun 6, 2024 · 8dec754 · 8dec754
1 parent e658b85
commit 8dec754
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/common/channelconfig/api.go b/common/channelconfig/api.go
@@ -67,7 +67,7 @@ type Channel interface {
 	// Merkle tree to compute the BlockData hash
 	BlockDataHashingStructureWidth() uint32
 
-	// OrdererAddresses returns the list of valid orderer addresses to connect to invoke Broadcast/Deliver
+	// OrdererAddresses returns the list of valid global orderer addresses (does not include org-specific orderer endpoints)
 	// Deprecated
 	OrdererAddresses() []string
 

diff --git a/common/channelconfig/bundle.go b/common/channelconfig/bundle.go
@@ -93,7 +93,7 @@ func (b *Bundle) ValidateNew(nb Resources) error {
 			}
 		}
 
-		// When we move from V2 to V3 we insist on per Org endpoints for every org
+		// When we move to capability V3_0 we insist on per Org endpoints for every org
 		isOldV3 := b.ChannelConfig().Capabilities().ConsensusTypeBFT()
 		isNewV3 := nb.ChannelConfig().Capabilities().ConsensusTypeBFT()
 		if !isOldV3 && isNewV3 {

diff --git a/common/channelconfig/channel.go b/common/channelconfig/channel.go
@@ -52,7 +52,8 @@ type ChannelValues interface {
 	// Merkle tree to compute the BlockData hash
 	BlockDataHashingStructureWidth() uint32
 
-	// OrdererAddresses returns the list of valid orderer addresses to connect to invoke Broadcast/Deliver
+	// OrdererAddresses returns the list of valid global orderer addresses (does not include org-specific orderer endpoints)
+	// Deprecated
 	OrdererAddresses() []string
 }
 
@@ -224,7 +225,7 @@ func (cc *ChannelConfig) validateOrdererAddresses() error {
 
 func (cc *ChannelConfig) validateNoOrdererAddresses() error {
 	if len(cc.protos.OrdererAddresses.Addresses) > 0 {
-		return fmt.Errorf("global OrdererAddresses are not allowed in V3, use org specific addresses only")
+		return fmt.Errorf("global OrdererAddresses are not allowed with V3_0 capability, use org specific addresses only")
 	}
 	return nil
 }
diff --git a/integration/raft/migration_test.go b/integration/raft/migration_test.go
@@ -676,7 +676,7 @@ func updateOrdererEndpointsConfigFails(n *nwo.Network, orderer *nwo.Orderer, cha
 	})
 	Expect(err).NotTo(HaveOccurred())
 	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(1))
-	Expect(sess.Err).To(gbytes.Say("error applying config update to existing channel 'testchannel': initializing channelconfig failed: global OrdererAddresses are not allowed in V3, use org specific addresses only"))
+	Expect(sess.Err).To(gbytes.Say("error applying config update to existing channel 'testchannel': initializing channelconfig failed: global OrdererAddresses are not allowed with V3_0 capability, use org specific addresses only"))
 }
 
 func prepareTransition(

diff --git a/orderer/common/cluster/util_test.go b/orderer/common/cluster/util_test.go
@@ -452,7 +452,7 @@ func TestEndpointconfigFromConfigBlockGreenPath(t *testing.T) {
 		// In V3, we do not allow global endpoints
 		injectGlobalOrdererEndpoint(t, block, "globalEndpoint", "orgEndpoint")
 		endpointConfig, err := cluster.EndpointconfigFromConfigBlock(block, cryptoProvider)
-		require.EqualError(t, err, "failed extracting bundle from envelope: initializing channelconfig failed: global OrdererAddresses are not allowed in V3, use org specific addresses only")
+		require.EqualError(t, err, "failed extracting bundle from envelope: initializing channelconfig failed: global OrdererAddresses are not allowed with V3_0 capability, use org specific addresses only")
 		require.Nil(t, endpointConfig)
 	})