[FAB-1825] Initialize MSP via configtx.Handler

https://jira.hyperledger.org/browse/FAB-1825

This changeset populates the MSP manager via the config transaction via
the configtx.Handler interface.  It also moves the peer msp dir to
msp/mgmt as the peer needs to stop accessing this package directly and
use the MSP manager provided by the config resources.

Change-Id: I9ee08a46fa033ad0101dd80e770c7ee327a951d9
Signed-off-by: Jason Yellick <[email protected]>

Author: Jason Yellick

common/configtx/resources.go

@@ -20,6 +20,8 @@ import (
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/common/chainconfig"
 	"github.com/hyperledger/fabric/common/policies"
+	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	cb "github.com/hyperledger/fabric/protos/common"
 )
 
@@ -32,6 +34,9 @@ type Resources interface {
 
 	// ChainConfig returns the chainconfig.Descriptor for the chain
 	ChainConfig() chainconfig.Descriptor
+
+	// MSPManager returns the msp.MSPManager for the chain
+	MSPManager() msp.MSPManager
 }
 
 // Initializer is a structure which is only useful before a configtx.Manager
@@ -44,9 +49,10 @@ type Initializer interface {
 }
 
 type resources struct {
-	handlers      map[cb.ConfigurationItem_ConfigurationType]Handler
-	policyManager policies.Manager
-	chainConfig   chainconfig.Descriptor
+	handlers         map[cb.ConfigurationItem_ConfigurationType]Handler
+	policyManager    policies.Manager
+	chainConfig      chainconfig.Descriptor
+	mspConfigHandler *mspmgmt.MSPConfigHandler
 }
 
 // PolicyManager returns the policies.Manager for the chain
@@ -59,22 +65,27 @@ func (r *resources) ChainConfig() chainconfig.Descriptor {
 	return r.chainConfig
 }
 
+// MSPManager returns the msp.MSPManager for the chain
+func (r *resources) MSPManager() msp.MSPManager {
+	return r.mspConfigHandler.GetMSPManager()
+}
+
 // Handlers returns the handlers to be used when initializing the configtx.Manager
 func (r *resources) Handlers() map[cb.ConfigurationItem_ConfigurationType]Handler {
 	return r.handlers
 }
 
 // NewInitializer creates a chain initializer for the basic set of common chain resources
 func NewInitializer() Initializer {
+	mspConfigHandler := &mspmgmt.MSPConfigHandler{}
 	policyProviderMap := make(map[int32]policies.Provider)
 	for pType := range cb.Policy_PolicyType_name {
 		rtype := cb.Policy_PolicyType(pType)
 		switch rtype {
 		case cb.Policy_UNKNOWN:
 			// Do not register a handler
 		case cb.Policy_SIGNATURE:
-			policyProviderMap[pType] = cauthdsl.NewPolicyProvider(
-				cauthdsl.NewMockDeserializer()) // FIXME: here we should pass in the orderer MSP as soon as it's ready
+			policyProviderMap[pType] = cauthdsl.NewPolicyProvider(mspConfigHandler)
 		case cb.Policy_MSP:
 			// Add hook for MSP Handler here
 		}
@@ -91,14 +102,17 @@ func NewInitializer() Initializer {
 			handlers[rtype] = chainConfig
 		case cb.ConfigurationItem_Policy:
 			handlers[rtype] = policyManager
+		case cb.ConfigurationItem_MSP:
+			handlers[rtype] = mspConfigHandler
 		default:
 			handlers[rtype] = NewBytesHandler()
 		}
 	}
 
 	return &resources{
-		handlers:      handlers,
-		policyManager: policyManager,
-		chainConfig:   chainConfig,
+		handlers:         handlers,
+		policyManager:    policyManager,
+		chainConfig:      chainConfig,
+		mspConfigHandler: mspConfigHandler,
 	}
 }

common/localmsp/signer.go

