Merge #3188

3188: E2e tests: minor test and workflow updates r=piotr-iohk a=piotr-iohk

<!--
Detail in a few bullet points the work accomplished in this PR.

Before you submit, don't forget to:

* Make sure the GitHub PR fields are correct:
   ✓ Set a good Title for your PR.
   ✓ Assign yourself to the PR.
   ✓ Assign one or more reviewer(s).
   ✓ Link to a Jira issue, and/or other GitHub issues or PRs.
   ✓ In the PR description delete any empty sections
     and all text commented in <!--, so that this text does not appear
     in merge commit messages.

* Don't waste reviewers' time:
   ✓ If it's a draft, select the Create Draft PR option.
   ✓ Self-review your changes to make sure nothing unexpected slipped through.

* Try to make your intent clear:
   ✓ Write a good Description that explains what this PR is meant to do.
   ✓ Jira will detect and link to this PR once created, but you can also
     link this PR in the description of the corresponding Jira ticket.
   ✓ Highlight what Testing you have done.
   ✓ Acknowledge any changes required to the Documentation.
-->


- [x] Minor updates to tests and workflows

### Comments

<!-- Additional comments, links, or screenshots to attach, if any. -->

### Issue Number

<!-- Reference the Jira/GitHub issue that this PR relates to, and which requirements it tackles.
  Note: Jira issues of the form ADP- will be auto-linked. -->


Co-authored-by: Piotr Stachyra <piotr.stachyra@iohk.io>

Author: iohk-bors[bot]

.github/workflows/e2e-docker.yml

@@ -62,7 +62,7 @@ jobs:
 
     - name: 💾 Cache node db
       id: cache
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/node_db/${{ env.NETWORK }}
         key: node-db-docker-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}
@@ -72,12 +72,12 @@ jobs:
 
     - name: 💾 Cache wallet db
       id: cache-wallet
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/wallet_db/${{ env.NETWORK }}
         key: wallet-db-${{ runner.os }}-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}
         restore-keys: |
-          wallet-db-${{ runner.os }}-${{ env.NETWORK }}-
+          wallet-db-docker-${{ env.NETWORK }}-
           wallet-db-Linux-${{ env.NETWORK }}-
 
     - name: 🚀 Start node and wallet

.github/workflows/e2e-linux.yml

@@ -41,7 +41,7 @@ jobs:
 
     - name: 💾 Cache node db
       id: cache
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/node_db/${{ env.NETWORK }}
         key: node-db-${{ runner.os }}-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}
@@ -50,7 +50,7 @@ jobs:
 
     - name: 💾 Cache wallet db
       id: cache-wallet
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/wallet_db/${{ env.NETWORK }}
         key: wallet-db-${{ runner.os }}-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}

.github/workflows/e2e-macos.yml

@@ -44,7 +44,7 @@ jobs:
 
     - name: 💾 Cache node db
       id: cache
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/node_db/${{ env.NETWORK }}
         key: node-db-${{ runner.os }}-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}
@@ -54,7 +54,7 @@ jobs:
 
     - name: 💾 Cache wallet db
       id: cache-wallet
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/wallet_db/${{ env.NETWORK }}
         key: wallet-db-${{ runner.os }}-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}

.github/workflows/e2e-windows.yml

@@ -47,7 +47,7 @@ jobs:
 
     - name: 💾 Cache node db
       id: cache
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/node_db/${{ env.NETWORK }}
         key: node-db-${{ runner.os }}-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}
@@ -57,13 +57,13 @@ jobs:
 
     - name: 💾 Cache wallet db
       id: cache-wallet
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.7
       with:
         path: test/e2e/state/wallet_db/${{ env.NETWORK }}
         key: wallet-db-${{ runner.os }}-${{ env.NETWORK }}-${{ steps.date-time.outputs.value }}
         restore-keys: |
           wallet-db-${{ runner.os }}-${{ env.NETWORK }}-
-            
+
     - name: ⚙️ Setup (get latest bins and configs and decode fixtures)
       run: rake setup[%NETWORK%,%PR%]
 

test/e2e/spec/e2e_spec.rb

@@ -133,16 +133,16 @@ def run_contract(contract_setup, scripts)
       expect(burn[:tx_balanced].parsed_response).to eq burn[:tx_signed].parsed_response
 
       # verify decoded unbalanced transaction includes assets minted and burned
-      expect(mint[:tx_unbalanced]['assets_minted']).to eq assets
-      expect(mint[:tx_unbalanced]['assets_burned']).to eq []
-      expect(burn[:tx_unbalanced]['assets_minted']).to eq []
-      expect(burn[:tx_unbalanced]['assets_burned']).to eq assets
+      expect(mint[:tx_unbalanced]['assets_minted']['token_map']).to eq assets
+      expect(mint[:tx_unbalanced]['assets_burned']['token_map']).to eq []
+      expect(burn[:tx_unbalanced]['assets_minted']['token_map']).to eq []
+      expect(burn[:tx_unbalanced]['assets_burned']['token_map']).to eq assets
 
       # verify decoded balanced transaction includes assets minted and burned
-      expect(mint[:tx_balanced]['assets_minted']).to eq assets
-      expect(mint[:tx_balanced]['assets_burned']).to eq []
-      expect(burn[:tx_balanced]['assets_minted']).to eq []
-      expect(burn[:tx_balanced]['assets_burned']).to eq assets
+      expect(mint[:tx_balanced]['assets_minted']['token_map']).to eq assets
+      expect(mint[:tx_balanced]['assets_burned']['token_map']).to eq []
+      expect(burn[:tx_balanced]['assets_minted']['token_map']).to eq []
+      expect(burn[:tx_balanced]['assets_burned']['token_map']).to eq assets
     end
 
     it "withdrawal" do
