Merge "Remove persistence.PackageProvider"

hyperledger · Nov 15, 2019 · 0411196 · 0411196
2 parents 019c7ab + 86f53bc
commit 0411196
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 288 deletions.
diff --git a/core/chaincode/persistence/mock/legacy_package_provider.go b/core/chaincode/persistence/mock/legacy_package_provider.go
diff --git a/core/chaincode/persistence/package_provider.go b/core/chaincode/persistence/package_provider.go
diff --git a/core/chaincode/persistence/package_provider_test.go b/core/chaincode/persistence/package_provider_test.go
diff --git a/core/chaincode/persistence/persistence_suite_test.go b/core/chaincode/persistence/persistence_suite_test.go
@@ -25,11 +25,6 @@ type osFileInfo interface {
 	os.FileInfo
 }
 
-//go:generate counterfeiter -o mock/legacy_package_provider.go -fake-name LegacyPackageProvider . legacyPackageProvider
-type legacyPackageProvider interface {
-	persistence.LegacyPackageProvider
-}
-
 //go:generate mockery -dir . -name MetadataProvider -case underscore -output mock/ -outpkg mock
 
 func TestPersistence(t *testing.T) {

diff --git a/internal/peer/node/start.go b/internal/peer/node/start.go
@@ -10,6 +10,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -358,16 +359,14 @@ func serve(args []string) error {
 		LegacyDeployedCCInfoProvider: &lscc.DeployedCCInfoProvider{},
 	}
 
-	packageProvider := &persistence.PackageProvider{
-		LegacyPP: &ccprovider.CCInfoFSImpl{GetHasher: factory.GetDefault()},
-	}
+	ccInfoFSImpl := &ccprovider.CCInfoFSImpl{GetHasher: factory.GetDefault()}
 
 	// legacyMetadataManager collects metadata information from the legacy
 	// lifecycle (lscc). This is expected to disappear with FAB-15061.
 	legacyMetadataManager, err := cclifecycle.NewMetadataManager(
 		cclifecycle.EnumerateFunc(
 			func() ([]ccdef.InstalledChaincode, error) {
-				return packageProvider.ListInstalledChaincodesLegacy()
+				return ccInfoFSImpl.ListInstalledChaincodes(ccInfoFSImpl.GetChaincodeInstallPath(), ioutil.ReadDir, ccprovider.LoadPackage)
 			},
 		),
 	)