renames localnet to .localnet

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

Author: andkononykhin

.dockerignore

@@ -1,4 +1,5 @@
 .idea
 .vscode
 build
-localnet
+localnet
+.localnet

.gitignore

@@ -1,6 +1,7 @@
 settings.json
 .idea
 localnet
+.localnet
 rest-server.out
 .DS_Store
 .vscode

Makefile

@@ -12,7 +12,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=DcLedger \
 BUILD_FLAGS := -ldflags '$(ldflags)'
 OUTPUT_DIR ?= build
 
-LOCALNET_DIR ?= localnet
+LOCALNET_DIR ?= .localnet
 
 LICENSE_TYPE = "apache"
 COPYRIGHT_YEAR = "2020"
@@ -57,7 +57,7 @@ localnet_init:
 	/bin/bash ./genlocalnetconfig.sh
 
 localnet_start:
-	@if [ -d "localnet/observer0" ]; then\
+	@if [ -d "${LOCALNET_DIR}/observer0" ]; then\
 		docker-compose --profile observers up -d;\
 	else\
 		docker-compose up -d;\
@@ -71,7 +71,7 @@ localnet_export: localnet_stop
 	docker-compose run node1 dcld export --for-zero-height  >genesis.export.node1.json
 	docker-compose run node2 dcld export --for-zero-height  >genesis.export.node2.json
 	docker-compose run node3 dcld export --for-zero-height  >genesis.export.node3.json
-	@if [ -d "localnet/observer0" ]; then\
+	@if [ -d "${LOCALNET_DIR}/observer0" ]; then\
 		docker-compose run observer0 dcld export --for-zero-height  >genesis.export.observer0.json;\
 	fi
 
@@ -81,7 +81,7 @@ localnet_reset: localnet_stop
 	docker-compose run node1 dcld unsafe-reset-all
 	docker-compose run node2 dcld unsafe-reset-all
 	docker-compose run node3 dcld unsafe-reset-all
-	@if [ -d "localnet/observer0" ]; then\
+	@if [ -d "${LOCALNET_DIR}/observer0" ]; then\
 		docker-compose run observer0 dcld unsafe-reset-all;\
 	fi
 

README-DEV.md

@@ -67,7 +67,7 @@ This will start a local pool of 4 validator nodes in Docker. The nodes will expo
 
 If you need to start a new clean network then do the following steps prior to executing `make localnet_start`:
   - Remove `.dclcli` and `.dcld` directories from your user home directory (`~`)
-  - Remove `localnet` directory from the root directory of the cloned project
+  - Remove `.localnet` directory from the root directory of the cloned project
   - Initialize the new network data using `make localnet_init` 
 ## Run CLI
 Start a local pool as described above, and then just execute

deployment/ansible/client/config.yml

@@ -21,7 +21,7 @@
         state: absent
     - name: Copy config
       copy:
-        src: "./../../../localnet/client/"
+        src: "./../../../.localnet/client/"
         dest: "/home/ubuntu/.dclcli/"
         owner: "ubuntu"
-        group: "ubuntu"
+        group: "ubuntu"

deployment/ansible/nodes/config.yml

@@ -22,7 +22,7 @@
     - name: Copy config
       when: inventory_hostname == 'node' ~ item
       copy:
-        src: "./../../localnet/node{{item}}/"
+        src: "./../../.localnet/node{{item}}/"
         dest: "/home/ubuntu/.dcld/"
         owner: "ubuntu"
         group: "ubuntu"

docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - "26656-26657:26656-26657"
       - "26650:26660"
     volumes:
-      - ./localnet/node0:/root/.dcld:Z
+      - ./.localnet/node0:/root/.dcld:Z
     networks:
       localnet:
         ipv4_address: 192.167.10.2
@@ -37,7 +37,7 @@ services:
       - "26658-26659:26656-26657"
       - "26651:26660"
     volumes:
-      - ./localnet/node1:/root/.dcld:Z
+      - ./.localnet/node1:/root/.dcld:Z
     networks:
       localnet:
         ipv4_address: 192.167.10.3
@@ -51,7 +51,7 @@ services:
       - "26660-26661:26656-26657"
       - "26652:26660"
     volumes:
-      - ./localnet/node2:/root/.dcld:Z
+      - ./.localnet/node2:/root/.dcld:Z
     networks:
       localnet:
         ipv4_address: 192.167.10.4
