Ledger-lscc: Interface for decoupling ledger and lscc

This CR
- Introduces an interface 'DeployedChaincodeInfoProvider'
for decoupling the ledger code from chaincode lifecycle code

- Declares ledger's dependency on this interface explicitly.
The intent is that ledger code will use this dependency for
listening to chaincode lifecycle events and for querying
the information about the deployed chaicodes

- Introduces a convenient function in legder that other modules
can use directly to get information about the chaincodes

FAB-11562 #done

Change-Id: I3eb0e798f00ceb18203128fd9da93822fc2bca2b
Signed-off-by: manish <manish.sethi@gmail.com>

Author: manish-sethi

core/chaincode/mock/tx_simulator.go

@@ -43,7 +43,7 @@ func (ctp *customTxProcessor) GenerateSimulationResults(txEnvelop *common.Envelo
 func TestCustomProcessor(t *testing.T) {
 	env := newTestEnv(t)
 	defer env.cleanup()
-	provider, _ := NewProvider()
+	provider := testutilNewProvider(t)
 	defer provider.Close()
 
 	// create a custom tx processor and register it to handle '100 and 101' type of transaction

core/ledger/kvledger/custom_processor_test.go

@@ -0,0 +1,35 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package kvledger
+
+import (
+	"github.com/hyperledger/fabric/core/ledger"
+	"github.com/hyperledger/fabric/protos/common"
+)
+
+type deployedCCInfoRetriever struct {
+	ledger       ledger.PeerLedger
+	infoProvider ledger.DeployedChaincodeInfoProvider
+}
+
+func (r *deployedCCInfoRetriever) ChaincodeInfo(chaincodeName string) (*ledger.DeployedChaincodeInfo, error) {
+	qe, err := r.ledger.NewQueryExecutor()
+	if err != nil {
+		return nil, err
+	}
+	defer qe.Done()
+	return r.infoProvider.ChaincodeInfo(chaincodeName, qe)
+}
+
+func (r *deployedCCInfoRetriever) CollectionInfo(chaincodeName, collectionName string) (*common.StaticCollectionConfig, error) {
+	qe, err := r.ledger.NewQueryExecutor()
+	if err != nil {
+		return nil, err
+	}
+	defer qe.Done()
+	return r.infoProvider.CollectionInfo(chaincodeName, collectionName, qe)
+}

core/ledger/kvledger/deployed_ccinfo_retriever.go

@@ -55,7 +55,9 @@ func init() {
 	// Note, if subledgers are supported in the future,
 	// the various ledgers could be created/managed at this level
 	cleanup()
-	ledgermgmt.Initialize(nil, platforms.NewRegistry(&golang.Platform{}))
+	ledgermgmt.Initialize(&ledgermgmt.Initializer{
+		PlatformRegistry: platforms.NewRegistry(&golang.Platform{}),
+	})
 	var err error
 
 	gb, _ := configtxtest.MakeGenesisBlock(ledgerID)

core/ledger/kvledger/example/main/example.go

@@ -50,7 +50,8 @@ func newKVLedger(
 	historyDB historydb.HistoryDB,
 	configHistoryMgr confighistory.Mgr,
 	stateListeners []ledger.StateListener,
-	bookkeeperProvider bookkeeping.Provider) (*kvLedger, error) {
+	bookkeeperProvider bookkeeping.Provider,
+	ccInfoProvider ledger.DeployedChaincodeInfoProvider) (*kvLedger, error) {
 
 	logger.Debugf("Creating KVLedger ledgerID=%s: ", ledgerID)
 	stateListeners = append(stateListeners, configHistoryMgr)

core/ledger/kvledger/kv_ledger.go

@@ -10,11 +10,10 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/hyperledger/fabric/core/ledger/confighistory"
-
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/ledger/util/leveldbhelper"
 	"github.com/hyperledger/fabric/core/ledger"
+	"github.com/hyperledger/fabric/core/ledger/confighistory"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/bookkeeping"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/history/historydb"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/history/historydb/historyleveldb"
@@ -48,39 +47,36 @@ type Provider struct {
 	configHistoryMgr    confighistory.Mgr
 	stateListeners      []ledger.StateListener
 	bookkeepingProvider bookkeeping.Provider
+	initializer         *ledger.Initializer
 }
 
 // NewProvider instantiates a new Provider.
 // This is not thread-safe and assumed to be synchronized be the caller
 func NewProvider() (ledger.PeerLedgerProvider, error) {
-
 	logger.Info("Initializing ledger provider")
-
 	// Initialize the ID store (inventory of chainIds/ledgerIds)
 	idStore := openIDStore(ledgerconfig.GetLedgerProviderPath())
-
 	ledgerStoreProvider := ledgerstorage.NewProvider()
-
 	// Initialize the versioned database (state database)
 	vdbProvider, err := privacyenabledstate.NewCommonStorageDBProvider()
 	if err != nil {
 		return nil, err
 	}
-
 	// Initialize the history database (index for history of values by key)
 	historydbProvider := historyleveldb.NewHistoryDBProvider()
 	bookkeepingProvider := bookkeeping.NewProvider()
-	// Initialize config history mgr
-	configHistoryMgr := confighistory.NewMgr()
 	logger.Info("ledger provider Initialized")
-	provider := &Provider{idStore, ledgerStoreProvider, vdbProvider, historydbProvider, configHistoryMgr, nil, bookkeepingProvider}
-	provider.recoverUnderConstructionLedger()
+	provider := &Provider{idStore, ledgerStoreProvider,
+		vdbProvider, historydbProvider, nil, nil, bookkeepingProvider, nil}
 	return provider, nil
 }
 
 // Initialize implements the corresponding method from interface ledger.PeerLedgerProvider
-func (provider *Provider) Initialize(stateListeners []ledger.StateListener) {
-	provider.stateListeners = stateListeners
+func (provider *Provider) Initialize(initializer *ledger.Initializer) {
+	provider.initializer = initializer
+	provider.configHistoryMgr = confighistory.NewMgr()
+	provider.stateListeners = initializer.StateListeners
+	provider.recoverUnderConstructionLedger()
 }
 
 // Create implements the corresponding method from interface ledger.PeerLedgerProvider
@@ -155,7 +151,8 @@ func (provider *Provider) openInternal(ledgerID string) (ledger.PeerLedger, erro
 
 	// Create a kvLedger for this chain/ledger, which encasulates the underlying data stores
 	// (id store, blockstore, state database, history database)
-	l, err := newKVLedger(ledgerID, blockStore, vDB, historyDB, provider.configHistoryMgr, provider.stateListeners, provider.bookkeepingProvider)
+	l, err := newKVLedger(ledgerID, blockStore, vDB, historyDB, provider.configHistoryMgr,
+		provider.stateListeners, provider.bookkeepingProvider, provider.initializer.DeployedChaincodeInfoProvider)
 	if err != nil {
 		return nil, err
 	}