dcr harness: allow specifying binary paths

decred · Dec 10, 2021 · 3043d04 · 3043d04
1 parent 7345d1c
commit 3043d04
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/dex/testing/dcr/create-wallet.sh b/dex/testing/dcr/create-wallet.sh
@@ -13,6 +13,8 @@ HTTPPROF_PORT=$6
 WALLET_DIR="${NODES_ROOT}/${NAME}"
 mkdir -p ${WALLET_DIR}
 
+DCRWALLET=${DCRWALLET:-dcrwallet-1.6}
+
 export SHELL=$(which bash)
 
 # Connect to alpha or beta node
@@ -63,7 +65,7 @@ EOF
 # wallet ctl script
 cat > "${NODES_ROOT}/harness-ctl/${NAME}" <<EOF
 #!/usr/bin/env bash
-dcrctl -C "${WALLET_DIR}/${NAME}-ctl.conf" --wallet \$*
+${DCRCTL} -C "${WALLET_DIR}/${NAME}-ctl.conf" --wallet \$*
 EOF
 chmod +x "${NODES_ROOT}/harness-ctl/${NAME}"
 
@@ -81,8 +83,8 @@ tmux send-keys -t $TMUX_WIN_ID "set +o history" C-m
 tmux send-keys -t $TMUX_WIN_ID "cd ${WALLET_DIR}" C-m
 
 echo "Creating simnet ${NAME} wallet"
-tmux send-keys -t $TMUX_WIN_ID "dcrwallet -C ${NAME}.conf --create < wallet.answers; tmux wait-for -S ${NAME}" C-m
+tmux send-keys -t $TMUX_WIN_ID "${DCRWALLET} -C ${NAME}.conf --create < wallet.answers; tmux wait-for -S ${NAME}" C-m
 tmux wait-for ${NAME}
 
 echo "Starting simnet ${NAME} wallet"
-tmux send-keys -t $TMUX_WIN_ID "dcrwallet -C ${NAME}.conf" C-m
+tmux send-keys -t $TMUX_WIN_ID "${DCRWALLET} -C ${NAME}.conf" C-m
diff --git a/dex/testing/dcr/harness.sh b/dex/testing/dcr/harness.sh
@@ -29,6 +29,10 @@ TRADING_WALLET2_PORT="19582"
 # wait for process termination.
 WAIT="; tmux wait-for -S donedcr"
 
+DCRD=${DCRD:-dcrd-1.6}
+DCRCTL=${DCRCTL:-dcrctl-1.6}
+export DCRCTL
+
 NODES_ROOT=~/dextest/dcr
 export NODES_ROOT
 
@@ -83,9 +87,9 @@ NUM=1
       *) NUM=\$1 ;;
   esac
   for i in \$(seq \$NUM) ; do
-    dcrctl -C ${NODES_ROOT}/alpha/alpha-ctl.conf regentemplate
+    ${DCRCTL} -C ${NODES_ROOT}/alpha/alpha-ctl.conf regentemplate
     sleep 0.05
-    dcrctl -C ${NODES_ROOT}/alpha/alpha-ctl.conf generate 1
+    ${DCRCTL} -C ${NODES_ROOT}/alpha/alpha-ctl.conf generate 1
     if [ $i != $NUM ]; then
       sleep ${MINE_SLEEP}
     fi
@@ -102,9 +106,9 @@ NUM=1
       *) NUM=\$1 ;;
   esac
   for i in \$(seq \$NUM) ; do
-    dcrctl -C ${NODES_ROOT}/beta/beta-ctl.conf regentemplate
+    ${DCRCTL} -C ${NODES_ROOT}/beta/beta-ctl.conf regentemplate
     sleep 0.05
-    dcrctl -C ${NODES_ROOT}/beta/beta-ctl.conf generate 1
+    ${DCRCTL} -C ${NODES_ROOT}/beta/beta-ctl.conf generate 1
     if [ $i != $NUM ]; then
       sleep ${MINE_SLEEP}
     fi
@@ -186,7 +190,7 @@ tmux send-keys -t $SESSION:1 "set +o history" C-m
 tmux send-keys -t $SESSION:1 "cd ${NODES_ROOT}/alpha" C-m
 
 echo "Starting simnet alpha node (txindex for server)"
-tmux send-keys -t $SESSION:1 "dcrd --appdata=${NODES_ROOT}/alpha \
+tmux send-keys -t $SESSION:1 "${DCRD} --appdata=${NODES_ROOT}/alpha \
 --rpcuser=${RPC_USER} --rpcpass=${RPC_PASS} \
 --miningaddr=${ALPHA_MINING_ADDR} --rpclisten=:${ALPHA_RPC_PORT} \
 --txindex --listen=:${ALPHA_NODE_PORT} \
@@ -199,7 +203,7 @@ tmux send-keys -t $SESSION:2 "set +o history" C-m
 tmux send-keys -t $SESSION:2 "cd ${NODES_ROOT}/beta" C-m
 
 echo "Starting simnet beta node (no txindex for a typical client)"
-tmux send-keys -t $SESSION:2 "dcrd --appdata=${NODES_ROOT}/beta \
+tmux send-keys -t $SESSION:2 "${DCRD} --appdata=${NODES_ROOT}/beta \
 --rpcuser=${RPC_USER} --rpcpass=${RPC_PASS} \
 --listen=:${BETA_NODE_PORT} --rpclisten=:${BETA_RPC_PORT} \
 --miningaddr=${BETA_MINING_ADDR} \