Fix cli tests to explicitly pass height when querying results of tx

This commit is contained in:
Ethan Frey
2017-10-25 19:14:28 +02:00
parent 5714b101b5
commit ff0a50a1b3
7 changed files with 38 additions and 28 deletions
+3 -3
View File
@@ -184,7 +184,7 @@ test04SendIBCPacket() {
TX_HEIGHT=$(echo $TX | jq .height)
# Make sure balance went down and tx is indexed
checkAccount $SENDER "9007199254720990"
checkAccount $SENDER "9007199254720990" "$TX_HEIGHT"
checkSendTx $HASH $TX_HEIGHT $SENDER "20002"
# look, we wrote a packet
@@ -211,7 +211,7 @@ test05ReceiveIBCPacket() {
# make some credit, so we can accept the packet
TX=$(echo qwertyuiop | ${CLIENT_EXE} tx credit --amount=60006mycoin --to=$CHAIN_ID_1:: --name=$RICH)
txSucceeded $? "$TX" "${CHAIN_ID_1}::"
checkAccount $CHAIN_ID_1:: "60006"
checkAccount $CHAIN_ID_1:: "60006" "$TX_HEIGHT"
# now, we try to post it.... (this is PACKET from last test)
@@ -279,7 +279,7 @@ assertNewHeight() {
# TX_HEIGHT=$(echo $TX | jq .height)
# # Make sure balance went down and tx is indexed
# checkAccount $SENDER "1" "9007199254720990"
# checkAccount $SENDER "1" "9007199254720990" "$TX_HEIGHT"
# checkSendTx $HASH $TX_HEIGHT $SENDER "20002"
# # Make sure nothing arrived - yet
+4 -4
View File
@@ -126,8 +126,8 @@ test04CreateRoleInvalid() {
# TX_HEIGHT=$(echo $TX | jq .height)
# # deduct 100 from sender, add 90 to receiver... fees "vanish"
# checkAccount $SENDER "9007199254739900"
# checkAccount $RECV "1082"
# checkAccount $SENDER "9007199254739900" "$TX_HEIGHT"
# checkAccount $RECV "1082" "$TX_HEIGHT"
# # Make sure tx is indexed
# checkSendFeeTx $HASH $TX_HEIGHT $SENDER "90" "10"
@@ -135,8 +135,8 @@ test04CreateRoleInvalid() {
# # assert replay protection
# TX=$(echo qwertyuiop | ${CLIENT_EXE} tx send --amount=90mycoin --fee=10mycoin --sequence=2 --to=$RECV --name=$RICH 2>/dev/null)
# assertFalse "line=${LINENO}, replay: $TX" $?
# checkAccount $SENDER "9007199254739900"
# checkAccount $RECV "1082"
# checkAccount $SENDER "9007199254739900" "$TX_HEIGHT"
# checkAccount $RECV "1082" "$TX_HEIGHT"
# # make sure we can query the proper nonce
# NONCE=$(${CLIENT_EXE} query nonce $SENDER)
+2 -2
View File
@@ -26,8 +26,8 @@ test00PreRestart() {
HASH=$(echo $TX | jq .hash | tr -d \")
TX_HEIGHT=$(echo $TX | jq .height)
checkAccount $SENDER "9007199254740000"
checkAccount $RECV "992"
checkAccount $SENDER "9007199254740000" "$TX_HEIGHT"
checkAccount $RECV "992" "$TX_HEIGHT"
# make sure tx is indexed
checkSendTx $HASH $TX_HEIGHT $SENDER "992"
+6 -5
View File
@@ -35,7 +35,7 @@ test01SetupRole() {
HASH=$(echo $TX | jq .hash | tr -d \")
TX_HEIGHT=$(echo $TX | jq .height)
checkRole "${ROLE}" $SIGS 3
checkRole "${ROLE}" $SIGS 3 "$TX_HEIGHT"
# Make sure tx is indexed
checkRoleTx $HASH $TX_HEIGHT "${ROLE}" 3
@@ -51,8 +51,8 @@ test02SendTxToRole() {
TX_HEIGHT=$(echo $TX | jq .height)
# reduce by 10090
checkAccount $SENDER "9007199254730902"
checkAccount $RECV "10000"
checkAccount $SENDER "9007199254730902" "$TX_HEIGHT"
checkAccount $RECV "10000" "$TX_HEIGHT"
checkSendFeeTx $HASH $TX_HEIGHT $SENDER "10000" "90"
}
@@ -82,9 +82,10 @@ test03SendMultiFromRole() {
# and get some dude to sign it for the full access
TX=$(echo qwertyuiop | ${CLIENT_EXE} tx --in=$TX_FILE --name=$DUDE)
txSucceeded $? "$TX" "multi-bank"
TX_HEIGHT=$(echo $TX | jq .height)
checkAccount $TWO "6000"
checkAccount $BANK "4000"
checkAccount $TWO "6000" "$TX_HEIGHT"
checkAccount $BANK "4000" "$TX_HEIGHT"
}