FAB-13838 DeployedCCInfoProvider.UpdatedChaincodes

This implements another piece of the DeployedCCInfoProvider.

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

Author: Jason Yellick

core/chaincode/lifecycle/deployedcc_infoprovider.go

@@ -7,19 +7,44 @@ SPDX-License-Identifier: Apache-2.0
 package lifecycle
 
 import (
+	"regexp"
+
 	"github.com/hyperledger/fabric/core/ledger"
 	cb "github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/ledger/rwset/kvrwset"
+
+	"github.com/pkg/errors"
 )
 
 // Namespaces returns the list of namespaces which are relevant to chaincode lifecycle
 func (l *Lifecycle) Namespaces() []string {
 	return append([]string{LifecycleNamespace}, l.LegacyDeployedCCInfoProvider.Namespaces()...)
 }
 
+var SequenceMatcher = regexp.MustCompile("^" + NamespacesName + "/fields/([^/]+)/Sequence$")
+
 // UpdatedChaincodes returns the chaincodes that are getting updated by the supplied 'stateUpdates'
 func (l *Lifecycle) UpdatedChaincodes(stateUpdates map[string][]*kvrwset.KVWrite) ([]*ledger.ChaincodeLifecycleInfo, error) {
-	return l.LegacyDeployedCCInfoProvider.UpdatedChaincodes(stateUpdates)
+	lifecycleInfo := []*ledger.ChaincodeLifecycleInfo{}
+
+	// If the lifecycle table was updated, report only modified chaincodes
+	lifecycleUpdates := stateUpdates[LifecycleNamespace]
+
+	for _, kvWrite := range lifecycleUpdates {
+		matches := SequenceMatcher.FindStringSubmatch(kvWrite.Key)
+		if len(matches) != 2 {
+			continue
+		}
+		// XXX Note, this may not be a chaincode namespace, handle this later
+		lifecycleInfo = append(lifecycleInfo, &ledger.ChaincodeLifecycleInfo{Name: matches[1]})
+	}
+
+	legacyUpdates, err := l.LegacyDeployedCCInfoProvider.UpdatedChaincodes(stateUpdates)
+	if err != nil {
+		return nil, errors.WithMessage(err, "error invoking legacy deployed cc info provider")
+	}
+
+	return append(lifecycleInfo, legacyUpdates...), nil
 }
 
 // ChaincodeInfo implements function in interface ledger.DeployedChaincodeInfoProvider and returns info about a deployed chaincode

core/chaincode/lifecycle/deployedcc_infoprovider_test.go

@@ -56,25 +56,43 @@ var _ = Describe("Lifecycle", func() {
 
 			BeforeEach(func() {
 				updates = map[string][]*kvrwset.KVWrite{
-					"key1": nil,
-					"key2": nil,
+					"+lifecycle": {
+						{Key: "some/random/value"},
+						{Key: "namespaces/fields/cc-name/Sequence"},
+						{Key: "prefix/namespaces/fields/cc-name/Sequence"},
+						{Key: "namespaces/fields/Sequence/infix"},
+						{Key: "namespaces/fields/cc-name/Sequence/Postfix"},
+					},
+					"other-namespace": nil,
 				}
 				fakeLegacyProvider.UpdatedChaincodesReturns([]*ledger.ChaincodeLifecycleInfo{
 					{Name: "foo"},
 					{Name: "bar"},
-				}, fmt.Errorf("updated-chaincodes-error"))
+				}, nil)
 			})
 
-			It("passes through to the legacy impl", func() {
+			It("checks its own namespace, then passes through to the legacy impl", func() {
 				res, err := l.UpdatedChaincodes(updates)
 				Expect(res).To(Equal([]*ledger.ChaincodeLifecycleInfo{
+					{Name: "cc-name"},
 					{Name: "foo"},
 					{Name: "bar"},
 				}))
-				Expect(err).To(MatchError("updated-chaincodes-error"))
+				Expect(err).NotTo(HaveOccurred())
 				Expect(fakeLegacyProvider.UpdatedChaincodesCallCount()).To(Equal(1))
 				Expect(fakeLegacyProvider.UpdatedChaincodesArgsForCall(0)).To(Equal(updates))
 			})
+
+			Context("when the legacy provider returns an error", func() {
+				BeforeEach(func() {
+					fakeLegacyProvider.UpdatedChaincodesReturns(nil, fmt.Errorf("legacy-error"))
+				})
+
+				It("wraps and returns the error", func() {
+					_, err := l.UpdatedChaincodes(updates)
+					Expect(err).To(MatchError("error invoking legacy deployed cc info provider: legacy-error"))
+				})
+			})
 		})
 
 		Describe("ChaincodeInfo", func() {