FAB-13988 Retrieve ApplicationConfig earlier

Presently, only one of the invokes requires the application config.
However, this is going to change, and, we need access to it earlier to
add capability checks.  This CR refactors the code to gain access to
this config earlier.

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

Author: Jason Yellick

core/chaincode/lifecycle/integration_test.go

@@ -70,6 +70,9 @@ var _ = Describe("Integration", func() {
 		fakeOrgKVStore = map[string][]byte{}
 
 		fakeStub = &mock.ChaincodeStub{}
+
+		fakeStub.GetChannelIDReturns("test-channel")
+
 		fakeStub.GetStateStub = func(key string) ([]byte, error) {
 			return fakePublicKVStore[key], nil
 		}
@@ -139,6 +142,7 @@ var _ = Describe("Integration", func() {
 				}),
 			})
 			response = scc.Invoke(fakeStub)
+			Expect(response.Message).To(Equal(""))
 			Expect(response.Status).To(Equal(int32(200)))
 
 			// Get channel definitions

core/chaincode/lifecycle/scc.go

@@ -154,14 +154,28 @@ func (scc *SCC) Invoke(stub shim.ChaincodeStubInterface) pb.Response {
 		return shim.Error(fmt.Sprintf("lifecycle scc operations require exactly two arguments but received %d", len(args)))
 	}
 
+	var ac channelconfig.Application
+	if channelID := stub.GetChannelID(); channelID != "" {
+		channelConfig := scc.ChannelConfigSource.GetStableChannelConfig(channelID)
+		if channelConfig == nil {
+			return shim.Error(fmt.Sprintf("could not get channelconfig for channel '%s'", channelID))
+		}
+		var ok bool
+		ac, ok = channelConfig.ApplicationConfig()
+		if !ok {
+			return shim.Error(fmt.Sprintf("could not get application config for channel '%s'", channelID))
+		}
+	}
+
 	// TODO add ACLs
 
 	outputBytes, err := scc.Dispatcher.Dispatch(
 		args[1],
 		string(args[0]),
 		&Invocation{
-			SCC:  scc,
-			Stub: stub,
+			ApplicationConfig: ac,
+			SCC:               scc,
+			Stub:              stub,
 		},
 	)
 	if err != nil {
@@ -172,8 +186,9 @@ func (scc *SCC) Invoke(stub shim.ChaincodeStubInterface) pb.Response {
 }
 
 type Invocation struct {
-	Stub shim.ChaincodeStubInterface
-	SCC  *SCC
+	ApplicationConfig channelconfig.Application // Note this may be nil
+	Stub              shim.ChaincodeStubInterface
+	SCC               *SCC
 }
 
 // InstallChaincode is a SCC function that may be dispatched to which routes to the underlying
@@ -250,16 +265,11 @@ func (i *Invocation) ApproveChaincodeDefinitionForMyOrg(input *lb.ApproveChainco
 }
 
 func (i *Invocation) CommitChaincodeDefinition(input *lb.CommitChaincodeDefinitionArgs) (proto.Message, error) {
-	channelConfig := i.SCC.ChannelConfigSource.GetStableChannelConfig(i.Stub.GetChannelID())
-	if channelConfig == nil {
-		return nil, errors.Errorf("could not get channelconfig for channel %s", i.Stub.GetChannelID())
-	}
-	ac, ok := channelConfig.ApplicationConfig()
-	if !ok {
-		return nil, errors.Errorf("could not get application config for channel %s", i.Stub.GetChannelID())
+	if i.ApplicationConfig == nil {
+		return nil, errors.Errorf("no application config for channel '%s'", i.Stub.GetChannelID())
 	}
 
-	orgs := ac.Organizations()
+	orgs := i.ApplicationConfig.Organizations()
 	opaqueStates := make([]OpaqueState, 0, len(orgs))
 	myOrgIndex := -1
 	for _, org := range orgs {

core/chaincode/lifecycle/scc_test.go

@@ -104,6 +104,7 @@ var _ = Describe("SCC", func() {
 
 		BeforeEach(func() {
 			fakeStub = &mock.ChaincodeStub{}
+			fakeStub.GetChannelIDReturns("test-channel")
 		})
 
 		Context("when no arguments are provided", func() {
@@ -139,6 +140,8 @@ var _ = Describe("SCC", func() {
 			)
 
 			BeforeEach(func() {
+				fakeStub.GetChannelIDReturns("")
+
 				arg = &lb.InstallChaincodeArgs{
 					Name:                    "name",
 					Version:                 "version",
@@ -393,6 +396,7 @@ var _ = Describe("SCC", func() {
 
 			It("passes the arguments to and returns the results from the backing scc function implementation", func() {
 				res := scc.Invoke(fakeStub)
+				Expect(res.Message).To(Equal(""))
 				Expect(res.Status).To(Equal(int32(200)))
 				payload := &lb.CommitChaincodeDefinitionResult{}
 				err = proto.Unmarshal(res.Payload, payload)
@@ -451,7 +455,7 @@ var _ = Describe("SCC", func() {
 				It("returns an error indicating the lack of agreement", func() {
 					res := scc.Invoke(fakeStub)
 					Expect(res.Status).To(Equal(int32(500)))
-					Expect(res.Message).To(Equal("failed to invoke backing implementation of 'CommitChaincodeDefinition': could not get channelconfig for channel "))
+					Expect(res.Message).To(Equal("could not get channelconfig for channel 'test-channel'"))
 				})
 			})
 
@@ -463,7 +467,19 @@ var _ = Describe("SCC", func() {
 				It("returns an error indicating the lack of agreement", func() {
 					res := scc.Invoke(fakeStub)
 					Expect(res.Status).To(Equal(int32(500)))
-					Expect(res.Message).To(Equal("failed to invoke backing implementation of 'CommitChaincodeDefinition': could not get application config for channel "))
+					Expect(res.Message).To(Equal("could not get application config for channel 'test-channel'"))
+				})
+
+				Context("when there is no application config yet somehow the sentinal is wrong", func() {
+					BeforeEach(func() {
+						fakeChannelConfig.ApplicationConfigReturns(nil, true)
+					})
+
+					It("returns an error indicating the lack of agreement", func() {
+						res := scc.Invoke(fakeStub)
+						Expect(res.Status).To(Equal(int32(500)))
+						Expect(res.Message).To(Equal("failed to invoke backing implementation of 'CommitChaincodeDefinition': no application config for channel 'test-channel'"))
+					})
 				})
 			})