@@ -67,7 +67,7 @@ services:
       # uncomment following line if starting in debug mode
       # - "2345:2345"
     volumes:
-      - ./localnet/node3:/root/.dcld:Z
+      - ./.localnet/node3:/root/.dcld:Z
     networks:
       localnet:
         ipv4_address: 192.167.10.5
@@ -87,7 +87,7 @@ services:
       # uncomment following line if starting in debug mode
       # - "2345:2345"
     volumes:
-      - ./localnet/observer0:/root/.dcld:Z
+      - ./.localnet/observer0:/root/.dcld:Z
     networks:
       localnet:
         ipv4_address: 192.167.10.6

docs/localnet-setup.md

@@ -45,5 +45,5 @@
   - Then you can start the network again with the existing data using `make localnet_start`
   - If you need to start a new clean network then do the following steps prior to executing `make localnet_start`:
     - Remove `.dclcli` and `.dcld` directories from your user home directory (`~`)
-    - Remove `localnet` directory from the root directory of the cloned project
+    - Remove `.localnet` directory from the root directory of the cloned project
     - Initialize the new network data using `make localnet_init`

genlocalnetconfig.sh

@@ -16,6 +16,7 @@
 set -euo pipefail
 
 DCL_OBSERVERS="${DCL_OBSERVERS:-}"
+LOCALNET_DIR=".localnet"
 
 SED_EXT=
 if [ "$(uname)" == "Darwin" ]; then
@@ -26,11 +27,11 @@ fi
 rm -rf ~/.dclcli
 rm -rf ~/.dcld
 
-rm -rf localnet
-mkdir localnet localnet/client localnet/node0 localnet/node1 localnet/node2 localnet/node3
+rm -rf "$LOCALNET_DIR"
+mkdir "$LOCALNET_DIR" "$LOCALNET_DIR"/{client,node0,node1,node2,node3}
 
 if [[ -n "$DCL_OBSERVERS" ]]; then
-    mkdir localnet/observer0
+    mkdir "$LOCALNET_DIR/observer0"
 fi
 
 # client
@@ -45,7 +46,7 @@ echo 'test1234' | dclcli keys add alice
 echo 'test1234' | dclcli keys add bob
 echo 'test1234' | dclcli keys add anna
 
