remove _v0 from addr filenames to facilitate testing

Author: buck54321

dex/networks/eth/tokens.go

@@ -484,9 +484,9 @@ func MaybeReadSimnetAddrsDir(
 		return
 	}
 
-	ethSwapContractAddrFileV0 := filepath.Join(harnessDir, "eth_swap_contract_address_v0.txt")
+	ethSwapContractAddrFileV0 := filepath.Join(harnessDir, "eth_swap_contract_address.txt")
 	ethSwapContractAddrFileV1 := filepath.Join(harnessDir, "eth_swap_contract_address_v1.txt")
-	testUSDCSwapContractAddrFileV0 := filepath.Join(harnessDir, "usdc_swap_contract_address_v0.txt")
+	testUSDCSwapContractAddrFileV0 := filepath.Join(harnessDir, "usdc_swap_contract_address.txt")
 	testUSDCContractAddrFile := filepath.Join(harnessDir, "test_usdc_contract_address.txt")
 	testUSDTSwapContractAddrFileV0 := filepath.Join(harnessDir, "usdt_swap_contract_address.txt")
 	testUSDTContractAddrFile := filepath.Join(harnessDir, "test_usdt_contract_address.txt")

dex/testing/eth/harness.sh

@@ -153,8 +153,8 @@ mine_pending_txs() {
 mine_pending_txs
 
 ETH_SWAP_CONTRACT_ADDR_V0=$("${NODES_ROOT}/harness-ctl/alpha" "attach --preload ${NODES_ROOT}/harness-ctl/contractAddress.js --exec contractAddress(\"${ETH_SWAP_CONTRACT_HASH_V0}\")" | sed 's/"//g')
-echo "ETH SWAP contract address is ${ETH_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/eth_swap_contract_address_v0.txt"
-cat > "${NODES_ROOT}/eth_swap_contract_address_v0.txt" <<EOF
+echo "ETH SWAP contract address is ${ETH_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/eth_swap_contract_address.txt"
+cat > "${NODES_ROOT}/eth_swap_contract_address.txt" <<EOF
 ${ETH_SWAP_CONTRACT_ADDR_V0}
 EOF
 
@@ -222,8 +222,8 @@ chmod +x "${NODES_ROOT}/harness-ctl/sendUSDT"
 mine_pending_txs
 
 USDC_SWAP_CONTRACT_ADDR_V0=$("${NODES_ROOT}/harness-ctl/alpha" "attach --preload ${NODES_ROOT}/harness-ctl/contractAddress.js --exec contractAddress(\"${USDC_SWAP_CONTRACT_HASH_V0}\")" | sed 's/"//g')
-echo "USDC v0 swap contract address is ${USDC_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/usdc_swap_contract_address_v0.txt"
-cat > "${NODES_ROOT}/usdc_swap_contract_address_v0.txt" <<EOF
+echo "USDC v0 swap contract address is ${USDC_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/usdc_swap_contract_address.txt"
+cat > "${NODES_ROOT}/usdc_swap_contract_address.txt" <<EOF
 ${USDC_SWAP_CONTRACT_ADDR_V0}
 EOF
 

dex/testing/polygon/harness.sh

@@ -378,13 +378,13 @@ MULTIBALANCE_CONTRACT_HASH=$("${HARNESS_DIR}/alpha" "--preload ${HARNESS_DIR}/de
 mine_pending_txs
 
 ETH_SWAP_CONTRACT_ADDR_V0=$("${HARNESS_DIR}/alpha" "--preload ${HARNESS_DIR}/contractAddress.js --exec contractAddress(\"${ETH_SWAP_CONTRACT_HASH_V0}\")" | sed 's/"//g')
-echo "ETH SWAP v0 contract address is ${ETH_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/eth_swap_contract_address_v0.txt"
-cat > "${NODES_ROOT}/eth_swap_contract_address_v0.txt" <<EOF
+echo "ETH SWAP v0 contract address is ${ETH_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/eth_swap_contract_address.txt"
+cat > "${NODES_ROOT}/eth_swap_contract_address.txt" <<EOF
 ${ETH_SWAP_CONTRACT_ADDR_V0}
 EOF
 
 ETH_SWAP_CONTRACT_ADDR_V1=$("${HARNESS_DIR}/alpha" "--preload ${HARNESS_DIR}/contractAddress.js --exec contractAddress(\"${ETH_SWAP_CONTRACT_HASH_V1}\")" | sed 's/"//g')
-echo "ETH SWAP v1 contract address is ${ETH_SWAP_CONTRACT_ADDR_V1}. Saving to ${NODES_ROOT}/eth_swap_contract_address_v0.txt"
+echo "ETH SWAP v1 contract address is ${ETH_SWAP_CONTRACT_ADDR_V1}. Saving to ${NODES_ROOT}/eth_swap_contract_address.txt"
 cat > "${NODES_ROOT}/eth_swap_contract_address_v1.txt" <<EOF
 ${ETH_SWAP_CONTRACT_ADDR_V1}
 EOF
@@ -452,8 +452,8 @@ USDT_SWAP_CONTRACT_HASH=$("${HARNESS_DIR}/alpha" "--preload ${HARNESS_DIR}/deplo
 mine_pending_txs
 
 USDC_SWAP_CONTRACT_ADDR_V0=$("${HARNESS_DIR}/alpha" "--preload ${HARNESS_DIR}/contractAddress.js --exec contractAddress(\"${USDC_SWAP_CONTRACT_HASH_V0}\")" | sed 's/"//g')
-echo "USDC SWAP v0 contract address is ${USDC_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/usdc_swap_contract_address_v0.txt"
-cat > "${NODES_ROOT}/usdc_swap_contract_address_v0.txt" <<EOF
+echo "USDC SWAP v0 contract address is ${USDC_SWAP_CONTRACT_ADDR_V0}. Saving to ${NODES_ROOT}/usdc_swap_contract_address.txt"
+cat > "${NODES_ROOT}/usdc_swap_contract_address.txt" <<EOF
 ${USDC_SWAP_CONTRACT_ADDR_V0}
 EOF
 

server/asset/eth/rpcclient_harness_test.go

@@ -28,8 +28,8 @@ var (
 	homeDir      = os.Getenv("HOME")
 	alphaIPCFile = filepath.Join(homeDir, "dextest", "eth", "alpha", "node", "geth.ipc")
 
-	contractAddrFile   = filepath.Join(homeDir, "dextest", "eth", "eth_swap_contract_address_v0.txt")
-	tokenSwapAddrFile  = filepath.Join(homeDir, "dextest", "eth", "usdc_swap_contract_address_v0.txt")
+	contractAddrFile   = filepath.Join(homeDir, "dextest", "eth", "eth_swap_contract_address.txt")
+	tokenSwapAddrFile  = filepath.Join(homeDir, "dextest", "eth", "usdc_swap_contract_address.txt")
 	tokenErc20AddrFile = filepath.Join(homeDir, "dextest", "eth", "test_usdc_contract_address.txt")
 	deltaAddress       = "d12ab7cf72ccf1f3882ec99ddc53cd415635c3be"
 	gammaAddress       = "41293c2032bac60aa747374e966f79f575d42379"