From cb96f27f1c40e22f3122c9ca50a6d23b59829baa Mon Sep 17 00:00:00 2001 From: ghubstan <36207203+ghubstan@users.noreply.github.com> Date: Wed, 20 Jan 2021 11:52:29 -0300 Subject: [PATCH] Remove uneeded ${curlies} For requested change https://github.com/bisq-network/bisq/pull/5093#discussion_r560941709 --- apitest/scripts/trade-simulation-utils.sh | 16 ++++++++-------- apitest/scripts/trade-simulation.sh | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apitest/scripts/trade-simulation-utils.sh b/apitest/scripts/trade-simulation-utils.sh index 40851b4b41..fcbcc304c1 100755 --- a/apitest/scripts/trade-simulation-utils.sh +++ b/apitest/scripts/trade-simulation-utils.sh @@ -58,7 +58,7 @@ registerdisputeagents() { getbtcoreaddress() { CMD="bitcoin-cli -regtest -rpcport=19443 -rpcuser=apitest -rpcpassword=apitest getnewaddress" - NEW_ADDRESS=$(${CMD}) + NEW_ADDRESS=$($CMD) echo "${NEW_ADDRESS}" } @@ -81,7 +81,7 @@ genbtcblocks() { genbtcblock() { CMD="$1" - NEW_BLOCK_HASH=$(${CMD} | sed -n '2p') + NEW_BLOCK_HASH=$($CMD | sed -n '2p') echo "$NEW_BLOCK_HASH" } @@ -99,7 +99,7 @@ printbalances() { getpaymentaccountmethods() { CMD="$1" - CMD_OUTPUT=$(${CMD}) + CMD_OUTPUT=$($CMD) commandalert $? "Could not get payment method ids." printdate "Payment Method IDs:" echo "${CMD_OUTPUT}" @@ -107,7 +107,7 @@ getpaymentaccountmethods() { getpaymentaccountform() { CMD="$1" - CMD_OUTPUT=$(${CMD}) + CMD_OUTPUT=$($CMD) commandalert $? "Could not get new payment account form." echo "${CMD_OUTPUT}" } @@ -115,7 +115,7 @@ getpaymentaccountform() { editpaymentaccountform() { COUNTRY_CODE="$1" CMD="python3 ${APITEST_SCRIPTS_HOME}/editf2faccountform.py $COUNTRY_CODE" - CMD_OUTPUT=$(${CMD}) + CMD_OUTPUT=$($CMD) commandalert $? "Could not edit payment account form." printdate "Saved payment account form as ${F2F_ACCT_FORM}." } @@ -138,7 +138,7 @@ getnewpaymentacctcurrency() { createpaymentacct() { CMD="$1" - CMD_OUTPUT=$(${CMD}) + CMD_OUTPUT=$($CMD) commandalert $? "Could not create new payment account." echo "${CMD_OUTPUT}" } @@ -147,7 +147,7 @@ getpaymentaccounts() { PORT="$1" printcmd "${CLI_BASE} --port=${PORT} getpaymentaccts" CMD="$CLI_BASE --port=$PORT getpaymentaccts" - CMD_OUTPUT=$(${CMD}) + CMD_OUTPUT=$($CMD) commandalert $? "Could not get payment accounts." echo "${CMD_OUTPUT}" } @@ -168,7 +168,7 @@ createoffer() { getcurrentprice() { CURRENCY_CODE="$1" CMD="python3 ${APITEST_SCRIPTS_HOME}/getmktprice.py ${CURRENCY_CODE}" - PRICE=$(${CMD}) + PRICE=$($CMD) echo "${PRICE}" } diff --git a/apitest/scripts/trade-simulation.sh b/apitest/scripts/trade-simulation.sh index 068f8abaf5..44fd2af68e 100755 --- a/apitest/scripts/trade-simulation.sh +++ b/apitest/scripts/trade-simulation.sh @@ -73,8 +73,8 @@ cat "${APITEST_SCRIPTS_HOME}/${F2F_ACCT_FORM}" # Remove the autogenerated json template because we are going to use one created by a python script in the next step. CMD="rm -v ${APP_HOME}/f2f_*.json" -DELETE_JSON_TEMPLATE=$(${CMD}) -echo "$DELETE_JSON_TEMPLATE" +DELETE_JSON_TEMPLATE=$($CMD) +printdate "$DELETE_JSON_TEMPLATE" printbreak printdate "Bob and Alice create their face to face ${COUNTRY_CODE} payment accounts."