From e2e569cb43c7a0db9203b7554f369c984f7389de Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 5 Sep 2018 07:56:26 -0700
Subject: [PATCH] Set rsync url for local deployments

---
 multinode-demo/common.sh    |  3 +++
 net/remote/remote-client.sh |  2 +-
 net/remote/remote-node.sh   |  4 ++--
 net/remote/remote-sanity.sh | 12 ++++++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index 3e141332f..a040531fb 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -166,6 +166,9 @@ find_leader() {
   declare shift=0
 
   if [[ -d $SNAP ]]; then
+    if [[ -n $1 ]]; then
+      usage "Error: unexpected parameter: $1"
+    fi
 
     # Select leader from the Snap configuration
     leader_ip=$(snapctl get leader-ip)
diff --git a/net/remote/remote-client.sh b/net/remote/remote-client.sh
index 38a653f5e..9c0fa37fe 100755
--- a/net/remote/remote-client.sh
+++ b/net/remote/remote-client.sh
@@ -45,7 +45,7 @@ local)
   export RUST_LOG
 
   rsync -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
-  solana_bench_tps="multinode-demo/client.sh $entrypointIp:~/solana"
+  solana_bench_tps="multinode-demo/client.sh $entrypointIp:~/solana $entrypointIp:8001"
   ;;
 *)
   echo "Unknown deployment method: $deployMethod"
diff --git a/net/remote/remote-node.sh b/net/remote/remote-node.sh
index 062ced2b8..0f2c8f42f 100755
--- a/net/remote/remote-node.sh
+++ b/net/remote/remote-node.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 cd "$(dirname "$0")"/../..
 
@@ -91,7 +91,7 @@ local)
     rsync -vPrc "$entrypointIp:~/.cargo/bin/solana*" ~/.cargo/bin/
 
     ./multinode-demo/setup.sh -t validator $setupArgs
-    ./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp" >validator.log 2>&1 &
+    ./multinode-demo/validator.sh "$entrypointIp":~/solana "$entrypointIp:8001" >validator.log 2>&1 &
     ;;
   *)
     echo "Error: unknown node type: $nodeType"
diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh
index a7a465a90..3e2b54266 100755
--- a/net/remote/remote-sanity.sh
+++ b/net/remote/remote-sanity.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 #
 # This script is to be run on the leader node
 #
@@ -59,12 +59,16 @@ snap)
   solana_bench_tps=solana.bench-tps
   solana_ledger_tool=solana.ledger-tool
   ledger=/var/snap/solana/current/config/ledger
+
+  entrypointRsyncUrl="$entrypointIp"
   ;;
 local)
   PATH="$HOME"/.cargo/bin:"$PATH"
   export USE_INSTALL=1
 
-  solana_bench_tps="multinode-demo/client.sh $entrypointIp:~/solana"
+  entrypointRsyncUrl="$entrypointIp:~/solana"
+
+  solana_bench_tps="multinode-demo/client.sh $entrypointRsyncUrl $entrypointIp:8001"
   solana_ledger_tool=solana-ledger-tool
   ledger=config/ledger
   ;;
@@ -77,7 +81,7 @@ esac
 echo "--- $entrypointIp: wallet sanity"
 (
   set -x
-  multinode-demo/test/wallet-sanity.sh "$entrypointIp"
+  multinode-demo/test/wallet-sanity.sh "$entrypointRsyncUrl"
 )
 
 echo "--- $entrypointIp: node count"
@@ -110,7 +114,7 @@ if $validatorSanity; then
   (
     set -ex -o pipefail
     ./multinode-demo/setup.sh -t validator
-    timeout 10s ./multinode-demo/validator.sh "$entrypointIp" "$entrypointIp:8001" 2>&1 | tee validator.log
+    timeout 10s ./multinode-demo/validator.sh "$entrypointRsyncUrl" "$entrypointIp:8001" 2>&1 | tee validator.log
   ) || {
     exitcode=$?
     [[ $exitcode -eq 124 ]] || exit $exitcode