Remove LifecycleV20 application capability

Remove LifecycleV20 application capability.

This is the first step in removing all v1.x application capabilities.

v3.0 should not support v1.x application capabilities
(peer should not recognize application capabilities
lower than V2_0_0 so that peer fails to start
against a channel that has outdated application capabilities,
user needs to update application capabilities on the channel
to at least V2_0_0 before updating peer to v3.0).

Mocks have been regenerated with LifecycleV20 removal.

Mocks that were used in deleted lscc_test.go have also been removed.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>

common/capabilities/application.go

@@ -119,14 +119,6 @@ func (ap *ApplicationProvider) V2_0Validation() bool {
 	return ap.v20 || ap.v25
 }
 
-// LifecycleV20 indicates whether the peer should use the deprecated and problematic
-// v1.x lifecycle, or whether it should use the newer per channel approve/commit definitions
-// process introduced in v2.0.  Note, this should only be used on the endorsing side
-// of peer processing, so that we may safely remove all checks against it in v2.1.
-func (ap *ApplicationProvider) LifecycleV20() bool {
-	return ap.v20 || ap.v25
-}
-
 // MetadataLifecycle always returns false
 func (ap *ApplicationProvider) MetadataLifecycle() bool {
 	return false

common/capabilities/application_test.go

@@ -85,7 +85,6 @@ func TestApplicationV20(t *testing.T) {
 	require.True(t, ap.ACLs())
 	require.True(t, ap.CollectionUpgrade())
 	require.True(t, ap.PrivateChannelData())
-	require.True(t, ap.LifecycleV20())
 	require.True(t, ap.StorePvtDataOfInvalidTx())
 }
 
@@ -103,7 +102,6 @@ func TestApplicationV25(t *testing.T) {
 	require.True(t, ap.ACLs())
 	require.True(t, ap.CollectionUpgrade())
 	require.True(t, ap.PrivateChannelData())
-	require.True(t, ap.LifecycleV20())
 	require.True(t, ap.StorePvtDataOfInvalidTx())
 	require.True(t, ap.PurgePvtData())
 }

common/channelconfig/api.go

@@ -183,12 +183,6 @@ type ApplicationCapabilities interface {
 	//  - implicit per-org collections
 	V2_0Validation() bool
 
-	// LifecycleV20 indicates whether the peer should use the deprecated and problematic
-	// v1.x lifecycle, or whether it should use the newer per channel approve/commit definitions
-	// process introduced in v2.0.  Note, this should only be used on the endorsing side
-	// of peer processing, so that we may safely remove all checks against it in v2.1.
-	LifecycleV20() bool
-
 	// MetadataLifecycle always returns false
 	MetadataLifecycle() bool
 

core/chaincode/lifecycle/cache.go

@@ -336,13 +336,6 @@ func (c *Cache) StateCommitDone(channelName string) {
 // An error is returned only if either the channel or the chaincode do not exist.
 func (c *Cache) ChaincodeInfo(channelID, name string) (*LocalChaincodeInfo, error) {
 	if name == LifecycleNamespace {
-		ac, ok := c.Resources.ChannelConfigSource.GetStableChannelConfig(channelID).ApplicationConfig()
-		if !ok {
-			return nil, errors.Errorf("application config does not exist for channel '%s'", channelID)
-		}
-		if !ac.Capabilities().LifecycleV20() {
-			return nil, errors.Errorf("cannot use _lifecycle without V2_0 application capabilities enabled for channel '%s'", channelID)
-		}
 		return c.getLifecycleSCCChaincodeInfo(channelID)
 	}
 

core/chaincode/lifecycle/cache_test.go

@@ -58,7 +58,6 @@ var _ = Describe("Cache", func() {
 		fakeApplicationConfig = &mock.ApplicationConfig{}
 		fakeChannelConfig.ApplicationConfigReturns(fakeApplicationConfig, true)
 		fakeCapabilities = &mock.ApplicationCapabilities{}
-		fakeCapabilities.LifecycleV20Returns(true)
 		fakeApplicationConfig.CapabilitiesReturns(fakeCapabilities)
 		fakePolicyManager = &mock.PolicyManager{}
 		fakePolicyManager.GetPolicyReturns(nil, true)
@@ -265,17 +264,6 @@ var _ = Describe("Cache", func() {
 				Expect(err).To(MatchError("application config does not exist for channel 'channel-id'"))
 			})
 		})
-
-		Context("when the application config V2_0 capabilities are not enabled", func() {
-			BeforeEach(func() {
-				fakeCapabilities.LifecycleV20Returns(false)
-			})
-
-			It("returns an error", func() {
-				_, err := c.ChaincodeInfo("channel-id", "_lifecycle")
-				Expect(err).To(MatchError("cannot use _lifecycle without V2_0 application capabilities enabled for channel 'channel-id'"))
-			})
-		})
 	})
 
 	Describe("ListInstalledChaincodes", func() {

core/chaincode/lifecycle/endorsement_info.go

@@ -114,23 +114,12 @@ func (cei *ChaincodeEndorsementInfoSource) ChaincodeEndorsementInfo(channelID, c
 		}, nil
 	}
 
-	// return legacy cc endorsement info if V20 is not enabled
-	channelConfig := cei.Resources.ChannelConfigSource.GetStableChannelConfig(channelID)
-	if channelConfig == nil {
-		return nil, errors.Errorf("could not get channel config for channel '%s'", channelID)
-	}
-	ac, ok := channelConfig.ApplicationConfig()
-	if !ok {
-		return nil, errors.Errorf("could not get application config for channel '%s'", channelID)
-	}
-	if !ac.Capabilities().LifecycleV20() {
-		return cei.LegacyImpl.ChaincodeEndorsementInfo(channelID, chaincodeName, qe)
-	}
-
 	chaincodeInfo, ok, err := cei.CachedChaincodeInfo(channelID, chaincodeName, qe)
 	if err != nil {
 		return nil, err
 	}
+
+	// fallback to legacy lifecycle if not defined in new lifeycle
 	if !ok {
 		return cei.LegacyImpl.ChaincodeEndorsementInfo(channelID, chaincodeName, qe)
 	}

core/chaincode/lifecycle/endorsement_info_test.go

@@ -43,7 +43,6 @@ var _ = Describe("ChaincodeEndorsementInfoSource", func() {
 		fakeChannelConfigSource.GetStableChannelConfigReturns(fakeChannelConfig)
 		fakeChannelConfig.ApplicationConfigReturns(fakeAppConfig, true)
 		fakeAppConfig.CapabilitiesReturns(fakeCapabilities)
-		fakeCapabilities.LifecycleV20Returns(true)
 
 		resources = &lifecycle.Resources{
 			Serializer:          &lifecycle.Serializer{},
@@ -289,51 +288,4 @@ var _ = Describe("ChaincodeEndorsementInfoSource", func() {
 			})
 		})
 	})
-
-	Context("when LifecycleV20 capability is not enabled", func() {
-		var ccEndorsementInfo *lifecycle.ChaincodeEndorsementInfo
-
-		BeforeEach(func() {
-			ccEndorsementInfo = &lifecycle.ChaincodeEndorsementInfo{
-				Version:           "legacy-version",
-				EndorsementPlugin: "legacy-plugin",
-				ChaincodeID:       "legacy-id",
-			}
-			fakeCapabilities.LifecycleV20Returns(false)
-			fakeLegacyImpl.ChaincodeEndorsementInfoReturns(ccEndorsementInfo, nil)
-		})
-
-		It("returns the legacy chaincode info", func() {
-			res, err := cei.ChaincodeEndorsementInfo("channel-id", "cc-name", fakeQueryExecutor)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(res).To(Equal(ccEndorsementInfo))
-			Expect(fakeLegacyImpl.ChaincodeEndorsementInfoCallCount()).To(Equal(1))
-			channelID, name, qe := fakeLegacyImpl.ChaincodeEndorsementInfoArgsForCall(0)
-			Expect(channelID).To(Equal("channel-id"))
-			Expect(name).To(Equal("cc-name"))
-			Expect(qe).To(Equal(fakeQueryExecutor))
-		})
-	})
-
-	Context("when channel config is not found", func() {
-		BeforeEach(func() {
-			fakeChannelConfigSource.GetStableChannelConfigReturns(nil)
-		})
-
-		It("returns not get channel config error", func() {
-			_, err := cei.ChaincodeEndorsementInfo("channel-id", "cc-name", fakeQueryExecutor)
-			Expect(err).To(MatchError("could not get channel config for channel 'channel-id'"))
-		})
-	})
-
-	Context("when application config is not found", func() {
-		BeforeEach(func() {
-			fakeChannelConfig.ApplicationConfigReturns(nil, false)
-		})
-
-		It("returns not get application config error", func() {
-			_, err := cei.ChaincodeEndorsementInfo("channel-id", "cc-name", fakeQueryExecutor)
-			Expect(err).To(MatchError("could not get application config for channel 'channel-id'"))
-		})
-	})
 })

core/chaincode/lifecycle/integration_test.go

@@ -61,7 +61,6 @@ var _ = Describe("Integration", func() {
 		fakeApplicationConfig = &mock.ApplicationConfig{}
 		fakeChannelConfig.ApplicationConfigReturns(fakeApplicationConfig, true)
 		fakeCapabilities = &mock.ApplicationCapabilities{}
-		fakeCapabilities.LifecycleV20Returns(true)
 		fakeApplicationConfig.CapabilitiesReturns(fakeCapabilities)
 		fakeACLProvider = &mock.ACLProvider{}