[FAB-18323] CherryPick: remove ephemeral from BCCSP SW options (#1553)

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com> Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>
hyperledger · Dec 4, 2020 · 746b7e9 · 746b7e9
1 parent 25d99ba
commit 746b7e9
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/bccsp/factory/factory_test.go b/bccsp/factory/factory_test.go
@@ -78,7 +78,7 @@ BCCSP:
 	cfgVariations := []*FactoryOpts{
 		{},
 		{ProviderName: "SW"},
-		{ProviderName: "SW", SwOpts: &SwOpts{HashFamily: "SHA2", SecLevel: 256, Ephemeral: true}},
+		{ProviderName: "SW", SwOpts: &SwOpts{HashFamily: "SHA2", SecLevel: 256}},
 		jsonBCCSP,
 		yamlBCCSP,
 	}

diff --git a/bccsp/factory/opts.go b/bccsp/factory/opts.go
@@ -23,8 +23,6 @@ func GetDefaultOpts() *FactoryOpts {
 		SwOpts: &SwOpts{
 			HashFamily: "SHA2",
 			SecLevel:   256,
-
-			Ephemeral: true,
 		},
 	}
 }

diff --git a/bccsp/factory/pkcs11_test.go b/bccsp/factory/pkcs11_test.go
@@ -75,7 +75,6 @@ func TestSetFactoriesInvalidArgs(t *testing.T) {
 func TestGetBCCSPFromOpts(t *testing.T) {
 	opts := GetDefaultOpts()
 	opts.SwOpts.FileKeystore = &FileKeystoreOpts{KeyStorePath: os.TempDir()}
-	opts.SwOpts.Ephemeral = false
 	csp, err := GetBCCSPFromOpts(opts)
 	assert.NoError(t, err)
 	assert.NotNil(t, csp)

diff --git a/bccsp/factory/swfactory.go b/bccsp/factory/swfactory.go
@@ -44,9 +44,7 @@ func (f *SWFactory) Get(config *FactoryOpts) (bccsp.BCCSP, error) {
 	swOpts := config.SwOpts
 
 	var ks bccsp.KeyStore
-	if swOpts.Ephemeral == true {
-		ks = sw.NewDummyKeyStore()
-	} else if swOpts.FileKeystore != nil {
+	if swOpts.FileKeystore != nil {
 		fks, err := sw.NewFileBasedKeyStore(nil, swOpts.FileKeystore.KeyStorePath, false)
 		if err != nil {
 			return nil, errors.Wrapf(err, "Failed to initialize software key store")
@@ -65,11 +63,8 @@ func (f *SWFactory) Get(config *FactoryOpts) (bccsp.BCCSP, error) {
 // SwOpts contains options for the SWFactory
 type SwOpts struct {
 	// Default algorithms when not specified (Deprecated?)
-	SecLevel   int    `mapstructure:"security" json:"security" yaml:"Security"`
-	HashFamily string `mapstructure:"hash" json:"hash" yaml:"Hash"`
-
-	// Keystore Options
-	Ephemeral     bool               `mapstructure:"tempkeys,omitempty" json:"tempkeys,omitempty"`
+	SecLevel      int                `mapstructure:"security" json:"security" yaml:"Security"`
+	HashFamily    string             `mapstructure:"hash" json:"hash" yaml:"Hash"`
 	FileKeystore  *FileKeystoreOpts  `mapstructure:"filekeystore,omitempty" json:"filekeystore,omitempty" yaml:"FileKeyStore"`
 	DummyKeystore *DummyKeystoreOpts `mapstructure:"dummykeystore,omitempty" json:"dummykeystore,omitempty"`
 	InmemKeystore *InmemKeystoreOpts `mapstructure:"inmemkeystore,omitempty" json:"inmemkeystore,omitempty"`

diff --git a/msp/configbuilder.go b/msp/configbuilder.go
@@ -146,7 +146,6 @@ func SetupBCCSPKeystoreConfig(bccspConfig *factory.FactoryOpts, keystoreDir stri
 		// Only override the KeyStorePath if it was left empty
 		if bccspConfig.SwOpts.FileKeystore == nil ||
 			bccspConfig.SwOpts.FileKeystore.KeyStorePath == "" {
-			bccspConfig.SwOpts.Ephemeral = false
 			bccspConfig.SwOpts.FileKeystore = &factory.FileKeystoreOpts{KeyStorePath: keystoreDir}
 		}
 	}

diff --git a/orderer/common/server/main_test.go b/orderer/common/server/main_test.go
@@ -316,7 +316,6 @@ func TestLoadLocalMSP(t *testing.T) {
 							SwOpts: &factory.SwOpts{
 								HashFamily: "SHA2",
 								SecLevel:   256,
-								Ephemeral:  true,
 							},
 						},
 					},
@@ -764,7 +763,6 @@ func genesisConfig(t *testing.T) *localconfig.TopLevel {
 				SwOpts: &factory.SwOpts{
 					HashFamily: "SHA2",
 					SecLevel:   256,
-					Ephemeral:  true,
 				},
 			},
 		},