Enable trait_erc20 tests for canvas-ui

Follow-up for paritytech/canvas-ui#105.
paritytech · Jul 20, 2021 · 79af499 · 79af499
1 parent 5fa1c1e
commit 79af499
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/src/tests/trait_erc20.rs b/src/tests/trait_erc20.rs
@@ -29,8 +29,6 @@ use crate::{
 use lang_macro::waterfall_test;
 
 #[waterfall_test]
-// TODO has to be ignored for `canvas-ui` until https://github.com/paritytech/canvas-ui/issues/105 is fixed.
-#[cfg_attr(not(feature = "polkadot-js-ui"), ignore)]
 async fn trait_erc20(mut ui: Ui) -> Result<()> {
     // given
     let manifest_path = utils::example_path("trait-erc20/Cargo.toml");
@@ -45,18 +43,18 @@ async fn trait_erc20(mut ui: Ui) -> Result<()> {
         )
         .await?;
     let total_supply = ui
-        .execute_rpc(Call::new(&contract_addr, "baseErc20,total_supply"))
+        .execute_rpc(Call::new(&contract_addr, "BaseErc20,total_supply"))
         .await?;
     assert!(total_supply == "1000000000000000" || total_supply == "1.0000 kUnit");
     let balance = ui
         .execute_rpc(
-            Call::new(&contract_addr, "baseErc20,balance_of").push_value("owner", "bob"),
+            Call::new(&contract_addr, "BaseErc20,balance_of").push_value("owner", "bob"),
         )
         .await?;
     assert!(balance == "1000000000000000" || balance == "1.0000 kUnit");
 
     ui.execute_transaction(
-        Call::new(&contract_addr, "baseErc20,transfer")
+        Call::new(&contract_addr, "BaseErc20,transfer")
             .caller("BOB")
             .push_value("to", "ALICE")
             .push_value("value", "500"),
@@ -66,7 +64,7 @@ async fn trait_erc20(mut ui: Ui) -> Result<()> {
 
     let balance = ui
         .execute_rpc(
-            Call::new(&contract_addr, "baseErc20,balance_of")
+            Call::new(&contract_addr, "BaseErc20,balance_of")
                 .push_value("owner", "ALICE"),
         )
         .await?;
@@ -76,8 +74,6 @@ async fn trait_erc20(mut ui: Ui) -> Result<()> {
 }
 
 #[waterfall_test]
-// TODO has to be ignored for `canvas-ui` until https://github.com/paritytech/canvas-ui/issues/105 is fixed.
-#[cfg_attr(not(feature = "polkadot-js-ui"), ignore)]
 async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
     // given
     let manifest_path = utils::example_path("trait-erc20/Cargo.toml");
@@ -99,7 +95,7 @@ async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
     assert!(
         true || ui
             .execute_transaction(
-                Call::new(&contract_addr, "baseErc20,transfer_from")
+                Call::new(&contract_addr, "BaseErc20,transfer_from")
                     .caller("ALICE")
                     .push_value("from: AccountId", "BOB")
                     .push_value("to: AccountId", "ALICE")
@@ -111,7 +107,7 @@ async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
 
     // Bob approves Alice being able to withdraw up the `value` amount on his behalf.
     ui.execute_transaction(
-        Call::new(&contract_addr, "baseErc20,approve")
+        Call::new(&contract_addr, "BaseErc20,approve")
             .caller("BOB")
             .push_value("spender", "ALICE")
             .push_value("value", "600"),
@@ -120,7 +116,7 @@ async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
     .expect("`approve` must succeed");
     let allowance = ui
         .execute_rpc(
-            Call::new(&contract_addr, "baseErc20,allowance")
+            Call::new(&contract_addr, "BaseErc20,allowance")
                 .push_value("owner", "BOB")
                 .push_value("spender", "ALICE"),
         )
@@ -129,7 +125,7 @@ async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
 
     // Alice tries again to transfer tokens on behalf ob Bob
     ui.execute_transaction(
-        Call::new(&contract_addr, "baseErc20,transfer_from")
+        Call::new(&contract_addr, "BaseErc20,transfer_from")
             .caller("ALICE")
             .push_value("from: AccountId", "BOB")
             .push_value("to: AccountId", "ALICE")
@@ -139,14 +135,14 @@ async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
     .expect("second `transfer_from` must succeed");
     let balance = ui
         .execute_rpc(
-            Call::new(&contract_addr, "baseErc20,balance_of")
+            Call::new(&contract_addr, "BaseErc20,balance_of")
                 .push_value("owner", "ALICE"),
         )
         .await?;
     assert!(balance == "400000000000000" || balance == "400.0000 Unit");
     let balance = ui
         .execute_rpc(
-            Call::new(&contract_addr, "baseErc20,balance_of").push_value("owner", "BOB"),
+            Call::new(&contract_addr, "BaseErc20,balance_of").push_value("owner", "BOB"),
         )
         .await?;
     assert!(balance == "600000000000000" || balance == "600.0000 Unit");
@@ -158,7 +154,7 @@ async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
     assert!(
         true || ui
             .execute_transaction(
-                Call::new(&contract_addr, "baseErc20,transfer_from")
+                Call::new(&contract_addr, "BaseErc20,transfer_from")
                     .caller("ALICE")
                     .push_value("from: AccountId", "BOB")
                     .push_value("to: AccountId", "ALICE")
@@ -171,7 +167,7 @@ async fn trait_erc20_allowances(mut ui: Ui) -> Result<()> {
     // Balance of Bob must have stayed the same
     let balance = ui
         .execute_rpc(
-            Call::new(&contract_addr, "baseErc20,balance_of").push_value("owner", "BOB"),
+            Call::new(&contract_addr, "BaseErc20,balance_of").push_value("owner", "BOB"),
         )
         .await?;
     assert!(balance == "600000000000000" || balance == "600.0000 Unit");