FAB-13511 Wire QueryDefinedNamespaces to SCC

This simply exposes the ability to query all defined namespaces already
implemented in lifecycle through the new lifecycle SCC.

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

Author: Jason Yellick

core/chaincode/lifecycle/mock/scc_functions.go

@@ -41,6 +41,10 @@ const (
 	// QueryDefinedChaincodeFuncName is the chaincode function name used to 'define' (previously 'instantiate')
 	// a chaincode in a channel.
 	QueryDefinedChaincodeFuncName = "QueryDefinedChaincode"
+
+	// QueryDefinedNamespaces is the chaincode function name used query which namespaces are currently defined
+	// and what type those namespaces are.
+	QueryDefinedNamespacesFuncName = "QueryDefinedNamespaces"
 )
 
 // SCCFunctions provides a backing implementation with concrete arguments
@@ -63,6 +67,9 @@ type SCCFunctions interface {
 
 	// QueryDefinedChaincode reads a chaincode definition from the public state.
 	QueryDefinedChaincode(name string, publicState ReadableState) (*DefinedChaincode, error)
+
+	// QueryDefinedNamespaces returns all defined namespaces
+	QueryDefinedNamespaces(publicState RangeableState) (map[string]string, error)
 }
 
 //go:generate counterfeiter -o mock/channel_config_source.go --fake-name ChannelConfigSource . ChannelConfigSource
@@ -309,3 +316,19 @@ func (i *Invocation) QueryDefinedChaincode(input *lb.QueryDefinedChaincodeArgs)
 		Hash:                definedChaincode.Hash,
 	}, nil
 }
+
+func (i *Invocation) QueryDefinedNamespaces(input *lb.QueryDefinedNamespacesArgs) (proto.Message, error) {
+	namespaces, err := i.SCC.Functions.QueryDefinedNamespaces(&ChaincodePublicLedgerShim{ChaincodeStubInterface: i.Stub})
+	if err != nil {
+		return nil, err
+	}
+	result := map[string]*lb.QueryDefinedNamespacesResult_Namespace{}
+	for namespace, nType := range namespaces {
+		result[namespace] = &lb.QueryDefinedNamespacesResult_Namespace{
+			Type: nType,
+		}
+	}
+	return &lb.QueryDefinedNamespacesResult{
+		Namespaces: result,
+	}, nil
+}

core/chaincode/lifecycle/scc.go

@@ -479,7 +479,7 @@ var _ = Describe("SCC", func() {
 			})
 		})
 
-		Describe("DefineChaincodeForMyOrg", func() {
+		Describe("QueryDefinedChaincode", func() {
 			var (
 				arg          *lb.QueryDefinedChaincodeArgs
 				marshaledArg []byte
@@ -530,6 +530,50 @@ var _ = Describe("SCC", func() {
 				})
 			})
 		})
+
+		Describe("QueryDefinedNamespaces", func() {
+			var (
+				arg          *lb.QueryDefinedNamespacesArgs
+				marshaledArg []byte
+			)
+
+			BeforeEach(func() {
+				arg = &lb.QueryDefinedNamespacesArgs{}
+
+				var err error
+				marshaledArg, err = proto.Marshal(arg)
+				Expect(err).NotTo(HaveOccurred())
+
+				fakeStub.GetArgsReturns([][]byte{[]byte("QueryDefinedNamespaces"), marshaledArg})
+				fakeSCCFuncs.QueryDefinedNamespacesReturns(map[string]string{
+					"foo": "Chaincode",
+					"bar": "Token",
+				}, nil)
+			})
+
+			It("passes the arguments to and returns the results from the backing scc function implementation", func() {
+				res := scc.Invoke(fakeStub)
+				Expect(res.Status).To(Equal(int32(200)))
+				payload := &lb.QueryDefinedNamespacesResult{}
+				err := proto.Unmarshal(res.Payload, payload)
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(fakeSCCFuncs.QueryDefinedNamespacesCallCount()).To(Equal(1))
+				Expect(fakeSCCFuncs.QueryDefinedNamespacesArgsForCall(0)).To(Equal(&lifecycle.ChaincodePublicLedgerShim{ChaincodeStubInterface: fakeStub}))
+			})
+
+			Context("when the underlying function implementation fails", func() {
+				BeforeEach(func() {
+					fakeSCCFuncs.QueryDefinedNamespacesReturns(nil, fmt.Errorf("underlying-error"))
+				})
+
+				It("wraps and returns the error", func() {
+					res := scc.Invoke(fakeStub)
+					Expect(res.Status).To(Equal(int32(500)))
+					Expect(res.Message).To(Equal("failed to invoke backing implementation of 'QueryDefinedNamespaces': underlying-error"))
+				})
+			})
+		})
 	})
 
 })