use go run for bchd

decred · Sep 7, 2022 · 6f8e3c5 · 6f8e3c5
1 parent 3e82d9f
commit 6f8e3c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -375,21 +375,21 @@ 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
     CLIENT_INSTALLED=$?
     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}" <<EOF
@@ -422,10 +422,10 @@ chmod +x "${HARNESS_DIR}/omega"
       --configfile ${NODE_CONF}" C-m
 
     else
-      echo "${GOCLIENT} not detected"
+      echo "Go CLI client not found"
     fi
   else
-    echo "${GODAEMON} not detected"
+    echo "Go node not found"
   fi
 fi