FAB-11320 Add application v1.3 capability

To enable the new validation associated with the new chaincode
lifecycle, we need a new application level capability for v1.3.  This CR
creates one.

Change-Id: I6629b97c7ce86f12b55f6567f3f29c2fe2586aa5
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

Author: Jason Yellick

common/capabilities/application.go

@@ -19,26 +19,23 @@ const (
 	// ApplicationV1_2 is the capabilties string for standard new non-backwards compatible fabric v1.2 application capabilities.
 	ApplicationV1_2 = "V1_2"
 
+	// ApplicationV1_3 is the capabilties string for standard new non-backwards compatible fabric v1.3 application capabilities.
+	ApplicationV1_3 = "V1_3"
+
 	// ApplicationPvtDataExperimental is the capabilties string for private data using the experimental feature of collections/sideDB.
 	ApplicationPvtDataExperimental = "V1_1_PVTDATA_EXPERIMENTAL"
 
 	// ApplicationResourcesTreeExperimental is the capabilties string for private data using the experimental feature of collections/sideDB.
 	ApplicationResourcesTreeExperimental = "V1_1_RESOURCETREE_EXPERIMENTAL"
-
-	// ApplicationChaincodeLifecycleExperimental is the capabilties string for improved chaincode lifecycle
-	// which is targetted to be a real feature for v1.2, but which is being included only as experimental
-	// during development.  This string will hopefully be removed prior to the release of v1.2 and
-	// Will be enabled along with ApplicationV1_2
-	ApplicationChaincodeLifecycleExperimental = "V1_2_CHAINCODE_LIFECYCLE_EXPERIMENTAL"
 )
 
 // ApplicationProvider provides capabilities information for application level config.
 type ApplicationProvider struct {
 	*registry
-	v11                      bool
-	v12                      bool
-	v11PvtDataExperimental   bool
-	v12LifecycleExperimental bool
+	v11                    bool
+	v12                    bool
+	v13                    bool
+	v11PvtDataExperimental bool
 }
 
 // NewApplicationProvider creates a application capabilities provider.
@@ -47,8 +44,8 @@ func NewApplicationProvider(capabilities map[string]*cb.Capability) *Application
 	ap.registry = newRegistry(ap, capabilities)
 	_, ap.v11 = capabilities[ApplicationV1_1]
 	_, ap.v12 = capabilities[ApplicationV1_2]
+	_, ap.v13 = capabilities[ApplicationV1_3]
 	_, ap.v11PvtDataExperimental = capabilities[ApplicationPvtDataExperimental]
-	_, ap.v12LifecycleExperimental = capabilities[ApplicationChaincodeLifecycleExperimental]
 	return ap
 }
 
