signPrivateKey ---> priv_sk (#181)

Signed-off-by: May.Buzaglo <May.Buzaglo@ibm.com>

Author: MayRosenbaum

common/tools/armageddon/armageddon_test.go

@@ -549,8 +549,8 @@ func checkCryptoDir(outputDir string) error {
 						return fmt.Errorf("error reading directory %s\n", mspSubDirPath)
 					}
 					for _, file := range files {
-						if !strings.HasSuffix(file.Name(), ".pem") {
-							return fmt.Errorf("error reading %s files, suffix file is not pem\n", mspSubDirPath)
+						if !strings.HasSuffix(file.Name(), ".pem") && !strings.Contains(file.Name(), "priv_sk") {
+							return fmt.Errorf("error reading %s files, expect pem files or file name priv_sk \n", mspSubDirPath)
 						}
 					}
 				}

common/tools/armageddon/cryptogen.go

@@ -269,7 +269,7 @@ func createSignCertAndPrivateKeyForNode(ca *ca.CA, dir string, endpoint string,
 	}
 
 	ca.SignCertificate(filepath.Join(dir, "crypto", "ordererOrganizations", fmt.Sprintf("org%d", partyID), "orderers", fmt.Sprintf("party%d", partyID), role, "msp", "signcerts"), "sign", nil, nodesIPs, getPublicKey(privateKey), x509.KeyUsageDigitalSignature, []x509.ExtKeyUsage{})
-	err = writePEMToFile(filepath.Join(dir, "crypto", "ordererOrganizations", fmt.Sprintf("org%d", partyID), "orderers", fmt.Sprintf("party%d", partyID), role, "msp", "keystore", "sign-privateKey.pem"), "PRIVATE KEY", privateKeyBytes)
+	err = writePEMToFile(filepath.Join(dir, "crypto", "ordererOrganizations", fmt.Sprintf("org%d", partyID), "orderers", fmt.Sprintf("party%d", partyID), role, "msp", "keystore", "priv_sk"), "PRIVATE KEY", privateKeyBytes)
 	if err != nil {
 		return err
 	}

config/config.go

@@ -161,7 +161,7 @@ func (config *Configuration) ExtractRouterConfig() *nodeconfig.RouterNodeConfig
 }
 
 func (config *Configuration) ExtractBatcherConfig() *nodeconfig.BatcherNodeConfig {
-	signingPrivateKey, err := utils.ReadPem(filepath.Join(config.LocalConfig.NodeLocalConfig.GeneralConfig.LocalMSPDir, "keystore", "sign-privateKey.pem"))
+	signingPrivateKey, err := utils.ReadPem(filepath.Join(config.LocalConfig.NodeLocalConfig.GeneralConfig.LocalMSPDir, "keystore", "priv_sk"))
 	if err != nil {
 		panic(fmt.Sprintf("error launching batcher, failed extracting batcher config: %s", err))
 	}
@@ -204,7 +204,7 @@ func (config *Configuration) ExtractBatcherConfig() *nodeconfig.BatcherNodeConfi
 }
 
 func (config *Configuration) ExtractConsenterConfig() *nodeconfig.ConsenterNodeConfig {
-	signingPrivateKey, err := utils.ReadPem(filepath.Join(config.LocalConfig.NodeLocalConfig.GeneralConfig.LocalMSPDir, "keystore", "sign-privateKey.pem"))
+	signingPrivateKey, err := utils.ReadPem(filepath.Join(config.LocalConfig.NodeLocalConfig.GeneralConfig.LocalMSPDir, "keystore", "priv_sk"))
 	if err != nil {
 		panic(fmt.Sprintf("error launching consenter, failed extracting consenter config: %s", err))
 	}