refactor(fabric): Move UnmarshalConfigEnvelope

This commit adds UnmarshalConfigEnvelope to our local protoutils

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Author: mbrandenburger

platform/fabric/core/generic/membership/membership.go

@@ -18,7 +18,6 @@ import (
 	"github.com/hyperledger/fabric-lib-go/bccsp/factory"
 	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric/common/channelconfig"
-	"github.com/hyperledger/fabric/common/configtx"
 	"github.com/hyperledger/fabric/msp"
 )
 
@@ -72,7 +71,7 @@ func (c *Service) validateConfig(env *cb.Envelope) (*channelconfig.Bundle, error
 		return nil, errors.Wrapf(err, "cannot get payload from config transaction")
 	}
 
-	cenv, err := configtx.UnmarshalConfigEnvelope(payload.Data)
+	cenv, err := protoutil.UnmarshalConfigEnvelope(payload.Data)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error unmarshalling config which passed initial validity checks")
 	}

platform/fabric/protoutil/protoutils.go

@@ -9,6 +9,7 @@ package protoutil
 import (
 	"github.com/hyperledger-labs/fabric-smart-client/pkg/utils/proto"
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
+	cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/msp"
 	"github.com/hyperledger/fabric-protos-go-apiv2/peer"
 	"github.com/hyperledger/fabric/protoutil"
@@ -198,3 +199,13 @@ func UnmarshalBlock(encoded []byte) (*common.Block, error) {
 func ComputeTxID(nonce, creator []byte) string {
 	return protoutil.ComputeTxID(nonce, creator)
 }
+
+// UnmarshalConfigEnvelope attempts to unmarshal bytes to a *cb.ConfigEnvelope
+func UnmarshalConfigEnvelope(data []byte) (*cb.ConfigEnvelope, error) {
+	configEnv := &cb.ConfigEnvelope{}
+	err := proto.Unmarshal(data, configEnv)
+	if err != nil {
+		return nil, err
+	}
+	return configEnv, nil
+}