@@ -59,51 +56,57 @@ func (ap *ApplicationProvider) Type() string {
 
 // ACLs returns whether ACLs may be specified in the channel application config
 func (ap *ApplicationProvider) ACLs() bool {
-	return ap.v12
+	return ap.v12 || ap.v13
 }
 
 // ForbidDuplicateTXIdInBlock specifies whether two transactions with the same TXId are permitted
 // in the same block or whether we mark the second one as TxValidationCode_DUPLICATE_TXID
 func (ap *ApplicationProvider) ForbidDuplicateTXIdInBlock() bool {
-	return ap.v11 || ap.v12
+	return ap.v11 || ap.v12 || ap.v13
 }
 
 // PrivateChannelData returns true if support for private channel data (a.k.a. collections) is enabled.
 // In v1.1, the private channel data is experimental and has to be enabled explicitly.
 // In v1.2, the private channel data is enabled by default.
 func (ap *ApplicationProvider) PrivateChannelData() bool {
-	return ap.v11PvtDataExperimental || ap.v12
+	return ap.v11PvtDataExperimental || ap.v12 || ap.v13
 }
 
 // CollectionUpgrade returns true if this channel is configured to allow updates to
 // existing collection or add new collections through chaincode upgrade (as introduced in v1.2)
 func (ap ApplicationProvider) CollectionUpgrade() bool {
-	return ap.v12
+	return ap.v12 || ap.v13
 }
 
 // V1_1Validation returns true is this channel is configured to perform stricter validation
 // of transactions (as introduced in v1.1).
 func (ap *ApplicationProvider) V1_1Validation() bool {
-	return ap.v11 || ap.v12
+	return ap.v11 || ap.v12 || ap.v13
 }
 
 // V1_2Validation returns true if this channel is configured to perform stricter validation
 // of transactions (as introduced in v1.2).
 func (ap *ApplicationProvider) V1_2Validation() bool {
-	return ap.v12
+	return ap.v12 || ap.v13
+}
+
+// V1_3Validation returns true if this channel is configured to perform stricter validation
+// of transactions (as introduced in v1.3).
+func (ap *ApplicationProvider) V1_3Validation() bool {
+	return ap.v13
 }
 
 // MetadataLifecycle indicates whether the peer should use the deprecated and problematic
-// v1.0/v1.1 lifecycle, or whether it should use the newer per channel peer local chaincode
-// metadata package approach planned for release with Fabric v1.2
+// v1.0/v1.1/v1.2 lifecycle, or whether it should use the newer per channel peer local chaincode
+// metadata package approach planned for release with Fabric v1.3
 func (ap *ApplicationProvider) MetadataLifecycle() bool {
-	return ap.v12LifecycleExperimental
+	return ap.v13
 }
 
 // KeyLevelEndorsement returns true if this channel supports endorsement
 // policies expressible at a ledger key granularity, as described in FAB-8812
 func (ap *ApplicationProvider) KeyLevelEndorsement() bool {
-	return ap.v12
+	return ap.v12 || ap.v13
 }
 
 // HasCapability returns true if the capability is supported by this binary.
@@ -114,12 +117,12 @@ func (ap *ApplicationProvider) HasCapability(capability string) bool {
 		return true
 	case ApplicationV1_2:
 		return true
+	case ApplicationV1_3:
+		return true
 	case ApplicationPvtDataExperimental:
 		return true
 	case ApplicationResourcesTreeExperimental:
 		return true
-	case ApplicationChaincodeLifecycleExperimental:
-		return true
 	default:
 		return false
 	}

common/capabilities/application_test.go

@@ -15,70 +15,62 @@ import (
 )
 
 func TestApplicationV10(t *testing.T) {
-	op := NewApplicationProvider(map[string]*cb.Capability{})
-	assert.NoError(t, op.Supported())
+	ap := NewApplicationProvider(map[string]*cb.Capability{})
+	assert.NoError(t, ap.Supported())
 }
 
 func TestApplicationV11(t *testing.T) {
-	op := NewApplicationProvider(map[string]*cb.Capability{
+	ap := NewApplicationProvider(map[string]*cb.Capability{
 		ApplicationV1_1: {},
 	})
-	assert.NoError(t, op.Supported())
-	assert.True(t, op.ForbidDuplicateTXIdInBlock())
-	assert.True(t, op.V1_1Validation())
+	assert.NoError(t, ap.Supported())
+	assert.True(t, ap.ForbidDuplicateTXIdInBlock())
+	assert.True(t, ap.V1_1Validation())
 }
 
 func TestApplicationV12(t *testing.T) {
-	op := NewApplicationProvider(map[string]*cb.Capability{
-		ApplicationV1_2: {},
-	})
-	assert.NoError(t, op.Supported())
-	assert.True(t, op.ForbidDuplicateTXIdInBlock())
-	assert.True(t, op.V1_1Validation())
-	assert.True(t, op.V1_2Validation())
-	assert.True(t, op.KeyLevelEndorsement())
-}
-
-func TestApplicationPvtDataExperimental(t *testing.T) {
-	op := NewApplicationProvider(map[string]*cb.Capability{
-		ApplicationPvtDataExperimental: {},
-	})
-	assert.True(t, op.PrivateChannelData())
-
-	op = NewApplicationProvider(map[string]*cb.Capability{
-		ApplicationV1_2: {},
-	})
-	assert.True(t, op.PrivateChannelData())
-
-}
-
-func TestApplicationACLs(t *testing.T) {
 	ap := NewApplicationProvider(map[string]*cb.Capability{
 		ApplicationV1_2: {},
 	})
+	assert.NoError(t, ap.Supported())
+	assert.True(t, ap.ForbidDuplicateTXIdInBlock())
+	assert.True(t, ap.V1_1Validation())
+	assert.True(t, ap.V1_2Validation())
+	assert.True(t, ap.KeyLevelEndorsement())
 	assert.True(t, ap.ACLs())
+	assert.True(t, ap.CollectionUpgrade())
+	assert.True(t, ap.PrivateChannelData())
 }
 
-func TestApplicationCollectionUpgrade(t *testing.T) {
-	op := NewApplicationProvider(map[string]*cb.Capability{
-		ApplicationV1_2: {},
+func TestApplicationV13(t *testing.T) {
+	ap := NewApplicationProvider(map[string]*cb.Capability{
+		ApplicationV1_3: {},
 	})
-	assert.True(t, op.CollectionUpgrade())
+	assert.NoError(t, ap.Supported())
+	assert.True(t, ap.ForbidDuplicateTXIdInBlock())
+	assert.True(t, ap.V1_1Validation())
+	assert.True(t, ap.V1_2Validation())
+	assert.True(t, ap.V1_3Validation())
+	assert.True(t, ap.KeyLevelEndorsement())
+	assert.True(t, ap.MetadataLifecycle())
+	assert.True(t, ap.ACLs())
+	assert.True(t, ap.CollectionUpgrade())
+	assert.True(t, ap.PrivateChannelData())
 }
 
-func TestChaincodeLifecycleExperimental(t *testing.T) {
-	op := NewApplicationProvider(map[string]*cb.Capability{
-		ApplicationChaincodeLifecycleExperimental: {},
+func TestApplicationPvtDataExperimental(t *testing.T) {
+	ap := NewApplicationProvider(map[string]*cb.Capability{
+		ApplicationPvtDataExperimental: {},
 	})
-	assert.True(t, op.MetadataLifecycle())
+	assert.True(t, ap.PrivateChannelData())
 }
 
 func TestHasCapability(t *testing.T) {
-	op := NewApplicationProvider(map[string]*cb.Capability{})
-	assert.True(t, op.HasCapability(ApplicationV1_1))
-	assert.True(t, op.HasCapability(ApplicationV1_2))
-	assert.True(t, op.HasCapability(ApplicationPvtDataExperimental))
-	assert.True(t, op.HasCapability(ApplicationResourcesTreeExperimental))
-	assert.True(t, op.HasCapability(ApplicationChaincodeLifecycleExperimental))
-	assert.False(t, op.HasCapability("default"))
+	ap := NewApplicationProvider(map[string]*cb.Capability{})
+	assert.True(t, ap.HasCapability(ApplicationV1_1))
+	assert.True(t, ap.HasCapability(ApplicationV1_2))
+	assert.True(t, ap.HasCapability(ApplicationV1_3))
+	assert.True(t, ap.HasCapability(ApplicationPvtDataExperimental))
+	assert.True(t, ap.HasCapability(ApplicationResourcesTreeExperimental))
+	assert.False(t, ap.HasCapability("default"))
 }