Merge pull request #63 from Cardinal-Cryptography/fix-e2e-tests

Update to work with aleph-node release 12.1

Author: deuszx

amm/e2e-tests/src/test/factory.rs

@@ -102,7 +102,7 @@ pub async fn factory_contract_set_up_correctly() -> Result<()> {
     let FactoryTestSetup {
         wealthy_connection,
         regular_account,
-        zero_account,
+        zero_account: _zero_account,
         factory_contract,
         ..
     } = set_up_factory_test().await?;
@@ -115,7 +115,7 @@ pub async fn factory_contract_set_up_correctly() -> Result<()> {
         .read(factory_contract.all_pairs_length())
         .await??;
 
-    assert!(recipient == zero_account);
+    assert!(recipient.is_none());
     assert!(setter == regular_account);
     assert!(all_pairs_length == 0);
 
@@ -137,7 +137,7 @@ pub async fn set_fee() -> Result<()> {
 
     let fee_recipient = wealthy_connection.read(factory_contract.fee_to()).await??;
 
-    assert!(fee_recipient == zero_account);
+    assert!(fee_recipient.is_none());
 
     ensure!(
         wealthy_connection
@@ -156,7 +156,7 @@ pub async fn set_fee() -> Result<()> {
 
     let regular_recipient = regular_connection.read(factory_contract.fee_to()).await??;
 
-    assert!(regular_recipient == regular_account);
+    assert!(regular_recipient == Some(regular_account));
 
     Ok(())
 }

amm/e2e-tests/src/test/pair.rs

@@ -297,7 +297,7 @@ pub async fn swap_tokens() -> Result<()> {
     assert!(regular_balance_before == EXPECTED_INITIAL_REGULAR_BALANCE);
 
     let swap_tx_info = wealthy_connection
-        .exec(pair_contract.swap(FIRST_AMOUNT_OUT, SECOND_AMOUNT_OUT, regular_account))
+        .exec(pair_contract.swap(FIRST_AMOUNT_OUT, SECOND_AMOUNT_OUT, regular_account, None))
         .await?;
 
     let all_pair_contract_events = wealthy_connection.get_contract_events(swap_tx_info).await?;
@@ -359,7 +359,7 @@ pub async fn burn_liquidity_provider_token() -> Result<()> {
         .exec(first_token.transfer(pair, FIRST_AMOUNT_IN, vec![]))
         .await?;
     wealthy_connection
-        .exec(pair_contract.swap(FIRST_AMOUNT_OUT, SECOND_AMOUNT_OUT, regular_account))
+        .exec(pair_contract.swap(FIRST_AMOUNT_OUT, SECOND_AMOUNT_OUT, regular_account, None))
         .await?;
 
     let first_token_balance_before = wealthy_connection