From ee682d5bc37649647bb4a8a3037b3d0d3c80b5dd Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 7 Sep 2018 09:46:21 -0700 Subject: [PATCH] Move wallet-sanity.sh out of multinode-demo/ --- ci/localnet-sanity.sh | 2 +- net/remote/remote-sanity.sh | 2 +- {multinode-demo/test => scripts}/wallet-sanity.sh | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename {multinode-demo/test => scripts}/wallet-sanity.sh (94%) diff --git a/ci/localnet-sanity.sh b/ci/localnet-sanity.sh index d3069dd09..916182bc5 100755 --- a/ci/localnet-sanity.sh +++ b/ci/localnet-sanity.sh @@ -64,7 +64,7 @@ flag_error() { echo "--- Wallet sanity" ( set -x - multinode-demo/test/wallet-sanity.sh + scripts/wallet-sanity.sh ) || flag_error echo "--- Node count" diff --git a/net/remote/remote-sanity.sh b/net/remote/remote-sanity.sh index b71be35d3..057607fd7 100755 --- a/net/remote/remote-sanity.sh +++ b/net/remote/remote-sanity.sh @@ -77,7 +77,7 @@ esac echo "--- $entrypointIp: wallet sanity" ( set -x - multinode-demo/test/wallet-sanity.sh "$entrypointRsyncUrl" + scripts/wallet-sanity.sh "$entrypointRsyncUrl" ) echo "--- $entrypointIp: node count" diff --git a/multinode-demo/test/wallet-sanity.sh b/scripts/wallet-sanity.sh similarity index 94% rename from multinode-demo/test/wallet-sanity.sh rename to scripts/wallet-sanity.sh index 1e9d3374d..4b69a54de 100755 --- a/multinode-demo/test/wallet-sanity.sh +++ b/scripts/wallet-sanity.sh @@ -3,15 +3,14 @@ # Wallet sanity test # -here=$(dirname "$0") -cd "$here" +cd "$(dirname "$0")"/.. if [[ -n "$USE_SNAP" ]]; then # TODO: Merge wallet.sh functionality into solana-wallet proper and # remove this USE_SNAP case wallet="solana.wallet $1" else - wallet="../wallet.sh $1" + wallet="multinode-demo/wallet.sh $1" fi # Tokens transferred to this address are lost forever...