Update Channel capabilities and msp version to V3_0

johannww · denyeart · commit 58bf136def09 · 2024-06-27T15:33:51.000-04:00
As requested by the fabric Code Owner yacovm, the
capabilities and the msp version name must be renamed
to V3_0, because the ed25519-support will probably
enter as a feature in Fabric 3.0.

Signed-off-by: Johann Westphall &lt;johannwestphall@gmail.com&gt;
diff --git a/msp/factory.go b/msp/factory.go
@@ -19,7 +19,7 @@ const (
 	MSPv1_1
 	MSPv1_3
 	MSPv1_4_3
-	MSPv2_4
+	MSPv3_0
 )
 
 // NewOpts represent
diff --git a/msp/msp.go b/msp/msp.go
@@ -209,7 +209,7 @@ var mspTypeStrings = map[ProviderType]string{
 }
 
 var Options = map[string]NewOpts{
-	ProviderTypeToString(FABRIC): &BCCSPNewOpts{NewBaseOpts: NewBaseOpts{Version: MSPv2_4}},
+	ProviderTypeToString(FABRIC): &BCCSPNewOpts{NewBaseOpts: NewBaseOpts{Version: MSPv3_0}},
 	ProviderTypeToString(IDEMIX): &IdemixNewOpts{NewBaseOpts: NewBaseOpts{Version: MSPv1_1}},
 }
 
diff --git a/msp/mspimpl.go b/msp/mspimpl.go
@@ -140,8 +140,8 @@ func newBccspMsp(version MSPVersion, defaultBCCSP bccsp.BCCSP) (MSP, error) {
 		theMsp.internalValidateIdentityOusFunc = theMsp.validateIdentityOUsV142
 		theMsp.internalSatisfiesPrincipalInternalFunc = theMsp.satisfiesPrincipalInternalV142
 		theMsp.internalSetupAdmin = theMsp.setupAdminsV142
-	case MSPv2_4:
-		theMsp.internalSetupFunc = theMsp.setupV24
+	case MSPv3_0:
+		theMsp.internalSetupFunc = theMsp.setupV3
 		theMsp.internalValidateIdentityOusFunc = theMsp.validateIdentityOUsV142
 		theMsp.internalSatisfiesPrincipalInternalFunc = theMsp.satisfiesPrincipalInternalV142
 		theMsp.internalSetupAdmin = theMsp.setupAdminsV142
diff --git a/msp/mspimplsetup.go b/msp/mspimplsetup.go
@@ -659,7 +659,7 @@ func (msp *bccspmsp) setupV142(conf *m.FabricMSPConfig) error {
 	return nil
 }
 
-func (msp *bccspmsp) setupV24(conf *m.FabricMSPConfig) error {
+func (msp *bccspmsp) setupV3(conf *m.FabricMSPConfig) error {
 	err := msp.preSetupV142(conf)
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const (`
`19`	`19`	`MSPv1_1`
`20`	`20`	`MSPv1_3`
`21`	`21`	`MSPv1_4_3`
`22`		`- MSPv2_4`
	`22`	`+ MSPv3_0`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// NewOpts represent`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ var mspTypeStrings = map[ProviderType]string{`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`var Options = map[string]NewOpts{`
`212`		`- ProviderTypeToString(FABRIC): &BCCSPNewOpts{NewBaseOpts: NewBaseOpts{Version: MSPv2_4}},`
	`212`	`+ ProviderTypeToString(FABRIC): &BCCSPNewOpts{NewBaseOpts: NewBaseOpts{Version: MSPv3_0}},`
`213`	`213`	`ProviderTypeToString(IDEMIX): &IdemixNewOpts{NewBaseOpts: NewBaseOpts{Version: MSPv1_1}},`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ func (msp bccspmsp) setupV142(conf m.FabricMSPConfig) error {`
`659`	`659`	`return nil`
`660`	`660`	`}`
`661`	`661`
`662`		`-func (msp bccspmsp) setupV24(conf m.FabricMSPConfig) error {`
	`662`	`+func (msp bccspmsp) setupV3(conf m.FabricMSPConfig) error {`
`663`	`663`	`err := msp.preSetupV142(conf)`
`664`	`664`	`if err != nil {`
`665`	`665`	`return err`