diff --git a/dex/testing/xmr/harness.sh b/dex/testing/xmr/harness.sh index ea96f0d15d..876fef3e2e 100755 --- a/dex/testing/xmr/harness.sh +++ b/dex/testing/xmr/harness.sh @@ -2,7 +2,7 @@ # Tmux script that sets up an XMR regtest harness with one node 'alpha' and 3 # wallets 'fred', 'bill' & 'charlie'. Charlie also has a View-Only sibling. -############################################################################### +################################################################################ # Development ################################################################################ @@ -12,7 +12,7 @@ # Monero RPC functions ################################################################################ -source monero_functions.inc +source monero_functions ################################################################################ # Start up @@ -78,8 +78,8 @@ mkdir -p "${HARNESS_CTL_DIR}" mkdir -p "${ALPHA_DATA_DIR}" touch "${ALPHA_REGTEST_CFG}" # currently empty -# make available from the harness-ctl dir -cp monero_functions.inc ${HARNESS_CTL_DIR} +# make available from the harness-ctl dir +cp monero_functions ${HARNESS_CTL_DIR} # Background watch mining in window ??? by default: # 'export NOMINER="1"' or uncomment this line to disable @@ -93,7 +93,7 @@ echo "Writing ctl scripts" # Daemon info cat > "${HARNESS_CTL_DIR}/alpha_info" < "${HARNESS_CTL_DIR}/alpha_sendrawtransaction" </dev/null EOF chmod +x "${HARNESS_CTL_DIR}/alpha_sendrawtransaction" @@ -117,7 +117,7 @@ chmod +x "${HARNESS_CTL_DIR}/alpha_sendrawtransaction" # - decode_as_json - defaults to false cat > "${HARNESS_CTL_DIR}/alpha_get_transactions" </dev/null EOF chmod +x "${HARNESS_CTL_DIR}/alpha_get_transactions" @@ -128,7 +128,7 @@ chmod +x "${HARNESS_CTL_DIR}/alpha_get_transactions" # - txids as hex string - "hash1,hash2,hash3,..." cat > "${HARNESS_CTL_DIR}/alpha_get_transactions_details" </dev/null | jq '.txs[] | .as_json | fromjson' EOF chmod +x "${HARNESS_CTL_DIR}/alpha_get_transactions_details" @@ -137,7 +137,7 @@ chmod +x "${HARNESS_CTL_DIR}/alpha_get_transactions_details" # Mempool info cat > "${HARNESS_CTL_DIR}/alpha_transaction_pool" </dev/null EOF chmod +x "${HARNESS_CTL_DIR}/alpha_transaction_pool" @@ -148,7 +148,7 @@ chmod +x "${HARNESS_CTL_DIR}/alpha_transaction_pool" # - number of blocks to mine cat > "${HARNESS_CTL_DIR}/mine-to-bill" < "${HARNESS_CTL_DIR}/fred_transfer_to" < "${HARNESS_CTL_DIR}/bill_transfer_to" < "${HARNESS_CTL_DIR}/charlie_transfer_to" < "${HARNESS_CTL_DIR}/fred_balance" < "${HARNESS_CTL_DIR}/bill_balance" < "${HARNESS_CTL_DIR}/charlie_balance" < "${HARNESS_CTL_DIR}/fred_refresh_wallet" < "${HARNESS_CTL_DIR}/bill_refresh_wallet" < "${HARNESS_CTL_DIR}/charlie_refresh_wallet" < "${HARNESS_CTL_DIR}/fred_incoming_transfers" < "${HARNESS_CTL_DIR}/charlie_incoming_transfers" < "${HARNESS_CTL_DIR}/fred_export_outputs" < "${HARNESS_CTL_DIR}/charlie_export_outputs" < "${HARNESS_CTL_DIR}/charlie_view_export_outputs" < "${HARNESS_CTL_DIR}/fred_export_key_images" < "${HARNESS_CTL_DIR}/charlie_export_key_images" < "${HARNESS_CTL_DIR}/fred_build_tx" < "${HARNESS_CTL_DIR}/charlie_build_tx" < "${NODES_ROOT}/harness-ctl/help" <