Skip to content

Commit 576f325

Browse files
AbdulboisAbdulbois
committed
#303 Upgrade Cosmos-SDK to v0.47.8
- Fix Validator node cli tests Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com> Signed-off-by: Abdulbois <abdulbois123@gmail.com>
1 parent 3eff4e7 commit 576f325

5 files changed

+43
-58
lines changed

‎integration_tests/run-all.sh

+23-22
Original file line numberDiff line numberDiff line change
@@ -111,28 +111,6 @@ make image &>${DETAILED_OUTPUT_TARGET}
111111

112112
cleanup_pool
113113

114-
# Upgrade procedure tests.
115-
if [[ $TESTS_TO_RUN =~ "all" || $TESTS_TO_RUN =~ "upgrade" ]]; then
116-
UPGRADE_SHELL_TEST="./integration_tests/upgrade/test-upgrade.sh"
117-
118-
init_pool yes localnet_init_latest_stable_release "v0.12.0"
119-
120-
log "*****************************************************************************************"
121-
log "Running $UPGRADE_SHELL_TEST"
122-
log "*****************************************************************************************"
123-
if bash "$UPGRADE_SHELL_TEST" &>${DETAILED_OUTPUT_TARGET}; then
124-
rm dcld_mainnet_stable
125-
log "$UPGRADE_SHELL_TEST finished successfully"
126-
source integration_tests/upgrade/add-new-node-after-upgrade.sh
127-
check_adding_new_node
128-
else
129-
log "$UPGRADE_SHELL_TEST failed"
130-
exit 1
131-
fi
132-
133-
cleanup_pool
134-
fi
135-
136114
# Cli shell tests
137115
if [[ $TESTS_TO_RUN =~ "all" || $TESTS_TO_RUN =~ "cli" ]]; then
138116
CLI_SHELL_TESTS=$(find integration_tests/cli -type f -name '*.sh' -not -name "common.sh")
@@ -213,3 +191,26 @@ if [[ $TESTS_TO_RUN =~ "all" || $TESTS_TO_RUN =~ "deploy" ]]; then
213191
exit 1
214192
fi
215193
fi
194+
195+
# Upgrade procedure tests
196+
if [[ $TESTS_TO_RUN =~ "all" || $TESTS_TO_RUN =~ "upgrade" ]]; then
197+
UPGRADE_SHELL_TEST="./integration_tests/upgrade/test-upgrade.sh"
198+
199+
init_pool yes localnet_init_latest_stable_release "v0.12.0"
200+
201+
log "*****************************************************************************************"
202+
log "Running $UPGRADE_SHELL_TEST"
203+
log "*****************************************************************************************"
204+
205+
if bash "$UPGRADE_SHELL_TEST" &>${DETAILED_OUTPUT_TARGET}; then
206+
rm dcld_mainnet_stable
207+
log "$UPGRADE_SHELL_TEST finished successfully"
208+
source integration_tests/upgrade/add-new-node-after-upgrade.sh
209+
check_adding_new_node
210+
else
211+
log "$UPGRADE_SHELL_TEST failed"
212+
exit 1
213+
fi
214+
215+
cleanup_pool
216+
fi

‎integration_tests/upgrade/01-test-upgrade-initialize-0.12.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ EOF
110110
docker exec $container cp -f ./dcld "$DCL_DIR"/cosmovisor/genesis/bin/
111111

112112
echo "$account Start Node \"$node_name\""
113-
docker exec -d $container cosmovisor start
113+
docker exec -d $container cosmovisor run start
114114
sleep 10
115115

116116
result=$($DCLD_BIN query validator node --address "$address")
@@ -472,14 +472,14 @@ test_divider
472472

473473
echo "Disable node"
474474
# FIXME: use proper binary (not dcld but $DCLD_BIN)
475-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator disable-node --from=$account --yes")
475+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator disable-node --from=$account --yes")
476476
check_response "$result" "\"code\": 0"
477477

478478
test_divider
479479

480480
echo "Enable node"
481481
# FIXME: use proper binary (not dcld but $DCLD_BIN)
482-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator enable-node --from=$account --yes")
482+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator enable-node --from=$account --yes")
483483
check_response "$result" "\"code\": 0"
484484

485485
test_divider
@@ -504,7 +504,7 @@ test_divider
504504

505505
echo "Enable node"
506506
# FIXME: use proper binary (not dcld but $DCLD_BIN)
507-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator enable-node --from=$account --yes")
507+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator enable-node --from=$account --yes")
508508
check_response "$result" "\"code\": 0"
509509

510510
test_divider

‎integration_tests/upgrade/02-test-upgrade-0.12-to-1.2.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ test_divider
276276

277277
echo "Get proposed node to disable"
278278
# FIXME: use proper binary (not dcld but $DCLD_BIN_OLD)
279-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld query validator proposed-disable-node --address="$address"")
279+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld query validator proposed-disable-node --address="$address"")
280280
check_response "$result" "\"address\": \"$validator_address\""
281281

282282
test_divider
@@ -721,13 +721,13 @@ test_divider
721721