@@ -19,10 +19,10 @@ package localmsp
 import (
 	"fmt"
 
-	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/hyperledger/fabric/common/crypto"
+	"github.com/hyperledger/fabric/core/crypto/primitives"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	cb "github.com/hyperledger/fabric/protos/common"
-	"github.com/hyperledger/fabric/core/peer/msp"
 )
 
 type mspSigner struct {

common/localmsp/signer_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/hyperledger/fabric/core/crypto/primitives"
 	"github.com/stretchr/testify/assert"
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 )
 
 func TestMain(m *testing.M) {

core/chaincode/exectransaction_test.go

@@ -38,8 +38,8 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
-	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/spf13/viper"
 	"golang.org/x/net/context"

core/common/validation/fullflow_test.go

@@ -25,8 +25,8 @@ import (
 	"os"
 
 	"github.com/hyperledger/fabric/common/util"
-	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"

core/common/validation/msgvalidation.go

@@ -21,7 +21,7 @@ import (
 
 	"bytes"
 
-	mspmgmt "github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"

core/endorser/endorser_test.go

@@ -30,8 +30,8 @@ import (
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/container"
 	"github.com/hyperledger/fabric/core/peer"
-	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	pbutils "github.com/hyperledger/fabric/protos/utils"

core/peer/peer.go

@@ -33,9 +33,8 @@ import (
 	"github.com/hyperledger/fabric/core/committer/txvalidator"
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
-	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/gossip/service"
-	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/utils"
 )
@@ -45,17 +44,12 @@ var peerLogger = logging.MustGetLogger("peer")
 type chainSupport struct {
 	configtx.Manager
 	ledger ledger.PeerLedger
-	mspmgr msp.MSPManager
 }
 
 func (cs *chainSupport) Ledger() ledger.PeerLedger {
 	return cs.ledger
 }
 
-func (cs *chainSupport) MSPManager() msp.MSPManager {
-	return cs.mspmgr
-}
-
 // chain is a local struct to manage objects in a chain
 type chain struct {
 	cs        *chainSupport
@@ -173,16 +167,16 @@ func createChain(cid string, ledger ledger.PeerLedger, cb *common.Block) error {
 		return err
 	}
 
-	// TODO Move to the configtx.Handler interface (which MSP already implements)
-	mgr, err := mspmgmt.GetMSPManagerFromBlock(cid, cb)
+	// TODO remove once all references to mspmgmt are gone from peer code
+	// MSP is now initialized above in configtx.Manager
+	_, err = mspmgmt.GetMSPManagerFromBlock(cid, cb)
 	if err != nil {
 		return err
 	}
 
 	cs := &chainSupport{
 		Manager: configtxManager,
 		ledger:  ledger,
-		mspmgr:  mgr,
 	}
 
 	c := committer.NewLedgerCommitter(ledger, txvalidator.NewTxValidator(cs))
@@ -197,11 +191,7 @@ func createChain(cid string, ledger ledger.PeerLedger, cb *common.Block) error {
 	chains.Lock()
 	defer chains.Unlock()
 	chains.list[cid] = &chain{
-		cs: &chainSupport{
-			Manager: configtxManager,
-			ledger:  ledger,
-			mspmgr:  mgr,
-		},
+		cs:        cs,
 		cb:        cb,
 		committer: c,
 	}

core/system_chaincode/escc/endorser_onevalidsignature.go

@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/op/go-logging"
 
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 )
 
 var logger = logging.MustGetLogger("escc")

core/system_chaincode/escc/endorser_onevalidsignature_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
 	"github.com/hyperledger/fabric/core/common/validation"
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	putils "github.com/hyperledger/fabric/protos/utils"

core/system_chaincode/vscc/validator_onevalidsignature.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/utils"
 	"github.com/op/go-logging"

core/system_chaincode/vscc/validator_onevalidsignature_test.go

@@ -24,8 +24,8 @@ import (
 	"github.com/hyperledger/fabric/common/cauthdsl"
 	"github.com/hyperledger/fabric/common/util"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
-	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/peer"
 	"github.com/hyperledger/fabric/protos/utils"

core/peer/msp/config.go msp/mgmt/config.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package mspmgmt
+package mgmt
 
 import (
 	"fmt"
@@ -138,3 +138,8 @@ func (bh *MSPConfigHandler) ProposeConfig(configItem *common.ConfigurationItem)
 func (bh *MSPConfigHandler) GetMSPManager() msp.MSPManager {
 	return bh.committedMgr
 }
+
+// DesierializeIdentity allows *MSPConfigHandler to implement the msp.Common interface
+func (bh *MSPConfigHandler) DeserializeIdentity(serializedIdentity []byte) (msp.Identity, error) {
+	return bh.committedMgr.DeserializeIdentity(serializedIdentity)
+}

core/peer/msp/mgmt.go msp/mgmt/mgmt.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package mspmgmt
+package mgmt
 
 import (
 	"sync"

core/peer/msp/mspconfigmgr_test.go msp/mgmt/mspconfigmgr_test.go

@@ -14,21 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package mspmgmt
+package mgmt_test
 
 import (
 	"testing"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/configtx"
 	"github.com/hyperledger/fabric/msp"
+	. "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	"github.com/hyperledger/fabric/protos/msp/utils"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestMSPConfigManager(t *testing.T) {
-	conf, err := msp.GetLocalMspConfig("../../../msp/sampleconfig/")
+	conf, err := msp.GetLocalMspConfig("../sampleconfig/")
 	assert.NoError(t, err)
 
 	confBytes, err := proto.Marshal(conf)

core/peer/msp/peermsp_test.go msp/mgmt/peermsp_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package mspmgmt
+package mgmt
 
 import (
 	"testing"

orderer/main.go

@@ -46,7 +46,7 @@ import (
 
 	"github.com/Shopify/sarama"
 	"github.com/hyperledger/fabric/common/localmsp"
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	logging "github.com/op/go-logging"
 )
 

orderer/mocks/configtx/configtx.go

@@ -20,6 +20,7 @@ import (
 	"github.com/hyperledger/fabric/common/chainconfig"
 	"github.com/hyperledger/fabric/common/configtx"
 	"github.com/hyperledger/fabric/common/policies"
+	"github.com/hyperledger/fabric/msp"
 	cb "github.com/hyperledger/fabric/protos/common"
 )
 
@@ -32,6 +33,9 @@ type Initializer struct {
 
 	// ChainConfigVal is returned as the result of ChainConfig()
 	ChainConfigVal chainconfig.Descriptor
+
+	// MSPManagerVal is returned as the result of MSPManager()
+	MSPManagerVal msp.MSPManager
 }
 
 // Returns the HandlersVal
@@ -49,6 +53,11 @@ func (i *Initializer) ChainConfig() chainconfig.Descriptor {
 	return i.ChainConfigVal
 }
 
+// Returns the MSPManagerVal
+func (i *Initializer) MSPManager() msp.MSPManager {
+	return i.MSPManagerVal
+}
+
 // Manager is a mock implementation of configtx.Manager
 type Manager struct {
 	Initializer

orderer/sbft_test.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/common/localmsp"
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/orderer/common/bootstrap/provisional"
 	"github.com/hyperledger/fabric/orderer/ledger"
 	"github.com/hyperledger/fabric/orderer/ledger/ram"

peer/chaincode/upgrade_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/hyperledger/fabric/peer/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	//	"github.com/hyperledger/fabric/protos/utils"
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 )
 
 var once sync.Once

peer/channel/create.go

@@ -27,7 +27,7 @@ import (
 	"github.com/hyperledger/fabric/protos/utils"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/spf13/cobra"
 )
 

peer/channel/create_test.go

@@ -22,7 +22,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/peer/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/peer/common"
 	cb "github.com/hyperledger/fabric/protos/common"
 )

peer/common/common.go

@@ -24,8 +24,8 @@ import (
 	"github.com/hyperledger/fabric/common/flogging"
 	"github.com/hyperledger/fabric/core/errors"
 	"github.com/hyperledger/fabric/core/peer"
-	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	"github.com/spf13/viper"
 )

protos/testutils/txtestutils.go

@@ -22,8 +22,8 @@ import (
 
 	"path/filepath"
 
-	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
+	mspmgmt "github.com/hyperledger/fabric/msp/mgmt"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
 	putils "github.com/hyperledger/fabric/protos/utils"