test: update for abci-cli consolidation. shell formatting

test/app/clean.sh

@@ -1,4 +1,3 @@
 killall tendermint
-killall dummy
-killall counter
+killall abci-cli
 rm -rf ~/.tendermint_app

test/app/dummy_test.sh

@@ -2,7 +2,7 @@
 set -e
 
 function toHex() {
-	echo -n $1 | hexdump -ve '1/1 "%.2X"' | awk '{print "0x" $0}' 
+    echo -n $1 | hexdump -ve '1/1 "%.2X"' | awk '{print "0x" $0}' 
 
 }
 
@@ -32,9 +32,9 @@ RESPONSE=`abci-cli query \"$KEY\"`
 set +e
 A=`echo $RESPONSE | grep "$VALUE"`
 if [[ $? != 0 ]]; then
-	echo "Failed to find $VALUE for $KEY. Response:"
-	echo "$RESPONSE"
-	exit 1
+    echo "Failed to find $VALUE for $KEY. Response:"
+    echo "$RESPONSE"
+    exit 1
 fi
 set -e
 
@@ -43,9 +43,9 @@ RESPONSE=`abci-cli query \"$VALUE\"`
 set +e
 A=`echo $RESPONSE | grep $VALUE`
 if [[ $? == 0 ]]; then
-	echo "Found '$VALUE' for $VALUE when we should not have. Response:"
-	echo "$RESPONSE"
-	exit 1
+    echo "Found '$VALUE' for $VALUE when we should not have. Response:"
+    echo "$RESPONSE"
+    exit 1
 fi
 set -e
 
@@ -62,9 +62,9 @@ RESPONSE=`echo $RESPONSE | jq .result.response.log`
 set +e
 A=`echo $RESPONSE | grep 'exists'`
 if [[ $? != 0 ]]; then
-	echo "Failed to find 'exists' for $KEY. Response:"
-	echo "$RESPONSE"
-	exit 1
+    echo "Failed to find 'exists' for $KEY. Response:"
+    echo "$RESPONSE"
+    exit 1
 fi
 set -e
 
@@ -74,9 +74,9 @@ RESPONSE=`echo $RESPONSE | jq .result.response.log`
 set +e
 A=`echo $RESPONSE | grep 'exists'`
 if [[ $? == 0 ]]; then
-	echo "Found 'exists' for $VALUE when we should not have. Response:"
-	echo "$RESPONSE"
-	exit 1
+    echo "Found 'exists' for $VALUE when we should not have. Response:"
+    echo "$RESPONSE"
+    exit 1
 fi
 set -e
 

test/app/test.sh

