diff --git a/dex/testing/bch/harness.sh b/dex/testing/bch/harness.sh index 97ba4a045f..87561b9392 100755 --- a/dex/testing/bch/harness.sh +++ b/dex/testing/bch/harness.sh @@ -23,7 +23,7 @@ export DELTA_WALLET_SEED="cURsyTZ8icuTHwWxSfTC2Geu2F6dMRtnzt1gvSaxHdc9Zf6eviJN" export DELTA_ADDRESS="bchreg:qzhru360ks09fgzuh0ycpvslslvpj72ulqlw5j6ksy" # $1 is the node to create with. $2 is the wallet name export NEW_WALLET_CMD="./\$1 createwallet \$2" -export GODAEMON="bchd" -export GOCLIENT="bchctl" +export GODAEMON="go run github.com/gcash/bchd@v0.19.0" +export GOCLIENT="go run github.com/gcash/bchd/cmd/bchctl@v0.19.0" # Run the harness ../btc/base-harness.sh diff --git a/dex/testing/btc/base-harness.sh b/dex/testing/btc/base-harness.sh index 7eddc6185e..afa05287dc 100755 --- a/dex/testing/btc/base-harness.sh +++ b/dex/testing/btc/base-harness.sh @@ -375,9 +375,9 @@ if [ ! -z "$GODAEMON" ]; then DAEMON_INSTALLED=$? if [ $DAEMON_INSTALLED -eq 0 ]; then - echo "${GODAEMON} installed" + echo "Go node found. Starting" - tmux new-window -t $SESSION:3 -n "${GODAEMON}" $SHELL + tmux new-window -t $SESSION:3 -n "go-node" $SHELL tmux send-keys -t $SESSION:3 "set +o history" C-m $GOCLIENT --version &> /dev/null @@ -385,11 +385,11 @@ if [ ! -z "$GODAEMON" ]; then if [ $DAEMON_INSTALLED -eq 0 ]; then echo "${GOCLIENT} installed" - OMEGA_DIR="${NODES_ROOT}/${GODAEMON}" + OMEGA_DIR="${NODES_ROOT}/gonode" mkdir -p "${OMEGA_DIR}" - NODE_CONF="${OMEGA_DIR}/${GODAEMON}.conf" - CLIENT_CONF="${OMEGA_DIR}/${GOCLIENT}.conf" + NODE_CONF="${OMEGA_DIR}/gonode.conf" + CLIENT_CONF="${OMEGA_DIR}/goctl.conf" OMEGA_RPC_PORT=21558 cat > "${NODE_CONF}" <