refactor(tests/upgrade): fix multi-node tests

Signed-off-by: Artur Troian <[email protected]>

Author: troian

make/test-upgrade.mk

@@ -67,7 +67,7 @@ test: init
 .PHONY: test-reset
 test-reset:
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) clean
-	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) bins
+	#$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) bins
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) keys
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --state-config=$(STATE_CONFIG) --snapshot-url=$(SNAPSHOT_URL) prepare-state
 

script/upgrades.sh

@@ -310,8 +310,7 @@ function init() {
 
 		$AKASH init --home "$valdir" "$(jq -rc '.moniker' <<<"$val")" >/dev/null 2>&1
 
-		if [[ $cnt -eq 0 ]]; then
-			cat >"$valdir/.envrc" <<EOL
+		cat >"$valdir/.envrc" <<EOL
 PATH_add "\$(pwd)/cosmovisor/current/bin"
 AKASH_HOME="\$(pwd)"
 AKASH_FROM=validator0
@@ -331,8 +330,8 @@ export AKASH_CHAIN_ID
 export AKASH_KEYRING_BACKEND
 export AKASH_SIGN_MODE
 EOL
-		fi
 
+		echo "$val"
 		jq -r '.keys.priv' <<<"$val" >"$valdir/config/priv_validator_key.json"
 		jq -r '.keys.node' <<<"$val" >"$valdir/config/node_key.json"
 
@@ -373,7 +372,9 @@ function prepare_state() {
 		AKASH=$genesis_bin/akash
 
 		genesis_file=${valdir}/config/genesis.json
+		addrbook_file=${valdir}/config/genesis.json
 		rm -f "$genesis_file"
+		rm -f "$addrbook_file"
 
 		if [[ $cnt -eq 0 ]]; then
 			if [[ "${GENESIS_URL}" =~ ^https?:\/\/.* ]]; then
@@ -435,14 +436,15 @@ function prepare_state() {
 				rm -rf data
 			fi
 
+			rm -f upgrade-info.json
+
 			popd
 
 			$AKASH testnetify --home="$valdir" --testnet-rootdir="$validators_dir" --testnet-config="${STATE_CONFIG}" --yes || true
 		else
 			pushd "$(pwd)"
 			cd "${valdir}"
 
-			cp -r "${validators_dir}/.akash0/config" ./
 			cp -r "${validators_dir}/.akash0/data" ./
 
 			pushd "$(pwd)"
@@ -482,10 +484,9 @@ function clean() {
 		rm -rf "$valdir"/data/*
 		rm -rf "$cosmovisor_dir/current"
 		rm -rf "$cosmovisor_dir/upgrades/${UPGRADE_TO}/upgrade-info.json"
-		rm -rf "$cosmovisor_dir/upgrades/${UPGRADE_TO}/bin/akash"
 
-		mkdir -p "$valdir/data"
-		echo '{"height":"0","round": 0,"step": 0}' | jq > "$valdir/data/priv_validator_state.json"
+#		mkdir -p "$valdir/data"
+#		echo '{"height":"0","round": 0,"step": 0}' | jq > "$valdir/data/priv_validator_state.json"
 
 		((cnt++)) || true
 	done

tests/upgrade/test-config.json

@@ -1,7 +1,8 @@
 {
     "chain-id": "localakash",
     "validators": [
-        ".akash0"
+        ".akash0",
+        ".akash1"
     ],
     "work": {
         "home": ".akash0",

tests/upgrade/upgrade_test.go

@@ -458,16 +458,16 @@ func TestUpgrade(t *testing.T) {
 	listenAddr := "127.0.0.1"
 
 	for name, params := range initParams {
-		var unconditionalPeerIDs string
-		var persistentPeers string
+		unconditionalPeerIDs := make([]string, 0, len(initParams))
+		persistentPeers := make([]string, 0, len(initParams))
 
 		for nm1, params1 := range initParams {
 			if name == nm1 {
 				continue
 			}
 
-			unconditionalPeerIDs += params1.nodeID + ","
-			persistentPeers += fmt.Sprintf("%s@%s:%d,", params1.nodeID, listenAddr, params1.p2pPort)
+			unconditionalPeerIDs = append(unconditionalPeerIDs, params1.nodeID)
+			persistentPeers = append(persistentPeers, fmt.Sprintf("%s@%s:%d", params1.nodeID, listenAddr, params1.p2pPort))
 		}
 
 		validatorsParams[name] = validatorParams{
@@ -486,8 +486,8 @@ func TestUpgrade(t *testing.T) {
 				fmt.Sprintf("HOME=%s", *workdir),
 				fmt.Sprintf("AKASH_HOME=%s", params.homedir),
 				fmt.Sprintf("AKASH_CHAIN_ID=%s", cfg.ChainID),
-				fmt.Sprintf("AKASH_P2P_PERSISTENT_PEERS=%s", strings.TrimSuffix(persistentPeers, ",")),
-				fmt.Sprintf("AKASH_P2P_UNCONDITIONAL_PEER_IDS=%s", strings.TrimSuffix(unconditionalPeerIDs, ",")),
+				fmt.Sprintf("AKASH_P2P_PERSISTENT_PEERS=%s", strings.Join(persistentPeers, ",")),
+				fmt.Sprintf("AKASH_P2P_UNCONDITIONAL_PEER_IDS=%s", strings.Join(unconditionalPeerIDs, ",")),
 				fmt.Sprintf("AKASH_P2P_LADDR=tcp://%s:%d", listenAddr, params.p2pPort),
 				fmt.Sprintf("AKASH_RPC_LADDR=tcp://%s:%d", listenAddr, params.rpc.port),
 				fmt.Sprintf("AKASH_RPC_GRPC_LADDR=tcp://%s:%d", listenAddr, params.rpc.grpc),
@@ -1261,7 +1261,7 @@ func (l *validator) scanner(stdout io.Reader, p publisher) error {
 
 	serverStart := "INF starting node with ABCI "
 	replayBlocksStart := "INF ABCI Replay Blocks appHeight"
-	replayBlocksDone := "INF Replay: Done module=consensus"
+	replayBlocksDone := "INF service start impl=Evidence"
 	executedBlock := "INF indexed block "
 	executedBlock2 := "INF committed state block_app_hash="
 	upgradeNeeded := fmt.Sprintf(`ERR UPGRADE "%s" NEEDED at height:`, l.params.upgradeName)