premerge

test/p2p/fast_sync/check_peer.sh

@@ -1,43 +0,0 @@
-#! /bin/bash
-set -eu
-set -o pipefail
-
-ID=$1
-
-###########################################
-#
-# Wait for peer to catchup to other peers
-#
-###########################################
-
-addr=$(test/p2p/ip.sh $ID):46657
-peerID=$(( $(($ID % 4)) + 1  )) # 1->2 ... 3->4 ... 4->1
-peer_addr=$(test/p2p/ip.sh $peerID):46657
-
-# get another peer's height
-h1=`curl -s $peer_addr/status | jq .result[1].latest_block_height`
-
-# get another peer's state
-root1=`curl -s $peer_addr/status | jq .result[1].latest_app_hash`
-
-echo "Other peer is on height $h1 with state $root1"
-echo "Waiting for peer $ID to catch up"
-
-# wait for it to sync to past its previous height
-set +e
-set +o pipefail
-h2="0"
-while [[ "$h2" -lt "$(($h1+3))" ]]; do
-	sleep 1
-	h2=`curl -s $addr/status | jq .result[1].latest_block_height`
-	echo "... $h2"
-done
-
-# check the app hash
-root2=`curl -s $addr/status | jq .result[1].latest_app_hash`
-
-if [[ "$root1" != "$root2" ]]; then
-	echo "App hash after fast sync does not match. Got $root2; expected $root1"
-	exit 1
-fi
-echo "... fast sync successful"

test/p2p/fast_sync/test.sh

@@ -1,16 +0,0 @@
-#! /bin/bash
-set -eu
-
-DOCKER_IMAGE=$1
-NETWORK_NAME=$2
-N=$3
-PROXY_APP=$4
-
-cd $GOPATH/src/github.com/tendermint/tendermint
-
-# run it on each of them
-for i in `seq 1 $N`; do
-	bash test/p2p/fast_sync/test_peer.sh $DOCKER_IMAGE $NETWORK_NAME $i $N $PROXY_APP
-done
-
-

test/p2p/fast_sync/test_peer.sh

@@ -1,38 +0,0 @@
-#! /bin/bash
-set -eu
-
-DOCKER_IMAGE=$1
-NETWORK_NAME=$2
-ID=$3
-N=$4
-PROXY_APP=$5
-
-###############################################################
-# this runs on each peer:
-# 	kill peer
-# 	bring it back online via fast sync
-# 	wait for it to sync and check the app hash
-###############################################################
-
-
-echo "Testing fastsync on node $ID"
-
-# kill peer
-set +e # circle sigh :(
-docker rm -vf local_testnet_$ID
-set -e
-
-# restart peer - should have an empty blockchain
-SEEDS="$(test/p2p/ip.sh 1):46656"
-for j in `seq 2 $N`; do
-	SEEDS="$SEEDS,$(test/p2p/ip.sh $j):46656"
-done
-bash test/p2p/peer.sh $DOCKER_IMAGE $NETWORK_NAME $ID $PROXY_APP "--seeds $SEEDS --pex"
-
-# wait for peer to sync and check the app hash
-bash test/p2p/client.sh $DOCKER_IMAGE $NETWORK_NAME fs_$ID "test/p2p/fast_sync/check_peer.sh $ID"
-
-echo ""
-echo "PASS"
-echo ""
-