From 58bf136def09ad2f33b9d5e2b7fba34e18abc3f1 Mon Sep 17 00:00:00 2001 From: Johann Westphall Date: Wed, 20 Jul 2022 04:39:47 -0300 Subject: [PATCH] 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 --- msp/factory.go | 2 +- msp/msp.go | 2 +- msp/mspimpl.go | 4 ++-- msp/mspimplsetup.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/msp/factory.go b/msp/factory.go index 5377c7baf67..ada7db4c713 100644 --- 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 index 31f013dabb3..c1d07c66c73 100644 --- 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 index 12b97f37ec4..446ff4ffed1 100644 --- 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 index 84e1f3c0a7f..d3faffe9e00 100644 --- 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