722722
# VALIDATOR_NODE
723723
echo "Disable node"
724-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator disable-node --from=$account --yes")
724+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator disable-node --from=$account --yes")
725725
check_response "$result" "\"code\": 0"
726726

727727
test_divider
728728

729729
echo "Enable node"
730-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator enable-node --from=$account --yes")
730+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator enable-node --from=$account --yes")
731731
check_response "$result" "\"code\": 0"
732732

733733
test_divider
@@ -751,7 +751,7 @@ check_response "$result" "\"code\": 0"
751751
test_divider
752752

753753
echo "Enable node"
754-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator enable-node --from=$account --yes")
754+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator enable-node --from=$account --yes")
755755
check_response "$result" "\"code\": 0"
756756

757757
test_divider
@@ -765,7 +765,7 @@ test_divider
765765
# Validator
766766

767767
echo "Get node"
768-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld query validator all-nodes")
768+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld query validator all-nodes")
769769
check_response "$result" "\"owner\": \"$validator_address\""
770770

771771
echo "Upgrade from 0.12.0 to 1.2 passed"

‎integration_tests/upgrade/03-test-upgrade-1.2-to-1.4.sh

+10-26
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ test_divider
467467

468468
echo "Get node"
469469
# FIXME: use proper binary (not dcld but $DCLD_BIN_OLD)
470-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld query validator all-nodes")
470+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld query validator all-nodes")
471471
check_response "$result" "\"owner\": \"$validator_address\""
472472

473473
########################################################################################
@@ -976,34 +976,18 @@ check_response "$result" "\"code\": 0"
976976
test_divider
977977

978978
# VALIDATOR_NODE
979-
docker cp $DCLD_BIN_NEW "$container":"$DCL_USER_HOME"/dcld
979+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld config broadcast-mode sync")
980980

981981
echo "Disable node"
982-
result=$(docker exec node0 /bin/sh -c "echo test1234 | dcld status")
983-
echo "Node0 status $result"
984-
985-
result=$(docker exec node0 /bin/sh -c "echo test1234 | dcld version")
986-
echo "Node0 version $result"
987-
988-
# FIXME: use proper binary (not dcld but $DCLD_BIN_OLD)
989-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld status")
990-
echo "Validator status $result"
991-
992-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld status")
993-
echo "Validator status 2 $result"
994-
995-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld version")
996-
echo "Validator version $result"
997-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator disable-node --from=$account --yes")
998-
docker logs node0 -n 50
982+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator disable-node --from=$account --yes")
983+
result=$(get_txn_result "$result")
999984
check_response "$result" "\"code\": 0"
1000985

1001986
test_divider
1002987

1003-
1004988
echo "Enable node"
1005-
# FIXME: use proper binary (not dcld but $DCLD_BIN_OLD)
1006-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator enable-node --from=$account --yes")
989+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator enable-node --from=$account --yes")
990+
result=$(get_txn_result "$result")
1007991
check_response "$result" "\"code\": 0"
1008992

1009993
test_divider
@@ -1030,14 +1014,14 @@ check_response "$result" "\"code\": 0"
10301014
test_divider
10311015

10321016
echo "Enable node"
1033-
## FIXME: use proper binary (not dcld but $DCLD_BIN_OLD)
1034-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld tx validator enable-node --from=$account --yes")
1017+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld tx validator enable-node --from=$account --yes")
1018+
result=$(get_txn_result "$result")
10351019
check_response "$result" "\"code\": 0"
10361020

10371021
test_divider
10381022

10391023
echo "Propose disable node"
1040-
result=$(echo $passphrase | $DCLD_BIN_OLD tx validator propose-disable-node --address=$validator_address --from=$trustee_account_1 --yes)
1024+
result=$(echo $passphrase | $DCLD_BIN_NEW tx validator propose-disable-node --address=$validator_address --from=$trustee_account_1 --yes)
10411025
result=$(get_txn_result "$result")
10421026
check_response "$result" "\"code\": 0"
10431027

@@ -1299,7 +1283,7 @@ test_divider
12991283

13001284
echo "Get node"
13011285
# FIXME: use proper binary (not dcld but $DCLD_BIN_OLD)
1302-
result=$(docker exec "$container" /bin/sh -c "echo test1234 | ./dcld query validator all-nodes")
1286+
result=$(docker exec "$container" /bin/sh -c "echo test1234 | dcld query validator all-nodes")
13031287
check_response "$result" "\"owner\": \"$validator_address\""
13041288

13051289
test_divider

‎integration_tests/upgrade/add-new-node-after-upgrade.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ trap cleanup EXIT
5050

5151
check_adding_new_node() {
5252
local stable_binary_version="${1:-0.12.1}"
53-
local latest_binary_version="${2:-1.4.0-dev1}"
53+
local latest_binary_version="${2:-1.4.0-dev3}"
5454

5555
echo "1. run $node_name container"
5656
docker run -d --name $node_name --ip $ip -p "$node_p2p_port-$node_client_port:26656-26657" --network $docker_network -i dcledger

0 commit comments

Comments
 (0)