@@ -241,8 +241,8 @@ def run_contract(contract_setup, scripts)
                 "quantity" => 1 }
 
       # verify decoded transactions show that currency will be minted
-      expect(r[:tx_unbalanced]['assets_minted']).to eq [apfel, banana]
-      expect(r[:tx_balanced]['assets_minted']).to eq [apfel, banana]
+      expect(r[:tx_unbalanced]['assets_minted']['token_map']).to eq [apfel, banana]
+      expect(r[:tx_balanced]['assets_minted']['token_map']).to eq [apfel, banana]
 
       # make sure currency is minted as expected
       src_balance = get_shelley_balances(@wid)
@@ -283,7 +283,10 @@ def run_contract(contract_setup, scripts)
       tx_constructed = SHELLEY.transactions.construct(@wid, payment)
       expect(tx_constructed).to be_correct_and_respond 202
       expected_fee = tx_constructed['fee']['quantity']
-      decoded_fee = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])['fee']['quantity']
+      tx_decoded = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])
+      expect(tx_decoded).to be_correct_and_respond 202
+
+      decoded_fee = tx_decoded['fee']['quantity']
       expect(expected_fee).to eq decoded_fee
 
       tx_signed = SHELLEY.transactions.sign(@wid, PASS, tx_constructed['transaction'])
@@ -324,7 +327,10 @@ def run_contract(contract_setup, scripts)
       tx_constructed = SHELLEY.transactions.construct(@wid, payment)
       expect(tx_constructed).to be_correct_and_respond 202
       expected_fee = tx_constructed['fee']['quantity']
-      decoded_fee = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])['fee']['quantity']
+      tx_decoded = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])
+      expect(tx_decoded).to be_correct_and_respond 202
+
+      decoded_fee = tx_decoded['fee']['quantity']
       expect(expected_fee).to eq decoded_fee
 
       tx_signed = SHELLEY.transactions.sign(@wid, PASS, tx_constructed['transaction'])
@@ -371,7 +377,10 @@ def run_contract(contract_setup, scripts)
       tx_constructed = SHELLEY.transactions.construct(@wid, payment)
       expect(tx_constructed).to be_correct_and_respond 202
       expected_fee = tx_constructed['fee']['quantity']
-      decoded_fee = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])['fee']['quantity']
+      tx_decoded = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])
+      expect(tx_decoded).to be_correct_and_respond 202
+
+      decoded_fee = tx_decoded['fee']['quantity']
       expect(expected_fee).to eq decoded_fee
 
       tx_signed = SHELLEY.transactions.sign(@wid, PASS, tx_constructed['transaction'])
@@ -419,7 +428,10 @@ def run_contract(contract_setup, scripts)
       withdrawal = tx_constructed['coin_selection']['withdrawals'].map { |x| x['amount']['quantity'] }.first
       expect(withdrawal).to eq 0
       expected_fee = tx_constructed['fee']['quantity']
-      decoded_fee = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])['fee']['quantity']
+      tx_decoded = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])
+      expect(tx_decoded).to be_correct_and_respond 202
+
+      decoded_fee = tx_decoded['fee']['quantity']
       expect(expected_fee).to eq decoded_fee
 
       tx_signed = SHELLEY.transactions.sign(@wid, PASS, tx_constructed['transaction'])
@@ -451,7 +463,10 @@ def run_contract(contract_setup, scripts)
                                                       metadata)
       expect(tx_constructed).to be_correct_and_respond 202
       expected_fee = tx_constructed['fee']['quantity']
-      decoded_fee = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])['fee']['quantity']
+      tx_decoded = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])
+      expect(tx_decoded).to be_correct_and_respond 202
+
+      decoded_fee = tx_decoded['fee']['quantity']
       expect(expected_fee).to eq decoded_fee
 
       tx_signed = SHELLEY.transactions.sign(@wid, PASS, tx_constructed['transaction'])
@@ -548,6 +563,8 @@ def run_contract(contract_setup, scripts)
 
       # Check fee and deposit on quitting
       decoded_tx = SHELLEY.transactions.decode(@target_id, tx_constructed["transaction"])
+      expect(decoded_tx).to be_correct_and_respond 202
+
       expect(tx_constructed['coin_selection']['deposits_taken']).to eq []
       expect(decoded_tx['deposits_taken']).to eq []
       deposit_returned = tx_constructed['coin_selection']['deposits_returned'].first['quantity']
@@ -1237,7 +1254,10 @@ def test_byron_assets_tx(source_id, target_id)
       tx_constructed = SHELLEY.transactions.construct(@wid, payment)
       expect(tx_constructed).to be_correct_and_respond 202
       expected_fee = tx_constructed['fee']['quantity']
-      decoded_fee = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])['fee']['quantity']
+      tx_decoded = SHELLEY.transactions.decode(@wid, tx_constructed["transaction"])
+      expect(tx_decoded).to be_correct_and_respond 202
+
+      decoded_fee = tx_decoded['fee']['quantity']
       expect(expected_fee).to eq decoded_fee
 
       tx_signed = SHELLEY.transactions.sign(@wid, PASS, tx_constructed['transaction'])