review fixes

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

Author: andkononykhin

deployment/scripts/run_dcl_node

@@ -71,10 +71,10 @@ Options:
   -c,  --chain-id   chain id, default: '$DEF_CHAIN_ID'
   -h,  --help       print this help and exit
   -k,  --key-name   account key-name, default: '<node-name>admin'
-  -p,  --peer       peer hostspec as 'HOST:PORT', default: first entry of 'persistent_peers.txt'
   -u,  --user       node service user, default: '$DEF_NODE_USER'
   -t,  --type       node type, one of 'genesis', 'validator', 'observer', default: '$DEF_NODE_TYPE'
 "
+#-p,  --peer       peer hostspec as 'HOST:PORT', default: first entry of 'persistent_peers.txt'
 #  -v,  --verbose    be more verbose
 }
 
@@ -264,6 +264,7 @@ function config_node {
                 exit 1
             fi
 
+            # TODO move ot a separate script
             # Open '26656' (p2p) and '26657' (RPC) ports. 
             sudo ufw allow 26656/tcp
             sudo ufw allow 26657/tcp
@@ -313,6 +314,7 @@ function verify_node {
     check1="$(dclcli status --node "$_node_ip" | grep latest_block_height)"
 
     echo "sync_info.latest_block_height Try 2"
+    # TODO it should depend on empty block creation setting value
     sleep 6
     check2="$(dclcli status --node "$_node_ip" | grep latest_block_height)"
 
@@ -381,13 +383,8 @@ fi
 
 echo "Configuring CLI"
 
-if [[ "$NODE_TYPE" == "observer" ]]; then
-    # FIXME is it right
-    config_cli "$CHAIN_ID"
-else
-    config_cli "$CHAIN_ID" "$PEER_ADDR:$CLI_PORT"
-fi
-
+# Note. we consider that cli would connect to local node (default setting)
+config_cli "$CHAIN_ID"
 
 if [[ "$NODE_TYPE" != "observer" ]]; then
     echo "Generating genesis account keys..."

deployment/scripts/verify_node

@@ -28,6 +28,7 @@ echo "sync_info.latest_block_height Try 1"
 check1="$(dclcli status --node "$NODE_IP" | grep latest_block_height)"
 
 echo "sync_info.latest_block_height Try 2"
+# TODO it should depend on empty block creation setting value
 sleep 6
 check2="$(dclcli status --node "$NODE_IP" | grep latest_block_height)"
 

docs/running-node.md

@@ -7,7 +7,7 @@ This document describes in details how to configure different types of DCLedger
 *   Common release artifacts:
     * Binary artifacts (part of the release):
         * dcld: The binary used for running a node.
-        * dclcli: The binary that allow users to interact with the network of nodes.
+        * dclcli: The binary that allows users to interact with the network of nodes.
     * The service configuration file `dcld.service` 
     (either part of the release or [deployment](https://github.com/zigbee-alliance/distributed-compliance-ledger/deployment) folder).    
     * where to get:
@@ -38,7 +38,7 @@ Current delivery is compiled and tested under `Ubuntu 18.04.3 LTS` so we recomme
 Notes:
     * the deployment commands below will try to setup and run `dcld` systemd service on Ubuntu
     * that will require `sudo` for a user
-    * in case non-Ubuntu system these steps will be scipped so you would need to take case about
+    * in case non-Ubuntu system these steps will be scipped so you would need to take care about
 
 ## Deployment
 
@@ -63,16 +63,18 @@ $ run_dcl_node -t genesis -c <chain-id> node0
 ```
 
 This command:
-    - configures dclcli to communicate with the genesis node (the local one)
+
     - generates a new key entry for a node admin account
     - generates `genesis.json` file with the following entries:
         - a genenesis account for the key entry above with `Trustee` and `NodeAdmin` roles
         - a genesis txn that makes the local node a validator
     - configures and starts the node
 
 Outputs:
-    - key data (address, public key, mnemonic) as `*.dclkey.json` file in the current directory
-    - genesis file `$HOME/.dcld/config/genesis.json`
+
+    - `*.dclkey.json` file in the current directory with node admint key data (address, public key, mnemonic)
+    - standard output:
+        - genesis file `$HOME/.dcld/config/genesis.json`
 
 ## Validator Node
 
@@ -87,19 +89,19 @@ $ run_dcl_node -c <chain-id> <node-name>
 ```
 
 This command:
-    - configures dclcli to communicate with the genesis node:
-        - by default it will evaluate it from the `persisten_peers.txt` (using its first entry)
-        - you can specify the peer explicitly using `-p/--peer`: `-p <node-id@host:port>` (port is usually considered as `26656` here)
+
     - generates a new key entry for a node admin account
         - by default `<node_name>admin` key name is used
         - can be configured using `-k/--key-name` option
     - properly locates `genesis.json`
     - configures and starts the node
 
 Outputs:
-    - key data (address, public key, mnemonic) as `*.dclkey.json` file in the current directory
-    - node admin key data: `address` and `pubkey`
-    - validator data: `address` and `pubkey`
+
+    - `*.dclkey.json` file in the current directory with node admint key data (address, public key, mnemonic)
+    - standard output:
+        - node admin key data: `address` and `pubkey`
+        - validator data: `address` and `pubkey`
 
 2. Provide generated node admin key `address` and `pubkey` to any `Trustee`(s). So they may create
    an account with `NodeAdmin` role. And **wait** until: