Skip to content

Commit a657602

Browse files
committed
Wire parser into peer's PackageProvider
Also fix downstream bug where the container runtime expects the ChaincodeContainerInfo type to be uppercase. FAB-13985 #done Change-Id: I2d36fbfb6a6352cc6dc1dd0336ea9c47b00405cc Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
1 parent e388d3d commit a657602

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

core/chaincode/lifecycle/legacy_lifecycle.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package lifecycle
88

99
import (
1010
"fmt"
11+
"strings"
1112

1213
"github.com/hyperledger/fabric/core/common/ccprovider"
1314
"github.com/hyperledger/fabric/core/ledger"
@@ -141,7 +142,7 @@ func (l *Lifecycle) ChaincodeContainerInfo(chaincodeName string, qe ledger.Simpl
141142
Name: chaincodeName,
142143
Version: definedChaincode.Version,
143144
Path: ccPackage.Metadata.Path,
144-
Type: ccPackage.Metadata.Type,
145+
Type: strings.ToUpper(ccPackage.Metadata.Type),
145146
ContainerType: "DOCKER",
146147
}, nil
147148
}

core/chaincode/lifecycle/legacy_lifecycle_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ var _ = Describe("Lifecycle", func() {
4343
})
4444

4545
Describe("ChaincodeDefinition", func() {
46-
4746
BeforeEach(func() {
4847
err := l.Serializer.Serialize(lifecycle.NamespacesName,
4948
"name",
@@ -187,7 +186,7 @@ var _ = Describe("Lifecycle", func() {
187186
Name: "name",
188187
Version: "version",
189188
Path: "fake-path",
190-
Type: "fake-type",
189+
Type: "FAKE-TYPE",
191190
ContainerType: "DOCKER",
192191
}))
193192

peer/node/start.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ func serve(args []string) error {
211211
packageProvider := &persistence.PackageProvider{
212212
LegacyPP: &ccprovider.CCInfoFSImpl{},
213213
Store: ccStore,
214+
Parser: ccPackageParser,
214215
}
215216

216217
lifecycleImpl.ChaincodeStore = ccStore

0 commit comments

Comments
 (0)