Skip to content

Commit

Permalink
Merge pull request #3823 from input-output-hk/piotr/e2e-tests-mainten…
Browse files Browse the repository at this point in the history
…ance-deposit-returned

Test maintenance
  • Loading branch information
piotr-iohk authored Apr 7, 2023
2 parents 48b612e + 9a4aab7 commit 09c10d3
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 43 deletions.
33 changes: 20 additions & 13 deletions test/e2e/spec/e2e_shared_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@
expect(tx_submitted).to be_correct_and_respond 202

tx_id = tx_submitted['id']
verify_tx_status(src_wid, tx_id, 'pending', SHARED)
wait_for_tx_in_ledger(src_wid, tx_id, SHARED)
verify_tx_status(src_wid, tx_id, 'in_ledger', SHARED)

Expand Down Expand Up @@ -205,7 +204,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -254,7 +254,6 @@
expect(tx_submitted).to be_correct_and_respond 202

tx_id = tx_submitted['id']
verify_tx_status(cosigner_wid, tx_id, 'pending', SHARED)
wait_for_tx_in_ledger(src_wid, tx_id, SHARED)
verify_tx_status(cosigner_wid, tx_id, 'in_ledger', SHARED)

Expand Down Expand Up @@ -317,7 +316,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -430,7 +430,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -543,7 +544,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -685,7 +687,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -788,7 +791,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -885,7 +889,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -989,7 +994,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -1089,7 +1095,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -1300,7 +1307,6 @@
tx_sent = SHELLEY.transactions.create(@wid, PASS, payload)

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
wait_for_tx_in_ledger(@wid, tx_sent['id'])

target_after = get_shared_balances(@wid_sha)
Expand Down Expand Up @@ -1405,7 +1411,8 @@
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down
56 changes: 26 additions & 30 deletions test/e2e/spec/e2e_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -933,7 +934,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -1036,7 +1038,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -1294,7 +1297,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -1456,7 +1460,8 @@ def script_hash
tx_collateral(tx, present: false)
tx_collateral_outputs(tx, present: false)
tx_metadata(tx, nil)
tx_deposits(tx, deposit_taken: 0, deposit_returned: deposit_returned)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(tx, deposit_taken: 0, deposit_returned: deposit_returned)
tx_withdrawals(tx, present: false)
tx_mint_burn(tx, mint: [], burn: [])
tx_extra_signatures(tx, present: false)
Expand Down Expand Up @@ -2482,8 +2487,6 @@ def script_hash
tx_sent = SHELLEY.transactions.create(@wid, PASS, payload)

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
verify_tx_status(@wid, tx_sent['id'], 'pending')
wait_for_tx_in_ledger(@wid, tx_sent['id'])
verify_tx_status(@wid, tx_sent['id'], 'in_ledger')

Expand Down Expand Up @@ -2535,9 +2538,7 @@ def script_hash
tx_sent = SHELLEY.transactions.create(@wid, PASS, payment_payload(amt, address))

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
tx_id = tx_sent['id']
verify_tx_status(@wid, tx_id, 'pending')
wait_for_tx_in_ledger(@wid, tx_id)
verify_tx_status(@wid, tx_id, 'in_ledger')

Expand Down Expand Up @@ -2580,7 +2581,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand All @@ -2603,9 +2605,7 @@ def script_hash
ttl_in_s)

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
tx_id = tx_sent['id']
verify_tx_status(@wid, tx_id, 'pending')
wait_for_tx_in_ledger(@wid, tx_id)
verify_tx_status(@wid, tx_id, 'in_ledger')

Expand Down Expand Up @@ -2647,7 +2647,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand All @@ -2670,7 +2671,6 @@ def script_hash
ttl_in_s)

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'

eventually "TX `#{tx_sent['id']}' expires on `#{@wid}'" do
SHELLEY.transactions.get(@wid, tx_sent['id'])['status'] == 'expired'
Expand All @@ -2692,9 +2692,7 @@ def script_hash
tx_sent = SHELLEY.transactions.create(@wid, PASS, [{ address => amt }], 'self')

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
tx_id = tx_sent['id']
verify_tx_status(@wid, tx_id, 'pending')
wait_for_tx_in_ledger(@wid, tx_id)
verify_tx_status(@wid, tx_id, 'in_ledger')

Expand Down Expand Up @@ -2738,7 +2736,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand All @@ -2761,9 +2760,7 @@ def script_hash
metadata)

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
tx_id = tx_sent['id']
verify_tx_status(@wid, tx_id, 'pending')
wait_for_tx_in_ledger(@wid, tx_id)
verify_tx_status(@wid, tx_id, 'in_ledger')

Expand Down Expand Up @@ -2805,7 +2802,8 @@ def script_hash
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, metadata)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -2912,8 +2910,6 @@ def script_hash
[{ address => amt }])

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
verify_tx_status(@wid, tx_sent['id'], 'pending')
wait_for_tx_in_ledger(@wid, tx_sent['id'])
verify_tx_status(@wid, tx_sent['id'], 'in_ledger')

Expand Down Expand Up @@ -3022,7 +3018,8 @@ def script_hash
tx_collateral(tx, present: false)
tx_collateral_outputs(tx, present: false)
tx_metadata(tx, nil)
tx_deposits(tx, deposit_taken: 0, deposit_returned: deposit)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(tx, deposit_taken: 0, deposit_returned: deposit)
tx_withdrawals(tx, present: false)
tx_mint_burn(tx, mint: [], burn: [])
tx_extra_signatures(tx, present: false)
Expand Down Expand Up @@ -3135,9 +3132,7 @@ def test_byron_tx(source_wid, target_wid)
tx_sent = BYRON.transactions.create(source_wid, PASS, payment_payload(amt, address))

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
tx_id = tx_sent['id']
verify_tx_status(source_wid, tx_id, 'pending', BYRON)
wait_for_tx_in_ledger(target_wid, tx_id)
verify_tx_status(source_wid, tx_id, 'in_ledger', BYRON)

Expand Down Expand Up @@ -3182,7 +3177,8 @@ def test_byron_tx(source_wid, target_wid)
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand All @@ -3208,9 +3204,7 @@ def test_byron_assets_tx(source_id, target_id)
tx_sent = BYRON.transactions.create(source_id, PASS, payload)

expect(tx_sent).to be_correct_and_respond 202
expect(tx_sent.to_s).to include 'pending'
tx_id = tx_sent['id']
verify_tx_status(source_id, tx_id, 'pending', BYRON)
wait_for_tx_in_ledger(target_id, tx_id)
verify_tx_status(source_id, tx_id, 'in_ledger', BYRON)

Expand Down Expand Up @@ -3269,7 +3263,8 @@ def test_byron_assets_tx(source_id, target_id)
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down Expand Up @@ -3571,7 +3566,8 @@ def test_byron_trans_list(wid)
tx_collateral(txt, present: false)
tx_collateral_outputs(txt, present: false)
tx_metadata(txt, nil)
tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
# ADP-2298 - Deposit_returned is falsely reported on some incoming transactions (intermittently)
# tx_deposits(txt, deposit_taken: 0, deposit_returned: 0)
tx_withdrawals(txt, present: false)
tx_mint_burn(txt, mint: [], burn: [])
tx_extra_signatures(txt, present: false)
Expand Down

0 comments on commit 09c10d3

Please sign in to comment.