FAB-14180 Chan. Cap. V1_4_2 Consensus type migration

Add Channel capability V1_4_2 to gate consensus type migration
in the peer and orderer.

When this capablity is on, the peer will allow config transactions which
change Orderer.ConsensusType.Type to pass through the Bundle.ValidateNew().
(This will be implemented in a following change).

Change-Id: If422f0292b0093f589a44e30a1a71dae2872e29a
Signed-off-by: Yoav Tock <tock@il.ibm.com>

Author: tock-ibm

common/capabilities/channel.go

@@ -14,18 +14,22 @@ import (
 const (
 	channelTypeName = "Channel"
 
-	// ChannelV1_1 is the capabilties string for standard new non-backwards compatible fabric v1.1 channel capabilities.
+	// ChannelV1_1 is the capabilities string for standard new non-backwards compatible fabric v1.1 channel capabilities.
 	ChannelV1_1 = "V1_1"
 
-	// ChannelV1_3 is the capabilties string for standard new non-backwards compatible fabric v1.3 channel capabilities.
+	// ChannelV1_3 is the capabilities string for standard new non-backwards compatible fabric v1.3 channel capabilities.
 	ChannelV1_3 = "V1_3"
+
+	// ChannelV1_4_2 is the capabilities string for standard new non-backwards compatible fabric v1.4.2 channel capabilities.
+	ChannelV1_4_2 = "V1_4_2"
 )
 
 // ChannelProvider provides capabilities information for channel level config.
 type ChannelProvider struct {
 	*registry
-	v11 bool
-	v13 bool
+	v11  bool
+	v13  bool
+	v142 bool
 }
 
 // NewChannelProvider creates a channel capabilities provider.
@@ -34,6 +38,7 @@ func NewChannelProvider(capabilities map[string]*cb.Capability) *ChannelProvider
 	cp.registry = newRegistry(cp, capabilities)
 	_, cp.v11 = capabilities[ChannelV1_1]
 	_, cp.v13 = capabilities[ChannelV1_3]
+	_, cp.v142 = capabilities[ChannelV1_4_2]
 	return cp
 }
 
@@ -46,6 +51,8 @@ func (cp *ChannelProvider) Type() string {
 func (cp *ChannelProvider) HasCapability(capability string) bool {
 	switch capability {
 	// Add new capability names here
+	case ChannelV1_4_2:
+		fallthrough
 	case ChannelV1_3:
 		return true
 	case ChannelV1_1:
@@ -58,6 +65,8 @@ func (cp *ChannelProvider) HasCapability(capability string) bool {
 // MSPVersion returns the level of MSP support required by this channel.
 func (cp *ChannelProvider) MSPVersion() msp.MSPVersion {
 	switch {
+	case cp.v142:
+		return msp.MSPv1_3
 	case cp.v13:
 		return msp.MSPv1_3
 	case cp.v11:
@@ -66,3 +75,8 @@ func (cp *ChannelProvider) MSPVersion() msp.MSPVersion {
 		return msp.MSPv1_0
 	}
 }
+
+// ConsensusTypeMigration return true if consensus-type migration is supported and permitted in both orderer and peer.
+func (cp *ChannelProvider) ConsensusTypeMigration() bool {
+	return cp.v142
+}

common/capabilities/channel_test.go

@@ -15,24 +15,60 @@ import (
 )
 
 func TestChannelV10(t *testing.T) {
-	op := NewChannelProvider(map[string]*cb.Capability{})
-	assert.NoError(t, op.Supported())
-	assert.True(t, op.MSPVersion() == msp.MSPv1_0)
+	cp := NewChannelProvider(map[string]*cb.Capability{})
+	assert.NoError(t, cp.Supported())
+	assert.True(t, cp.MSPVersion() == msp.MSPv1_0)
+	assert.False(t, cp.ConsensusTypeMigration())
 }
 
 func TestChannelV11(t *testing.T) {
-	op := NewChannelProvider(map[string]*cb.Capability{
+	cp := NewChannelProvider(map[string]*cb.Capability{
 		ChannelV1_1: {},
 	})
-	assert.NoError(t, op.Supported())
-	assert.True(t, op.MSPVersion() == msp.MSPv1_1)
+	assert.NoError(t, cp.Supported())
+	assert.True(t, cp.MSPVersion() == msp.MSPv1_1)
+	assert.False(t, cp.ConsensusTypeMigration())
 }
 
 func TestChannelV13(t *testing.T) {
-	op := NewChannelProvider(map[string]*cb.Capability{
+	cp := NewChannelProvider(map[string]*cb.Capability{
 		ChannelV1_1: {},
 		ChannelV1_3: {},
 	})
-	assert.NoError(t, op.Supported())
-	assert.True(t, op.MSPVersion() == msp.MSPv1_3)
+	assert.NoError(t, cp.Supported())
+	assert.True(t, cp.MSPVersion() == msp.MSPv1_3)
+	assert.False(t, cp.ConsensusTypeMigration())
+
+	cp = NewChannelProvider(map[string]*cb.Capability{
+		ChannelV1_3: {},
+	})
+	assert.NoError(t, cp.Supported())
+	assert.True(t, cp.MSPVersion() == msp.MSPv1_3)
+	assert.False(t, cp.ConsensusTypeMigration())
+}
+
+func TestChannelV141(t *testing.T) {
+	cp := NewChannelProvider(map[string]*cb.Capability{
+		ChannelV1_3:   {},
+		ChannelV1_4_2: {},
+	})
+	assert.NoError(t, cp.Supported())
+	assert.True(t, cp.MSPVersion() == msp.MSPv1_3)
+	assert.True(t, cp.ConsensusTypeMigration())
+
+	cp = NewChannelProvider(map[string]*cb.Capability{
+		ChannelV1_4_2: {},
+	})
+	assert.NoError(t, cp.Supported())
+	assert.True(t, cp.MSPVersion() == msp.MSPv1_3)
+	assert.True(t, cp.ConsensusTypeMigration())
+}
+
+func TestChannelNotSuported(t *testing.T) {
+	cp := NewChannelProvider(map[string]*cb.Capability{
+		ChannelV1_1:          {},
+		ChannelV1_3:          {},
+		"Bogus_Not_suported": {},
+	})
+	assert.EqualError(t, cp.Supported(), "Channel capability Bogus_Not_suported is required but not supported")
 }