Update Channel capabilities and msp version to V3_0

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 <[email protected]>
denyeart · Jun 27, 2024 · 58bf136 · 58bf136
1 parent fa1743d
commit 58bf136
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
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 change
@@ Expand Up / @@ -19,7 +19,7 @@ const ( @@
     	MSPv1_1
     	MSPv1_3
     	MSPv1_4_3
-    	MSPv2_4
+    	MSPv3_0
     )
     // NewOpts represent
@@ Expand Down @@