@@ -11,118 +11,118 @@ set -e
 export TMHOME=$HOME/.tendermint_app
 
 function dummy_over_socket(){
-	rm -rf $TMHOME
-	tendermint init
-	echo "Starting dummy_over_socket"
-	dummy > /dev/null &
-	pid_dummy=$!
-	tendermint node > tendermint.log &
-	pid_tendermint=$!
-	sleep 5
+    rm -rf $TMHOME
+    tendermint init
+    echo "Starting dummy_over_socket"
+    abci-cli dummy > /dev/null &
+    pid_dummy=$!
+    tendermint node > tendermint.log &
+    pid_tendermint=$!
+    sleep 5
 
-	echo "running test"
-	bash dummy_test.sh "Dummy over Socket"
+    echo "running test"
+    bash dummy_test.sh "Dummy over Socket"
 
-	kill -9 $pid_dummy $pid_tendermint
+    kill -9 $pid_dummy $pid_tendermint
 }
 
 # start tendermint first
 function dummy_over_socket_reorder(){
-	rm -rf $TMHOME
-	tendermint init
-	echo "Starting dummy_over_socket_reorder (ie. start tendermint first)"
-	tendermint node > tendermint.log &
-	pid_tendermint=$!
-	sleep 2
-	dummy > /dev/null &
-	pid_dummy=$!
-	sleep 5
+    rm -rf $TMHOME
+    tendermint init
+    echo "Starting dummy_over_socket_reorder (ie. start tendermint first)"
+    tendermint node > tendermint.log &
+    pid_tendermint=$!
+    sleep 2
+    abci-cli dummy > /dev/null &
+    pid_dummy=$!
+    sleep 5
 
-	echo "running test"
-	bash dummy_test.sh "Dummy over Socket"
+    echo "running test"
+    bash dummy_test.sh "Dummy over Socket"
 
-	kill -9 $pid_dummy $pid_tendermint
+    kill -9 $pid_dummy $pid_tendermint
 }
 
 
 function counter_over_socket() {
-	rm -rf $TMHOME
-	tendermint init
-	echo "Starting counter_over_socket"
-	counter --serial > /dev/null &
-	pid_counter=$!
-	tendermint node > tendermint.log &
-	pid_tendermint=$!
-	sleep 5
+    rm -rf $TMHOME
+    tendermint init
+    echo "Starting counter_over_socket"
+    abci-cli counter --serial > /dev/null &
+    pid_counter=$!
+    tendermint node > tendermint.log &
+    pid_tendermint=$!
+    sleep 5
 
-	echo "running test"
-	bash counter_test.sh "Counter over Socket"
+    echo "running test"
+    bash counter_test.sh "Counter over Socket"
 
-	kill -9 $pid_counter $pid_tendermint
+    kill -9 $pid_counter $pid_tendermint
 }
 
 function counter_over_grpc() {
-	rm -rf $TMHOME
-	tendermint init
-	echo "Starting counter_over_grpc"
-	counter --serial --abci grpc > /dev/null &
-	pid_counter=$!
-	tendermint node --abci grpc > tendermint.log &
-	pid_tendermint=$!
-	sleep 5
+    rm -rf $TMHOME
+    tendermint init
+    echo "Starting counter_over_grpc"
+    abci-cli counter --serial --abci grpc > /dev/null &
+    pid_counter=$!
+    tendermint node --abci grpc > tendermint.log &
+    pid_tendermint=$!
+    sleep 5
 
-	echo "running test"
-	bash counter_test.sh "Counter over GRPC"
+    echo "running test"
+    bash counter_test.sh "Counter over GRPC"
 
-	kill -9 $pid_counter $pid_tendermint
+    kill -9 $pid_counter $pid_tendermint
 }
 
 function counter_over_grpc_grpc() {
-	rm -rf $TMHOME
-	tendermint init
-	echo "Starting counter_over_grpc_grpc (ie. with grpc broadcast_tx)"
-	counter --serial --abci grpc > /dev/null &
-	pid_counter=$!
-	sleep 1
-	GRPC_PORT=36656
-	tendermint node --abci grpc --rpc.grpc_laddr tcp://localhost:$GRPC_PORT > tendermint.log &
-	pid_tendermint=$!
-	sleep 5
+    rm -rf $TMHOME
+    tendermint init
+    echo "Starting counter_over_grpc_grpc (ie. with grpc broadcast_tx)"
+    abci-cli counter --serial --abci grpc > /dev/null &
+    pid_counter=$!
+    sleep 1
+    GRPC_PORT=36656
+    tendermint node --abci grpc --rpc.grpc_laddr tcp://localhost:$GRPC_PORT > tendermint.log &
+    pid_tendermint=$!
+    sleep 5
 
-	echo "running test"
-	GRPC_BROADCAST_TX=true bash counter_test.sh "Counter over GRPC via GRPC BroadcastTx"
+    echo "running test"
+    GRPC_BROADCAST_TX=true bash counter_test.sh "Counter over GRPC via GRPC BroadcastTx"
 
-	kill -9 $pid_counter $pid_tendermint
+    kill -9 $pid_counter $pid_tendermint
 }
 
 cd $GOPATH/src/github.com/tendermint/tendermint/test/app
 
 case "$1" in 
-	"dummy_over_socket")
-		dummy_over_socket
-		;;
-	"dummy_over_socket_reorder")
-		dummy_over_socket_reorder
-		;;
-	"counter_over_socket")
-		counter_over_socket
-		;;
-	"counter_over_grpc")
-		counter_over_grpc
-		;;
-	"counter_over_grpc_grpc")
-		counter_over_grpc_grpc
-		;;
-	*)
-		echo "Running all"
-		dummy_over_socket
-		echo ""
-		dummy_over_socket_reorder
-		echo ""
-		counter_over_socket
-		echo ""
-		counter_over_grpc
-		echo ""
-		counter_over_grpc_grpc
+    "dummy_over_socket")
+    dummy_over_socket
+    ;;
+"dummy_over_socket_reorder")
+    dummy_over_socket_reorder
+    ;;
+    "counter_over_socket")
+    counter_over_socket
+    ;;
+"counter_over_grpc")
+    counter_over_grpc
+    ;;
+    "counter_over_grpc_grpc")
+    counter_over_grpc_grpc
+    ;;
+*)
+    echo "Running all"
+    dummy_over_socket
+    echo ""
+    dummy_over_socket_reorder
+    echo ""
+    counter_over_socket
+    echo ""
+    counter_over_grpc
+    echo ""
+    counter_over_grpc_grpc
 esac