Address PR comments

Signed-off-by: Liran Funaro <liran.funaro@gmail.com>

Author: liran-funaro

cmd/config/samples/loadgen.yaml

@@ -52,6 +52,9 @@ load-profile:
     channel-id: mychannel
     namespace-policies:
       0:
+        # Supported schemes: MSP, ECDSA, EDDSA, and BLS
+        # If MSP is used, the default policy is requiring
+        # endorsement by all peer organizations.
         scheme: ECDSA
         seed: 10
       _meta:

loadgen/workload/config.go

@@ -109,15 +109,13 @@ type PolicyProfile struct {
 	// If ConfigBlockPath is specified, this value is ignored.
 	OrdererEndpoints []*commontypes.OrdererEndpoint `mapstructure:"orderer-endpoints" yaml:"orderer-endpoints"`
 
-	// ConfigBlockPath may specify the config block to use.
-	// If this field is empty, a default config block will be generated.
-	ConfigBlockPath string `mapstructure:"config-block-path" yaml:"config-block-path"`
-
 	// CryptoMaterialPath may specify the path to the material generated by CreateDefaultConfigBlockWithCrypto().
 	// If this field is empty, the material will be generated into a temporary folder.
 	// If this path does not exist, or it is empty, the material will be generated into it.
-	// If ConfigBlockPath is empty, the config block will be fetched from this folder.
+	// If ConfigBlockPath is empty, the config block will be fetched from CryptoMaterialPath.
+	// Otherwise, it will be fetched from ConfigBlockPath regardless of CryptoMaterialPath.
 	CryptoMaterialPath string `mapstructure:"crypto-material-path" yaml:"crypto-material-path"`
+	ConfigBlockPath    string `mapstructure:"config-block-path" yaml:"config-block-path"`
 
 	// ChannelID and Identity are used to create the TX envelop.
 	ChannelID string                      `mapstructure:"channel-id"`

loadgen/workload/config_tx.go

@@ -86,9 +86,9 @@ func CreateConfigBlock(policy *PolicyProfile) (*common.Block, error) {
 // prepareCryptoMaterial generates the crypto material for a policy if it wasn't generated before.
 func prepareCryptoMaterial(policy *PolicyProfile) error {
 	if policy.CryptoMaterialPath == "" {
-		tempDir, err := os.MkdirTemp("", "sc-loadgen-crypto-*")
+		tempDir, err := makeTemporaryDir()
 		if err != nil {
-			return errors.Wrap(err, "error creating temp dir for crypto-material")
+			return err
 		}
 		policy.CryptoMaterialPath = tempDir
 	}
@@ -114,16 +114,24 @@ func prepareCryptoMaterial(policy *PolicyProfile) error {
 
 // CreateDefaultConfigBlock creates a config block with default values.
 func CreateDefaultConfigBlock(conf *ConfigBlock, profileName string) (*common.Block, error) {
-	target, err := os.MkdirTemp("", "sc-loadgen-crypto-*")
+	target, err := makeTemporaryDir()
 	if err != nil {
-		return nil, errors.Wrap(err, "failed creating temp dir for config block generation")
+		return nil, err
 	}
 	defer func() {
 		_ = os.RemoveAll(target)
 	}()
 	return CreateDefaultConfigBlockWithCrypto(target, conf, profileName)
 }
 
+func makeTemporaryDir() (string, error) {
+	tempDir, err := os.MkdirTemp("", "sc-loadgen-crypto-*")
+	if err != nil {
+		return "", errors.Wrap(err, "error creating temp dir for crypto-material")
+	}
+	return tempDir, nil
+}
+
 // CreateDefaultConfigBlockWithCrypto creates a config block with crypto material.
 func CreateDefaultConfigBlockWithCrypto(
 	targetPath string, conf *ConfigBlock, profileName string,