updates bench scripts and docs

Signed-off-by: Andrey Kononykhin <andkononykhin@gmail.com>

Author: andkononykhin

bench/README.md

@@ -28,7 +28,7 @@ By that reason load test uses prepared load data which can be generated as follo
 *   Initialize the pool and test accounts (**Warning** applicable to local in-docker pool only for now):
 
     ```bash
-    sudo make localnet_clean
+    make localnet_clean
 
     # DCL_OBSERVERS=1 make localnet_init  # to initialize observers as well
     make localnet_init

bench/generate.py

@@ -27,7 +27,8 @@
 from render import render
 
 
-DCLCLI = "dclcli"
+DCLCLI = "dcld"
+DCL_CHAIN_ID = "dclchain"
 
 DEF_ACCOUNT_N_START = 4
 DEF_SEQUENCE_START = 0
@@ -36,10 +37,8 @@
 SEQUENCE_START_F = "sequence-number-start"
 QUERIES_F = "q"
 
-TEST_PASSWORD = "test1234"
-
 MODEL_INFO_PREFIX = 1
-VENDOR_PRODUCTS_PREFIX = 2
+# VENDOR_PRODUCTS_PREFIX = 2
 
 
 def pack_model_info_key(vid, pid):
@@ -110,14 +109,13 @@ def txn_generate(u_address, txn_t_cls, txn_t_cmd, **params):
 
 
 def txn_sign(u_address, account, sequence, f_path):
-    cmd = [DCLCLI, "tx", "sign"]
+    cmd = [DCLCLI, "tx", "sign", "--chain-id", DCL_CHAIN_ID]
     params = {"from": u_address}
     cmd += to_cli_args(
         account_number=account, sequence=sequence, gas="auto", **params
     )
     cmd.extend(["--offline", f_path])
-    cmd = f"echo '{TEST_PASSWORD}' | {' '.join(cmd)}"
-    return run_shell_cmd(cmd, shell=True).stdout
+    return run_shell_cmd(cmd).stdout
 
 
 def txn_encode(f_path):

bench/locustfile.py

@@ -123,6 +123,7 @@ def add_model(self):
                 f"{self.host}/", json.dumps(payload), name="write-txn",
                 catch_response=True
             ) as response:
+                # logger.debug(f"{self.username}: response {response.__dict__}")
                 logger.debug(f"{self.username}: response {response.text}")
                 payload = json.loads(response.text)
                 if "error" in payload:

bench/test.spec.yaml

@@ -17,12 +17,13 @@ templates:
   add-model: &add-model-tmpl
       vid: 1
       pid: 1
-      name: Device
-      description: decription
-      sku: SKU12FS
-      hardware-version: 1.0
-      firmware-version: 2.0
-      tis-or-trp-testing-completed: "true"
+      deviceTypeID: 1
+      productName: Device
+      productLabel: decription
+      partNumber: SKU12FS
+      #hardware-version: 1.0
+      #firmware-version: 2.0
+      #tis-or-trp-testing-completed: "true"
 
 defaults:
   account-number-start: 4
@@ -46,9 +47,9 @@ users:
   tu{{ vid_str }}:
     q:
     {%- for pid in range(1, write_users_q_c) %}
-      - tx/modelinfo/add-model:
+      - tx/model/add-model:
           <<: *add-model-tmpl
-          vid: {{ vid_str }}
+          vid: {{ vid }}
           pid: {{ pid }}
     {%- endfor %}
 

cmd/dcld/cmd/genaccounts.go

@@ -16,6 +16,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
+	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	dclauthtypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/types"
@@ -27,6 +28,7 @@ const (
 	FlagAddress = "address"
 	FlagPubKey  = "pubkey"
 	FlagRoles   = "roles"
+	FlagVID     = "vid"
 )
 
 // AddGenesisAccountCmd returns add-genesis-account cobra Command.
@@ -95,8 +97,17 @@ the address will be looked up in the local Keybase.
 			//	    and uses pack/unpack API to extract accounts from genesis state
 
 			ba := authtypes.NewBaseAccount(addr, pk, 0, 0)
+
+			var vendorID uint64 = 0
+			if viper.GetString(FlagVID) != "" {
+				vendorID, err = cast.ToUint64E(viper.GetString(FlagVID))
+				if err != nil {
+					return err
+				}
+			}
+
 			// FIXME issue 99 VendorID
-			genAccount = dclauthtypes.NewAccount(ba, roles, 0)
+			genAccount = dclauthtypes.NewAccount(ba, roles, vendorID)
 
 			if err := genAccount.Validate(); err != nil {
 				return fmt.Errorf("failed to validate new genesis account: %w", err)
@@ -138,6 +149,7 @@ the address will be looked up in the local Keybase.
 	cmd.Flags().String(FlagPubKey, "", "The validator's Protobuf JSON encoded public key")
 	cmd.Flags().String(FlagRoles, "",
 		fmt.Sprintf("The list of roles (split by comma) to assign to account (supported roles: %v)", dclauthtypes.Roles))
+	cmd.Flags().String(FlagVID, "", "Vendor ID associated with this account. Required only for Vendor Roles")
 
 	cmd.Flags().String(flags.FlagHome, defaultNodeHome, "The application home directory")
 	cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|kwallet|pass|test)")

genlocalnetconfig.sh

@@ -25,7 +25,7 @@ if [ "$(uname)" == "Darwin" ]; then
 fi
 
 DCL_DIR="$HOME/.dcl"
-KEYPASSWD=test1234
+KEYPASSWD=test1234  # NOTE not necessary actually since we yse 'test' keyring backend now
 CHAIN_ID=dclchain
 
 rm -rf "$DCL_DIR"
@@ -41,13 +41,7 @@ fi
 
 dcld config chain-id "$CHAIN_ID"
 dcld config output json
-# TODO issue 99: empty value will override defaults by some reason
-#       (e.g. in dcld status)
 dcld config node "tcp://localhost:26657"
-# TODO issue 99: check the replacement for the setting
-# dcld config indent true
-# TODO issue 99: check the replacement for the setting
-# dcld config trust-node false
 dcld config keyring-backend test
 dcld config broadcast-mode block
 

gentestaccounts.sh

@@ -21,30 +21,30 @@ if [ "$(uname)" == "Darwin" ]; then
     SED_EXT="''"
 fi
 
+DCL_DIR="$HOME/.dcl"
 LOCALNET_DIR=".localnet"
 
 rm -rf "$LOCALNET_DIR"/client/*
 
-PASSWD=test1234
 NUMUSERS="${1:-10}"
 
 for i in $(seq 1 "$NUMUSERS"); do
     userN="$(printf "%05d\n" "$i")"
     username="tu${userN}"
-    echo $PASSWD"" | dclcli keys add "$username"
+    dcld keys add "$username"
 
-    tu_address="$(dclcli keys show "$username" -a)"
-    tu_pubkey="$(dclcli keys show "$username" -p)"
+    tu_address="$(dcld keys show "$username" -a)"
+    tu_pubkey="$(dcld keys show "$username" -p)"
 
-    dcld add-genesis-account --address=$tu_address --pubkey=$tu_pubkey --roles="Vendor"
+    dcld add-genesis-account --address=$tu_address --pubkey=$tu_pubkey --roles="Vendor" --vid="$i"
     echo "$username generated"
 done
 
 dcld validate-genesis
 
-cp -r ~/.dclcli/* "$LOCALNET_DIR"/client
+cp -r "$DCL_DIR"/* "$LOCALNET_DIR"/client
 for node_id in node0 node1 node2 node3 observer0; do
     if [[ -d "$LOCALNET_DIR/${node_id}" ]]; then
-        cp -f ~/.dcld/config/genesis.json "$LOCALNET_DIR/${node_id}/config/"
+        cp -f "$DCL_DIR"/config/genesis.json "$LOCALNET_DIR/${node_id}/config/"
     fi
 done