-cp -r ~/.dclcli/* localnet/client
+cp -r ~/.dclcli/* "$LOCALNET_DIR/client"
 
 # node 0
 
@@ -70,7 +71,7 @@ dcld add-genesis-account --address=$anna_address --pubkey=$anna_pubkey --roles="
 
 echo 'test1234' | dcld gentx --from jack
 
-mv ~/.dcld/* localnet/node0
+mv ~/.dcld/* "$LOCALNET_DIR/node0"
 
 # node 1
 
@@ -83,7 +84,7 @@ dcld add-genesis-account --address=$anna_address --pubkey=$anna_pubkey --roles="
 
 echo 'test1234' | dcld gentx --from alice
 
-mv ~/.dcld/* localnet/node1
+mv ~/.dcld/* "$LOCALNET_DIR/node1"
 
 # node 2
 
@@ -96,7 +97,7 @@ dcld add-genesis-account --address=$anna_address --pubkey=$anna_pubkey --roles="
 
 echo 'test1234' | dcld gentx --from bob
 
-mv ~/.dcld/* localnet/node2
+mv ~/.dcld/* "$LOCALNET_DIR/node2"
 
 # node 3
 
@@ -109,10 +110,10 @@ dcld add-genesis-account --address=$anna_address --pubkey=$anna_pubkey --roles="
 
 echo 'test1234' | dcld gentx --from anna
 
-cp -r ~/.dcld/* localnet/node3
+cp -r ~/.dcld/* "$LOCALNET_DIR/node3"
 
 
-if [[ -d "localnet/observer0" ]]; then
+if [[ -d "$LOCALNET_DIR/observer0" ]]; then
     rm -rf ~/.dcld/*
     # observer0
 
@@ -123,16 +124,16 @@ if [[ -d "localnet/observer0" ]]; then
     dcld add-genesis-account --address=$bob_address --pubkey=$bob_pubkey --roles="Trustee,NodeAdmin"
     dcld add-genesis-account --address=$anna_address --pubkey=$anna_pubkey --roles="NodeAdmin"
 
-    cp -r ~/.dcld/* localnet/observer0
+    cp -r ~/.dcld/* "$LOCALNET_DIR/observer0"
 fi
 
 # Collect all validator creation transactions
 
 mkdir -p ~/.dcld/config/gentx
-cp localnet/node0/config/gentx/* ~/.dcld/config/gentx
-cp localnet/node1/config/gentx/* ~/.dcld/config/gentx
-cp localnet/node2/config/gentx/* ~/.dcld/config/gentx
-cp localnet/node3/config/gentx/* ~/.dcld/config/gentx
+cp "$LOCALNET_DIR"/node0/config/gentx/* ~/.dcld/config/gentx
+cp "$LOCALNET_DIR"/node1/config/gentx/* ~/.dcld/config/gentx
+cp "$LOCALNET_DIR"/node2/config/gentx/* ~/.dcld/config/gentx
+cp "$LOCALNET_DIR"/node3/config/gentx/* ~/.dcld/config/gentx
 
 # Embed them into genesis
 
@@ -141,35 +142,35 @@ dcld validate-genesis
 
 # Update genesis for all nodes
 
-cp ~/.dcld/config/genesis.json localnet/node0/config/
-cp ~/.dcld/config/genesis.json localnet/node1/config/
-cp ~/.dcld/config/genesis.json localnet/node2/config/
-cp ~/.dcld/config/genesis.json localnet/node3/config/
+cp ~/.dcld/config/genesis.json "$LOCALNET_DIR/node0/config/"
+cp ~/.dcld/config/genesis.json "$LOCALNET_DIR/node1/config/"
+cp ~/.dcld/config/genesis.json "$LOCALNET_DIR/node2/config/"
+cp ~/.dcld/config/genesis.json "$LOCALNET_DIR/node3/config/"
 
-if [[ -d "localnet/observer0" ]]; then
-    cp ~/.dcld/config/genesis.json localnet/observer0/config/
+if [[ -d "$LOCALNET_DIR/observer0" ]]; then
+    cp ~/.dcld/config/genesis.json "$LOCALNET_DIR/observer0/config/"
 fi
 
 # Find out node ids
 
-id0=$(ls localnet/node0/config/gentx | sed 's/gentx-\(.*\).json/\1/')
-id1=$(ls localnet/node1/config/gentx | sed 's/gentx-\(.*\).json/\1/')
-id2=$(ls localnet/node2/config/gentx | sed 's/gentx-\(.*\).json/\1/')
-id3=$(ls localnet/node3/config/gentx | sed 's/gentx-\(.*\).json/\1/')
+id0=$(ls "$LOCALNET_DIR/node0/config/gentx" | sed 's/gentx-\(.*\).json/\1/')
+id1=$(ls "$LOCALNET_DIR/node1/config/gentx" | sed 's/gentx-\(.*\).json/\1/')
+id2=$(ls "$LOCALNET_DIR/node2/config/gentx" | sed 's/gentx-\(.*\).json/\1/')
+id3=$(ls "$LOCALNET_DIR/node3/config/gentx" | sed 's/gentx-\(.*\).json/\1/')
 
 # Update address book of the first node
 peers="$id0@192.167.10.2:26656,$id1@192.167.10.3:26656,$id2@192.167.10.4:26656,$id3@192.167.10.5:26656"
 
 # Update address book of the first node 
-sed -i $SED_EXT "s/persistent_peers = \"\"/persistent_peers = \"$peers\"/g" localnet/node0/config/config.toml
-if [[ -d "localnet/observer0" ]]; then
-    sed -i $SED_EXT "s/persistent_peers = \"\"/persistent_peers = \"$peers\"/g" localnet/observer0/config/config.toml
+sed -i $SED_EXT "s/persistent_peers = \"\"/persistent_peers = \"$peers\"/g" "$LOCALNET_DIR/node0/config/config.toml"
+if [[ -d "$LOCALNET_DIR/observer0" ]]; then
+    sed -i $SED_EXT "s/persistent_peers = \"\"/persistent_peers = \"$peers\"/g" "$LOCALNET_DIR/observer0/config/config.toml"
 fi
 
 # Make RPC endpoint available externally
 for node_id in node0 node1 node2 node3 observer0; do
-    if [[ -d "localnet/${node_id}" ]]; then
-        sed -i $SED_EXT 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/g' "localnet/${node_id}/config/config.toml"
-        sed -i $SED_EXT 's/prometheus = false/prometheus = true/g' "localnet/${node_id}/config/config.toml"
+    if [[ -d "$LOCALNET_DIR/${node_id}" ]]; then
+        sed -i $SED_EXT 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/g' "$LOCALNET_DIR/${node_id}/config/config.toml"
+        sed -i $SED_EXT 's/prometheus = false/prometheus = true/g' "$LOCALNET_DIR/${node_id}/config/config.toml"
     fi
 done

gentestaccounts.sh

@@ -21,7 +21,9 @@ if [ "$(uname)" == "Darwin" ]; then
     SED_EXT="''"
 fi
 
-rm -rf localnet/client/*
+LOCALNET_DIR=".localnet"
+
+rm -rf "$LOCALNET_DIR"/client/*
 
 PASSWD=test1234
 NUMUSERS="${1:-10}"
@@ -40,9 +42,9 @@ done
 
 dcld validate-genesis
 
-cp -r ~/.dclcli/* localnet/client
+cp -r ~/.dclcli/* "$LOCALNET_DIR"/client
 for node_id in node0 node1 node2 node3 observer0; do
-    if [[ -d "localnet/${node_id}" ]]; then
-        cp -f ~/.dcld/config/genesis.json "localnet/${node_id}/config/"
+    if [[ -d "$LOCALNET_DIR/${node_id}" ]]; then
+        cp -f ~/.dcld/config/genesis.json "$LOCALNET_DIR/${node_id}/config/"
     fi
 done

integration_tests/ci/run-all.sh

@@ -15,6 +15,8 @@
 
 DETAILED_OUTPUT=true
 
+LOCALNET_DIR=".localnet"
+
 LOG_PREFIX="[run all] "
 SED_EXT=
 if [ "$(uname)" == "Darwin" ]; then
@@ -61,7 +63,7 @@ wait_for_height() {
 }
 
 patch_consensus_config() {
-  local NODE_CONFIGS=$(find localnet -type f -name "config.toml" -wholename "*node*")
+  local NODE_CONFIGS="$(find "$LOCALNET_DIR" -type f -name "config.toml" -wholename "*node*")"
 
   for NODE_CONFIG in ${NODE_CONFIGS}; do
     sed -i $SED_EXT 's/timeout_propose = "3s"/timeout_propose = "500ms"/g' "${NODE_CONFIG}"
@@ -95,9 +97,9 @@ cleanup_pool() {
   rm -rf ~/.dclcli
   rm -rf ~/.dcld
   if [ "$(uname)" == "Darwin" ]; then
-    rm -rf localnet 
+    rm -rf "$LOCALNET_DIR"
   else
-    sudo rm -rf localnet
+    sudo rm -rf "$LOCALNET_DIR"
   fi
 }
 

integration_tests/cli/validator-demo.sh

@@ -16,6 +16,8 @@
 set -euo pipefail
 source integration_tests/cli/common.sh
 
+LOCALNET_DIR=".localnet"
+
 random_string account
 container="validator-demo"
 node="node-demo"
@@ -51,8 +53,8 @@ test_divider
 
 echo "$account Prepare Node configuration files"
 docker exec $container dcld init $node --chain-id $chain_id
-docker cp ./localnet/node0/config/genesis.json $container:/root/.dcld/config
-peers=$(cat localnet/node0/config/config.toml | grep -o -E "persistent_peers = \".*\"")
+docker cp "$LOCALNET_DIR/node0/config/genesis.json" $container:/root/.dcld/config
+peers="$(cat "$LOCALNET_DIR/node0/config/config.toml" | grep -o -E "persistent_peers = \".*\"")"
 docker exec $container sed -i "s/persistent_peers = \"\"/$peers/g" /root/.dcld/config/config.toml
 docker exec $container sed -i 's/laddr = "tcp:\/\/127.0.0.1:26657"/laddr = "tcp:\/\/0.0.0.0:26657"/g' /root/.dcld/config/config.toml
 
@@ -136,4 +138,4 @@ check_response "$result" "\"pid\": $pid"
 check_response "$result" "\"productLabel\": \"$productName\""
 echo "$result"
 
-docker rm -f $container
+docker rm -f $container