scenario step default expect ok

multiversx · Jul 14, 2023 · d687132 · d687132
1 parent 9c780a0
commit d687132
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 28 deletions.
diff --git a/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs b/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs
@@ -30,8 +30,7 @@ fn adder_scenario_constructed_raw() {
             ScDeployStep::new()
                 .from(owner_address)
                 .code(adder_code)
-                .call(adder_contract.init(5u32))
-                .expect(TxExpect::ok().no_result()),
+                .call(adder_contract.init(5u32)),
             |new_address, _: TypedResponse<()>| {
                 assert_eq!(new_address, adder_contract.to_address());
             },
@@ -46,8 +45,7 @@ fn adder_scenario_constructed_raw() {
             ScCallStep::new()
                 .from(owner_address)
                 .to(&adder_contract)
-                .call(adder_contract.add(3u32))
-                .expect(TxExpect::ok().no_result()),
+                .call(adder_contract.add(3u32)),
         )
         .check_state_step(
             CheckStateStep::new()

diff --git a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_mandos_rust_test.rs b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_mandos_rust_test.rs
@@ -41,8 +41,7 @@ fn crowdfunding_scenario_rust_test() {
                 2_000u32,
                 deadline,
                 EgldOrEsdtTokenIdentifier::esdt(cf_token_id_value),
-            ))
-            .expect(TxExpect::ok().no_result()),
+            )),
     );
 
     // setup user accounts
@@ -63,8 +62,7 @@ fn crowdfunding_scenario_rust_test() {
                 .from(first_user_addr)
                 .to(&cf_sc)
                 .esdt_transfer(cf_token_id, 0u64, 1_000u64)
-                .call(cf_sc.fund())
-                .expect(TxExpect::ok().no_result()),
+                .call(cf_sc.fund()),
         )
         .check_state_step(
             CheckStateStep::new()
@@ -85,8 +83,7 @@ fn crowdfunding_scenario_rust_test() {
                 .from(second_user_addr)
                 .to(&cf_sc)
                 .esdt_transfer(cf_token_id, 0u64, 500u64)
-                .call(cf_sc.fund())
-                .expect(TxExpect::ok().no_result()),
+                .call(cf_sc.fund()),
         )
         .check_state_step(
             CheckStateStep::new()
@@ -127,8 +124,7 @@ fn crowdfunding_scenario_rust_test() {
             ScCallStep::new()
                 .from(owner_addr)
                 .to(&cf_sc)
-                .call(cf_sc.claim())
-                .expect(TxExpect::ok().no_result()),
+                .call(cf_sc.claim()),
         )
         .check_state_step(
             CheckStateStep::new()
@@ -148,8 +144,7 @@ fn crowdfunding_scenario_rust_test() {
             ScCallStep::new()
                 .from(first_user_addr)
                 .to(&cf_sc)
-                .call(cf_sc.claim())
-                .expect(TxExpect::ok().no_result()),
+                .call(cf_sc.claim()),
         )
         .check_state_step(
             CheckStateStep::new()
@@ -169,8 +164,7 @@ fn crowdfunding_scenario_rust_test() {
             ScCallStep::new()
                 .from(second_user_addr)
                 .to(&cf_sc)
-                .call(cf_sc.claim())
-                .expect(TxExpect::ok().no_result()),
+                .call(cf_sc.claim()),
         )
         .check_state_step(
             CheckStateStep::new()
@@ -191,8 +185,7 @@ fn crowdfunding_scenario_rust_test() {
             .from(first_user_addr)
             .to(&cf_sc)
             .esdt_transfer(cf_token_id, 0u64, 1_000u64)
-            .call(cf_sc.fund())
-            .expect(TxExpect::ok().no_result()),
+            .call(cf_sc.fund()),
     );
 
     // second user deposit
@@ -201,8 +194,7 @@ fn crowdfunding_scenario_rust_test() {
             .from(second_user_addr)
             .to(&cf_sc)
             .esdt_transfer(cf_token_id, 0u64, 1_000u64)
-            .call(cf_sc.fund())
-            .expect(TxExpect::ok().no_result()),
+            .call(cf_sc.fund()),
     );
 
     let status: Status = cf_sc
@@ -239,8 +231,7 @@ fn crowdfunding_scenario_rust_test() {
             ScCallStep::new()
                 .from(owner_addr)
                 .to(&cf_sc)
-                .call(cf_sc.claim())
-                .expect(TxExpect::ok().no_result()),
+                .call(cf_sc.claim()),
         )
         .check_state_step(
             CheckStateStep::new()

diff --git a/contracts/examples/multisig/tests/multisig_rust_test_v2.rs b/contracts/examples/multisig/tests/multisig_rust_test_v2.rs
@@ -138,8 +138,7 @@ impl MultisigTestState {
             ScDeployStep::new()
                 .from(self.owner.clone())
                 .code(self.world.code_expression(MULTISIG_PATH_EXPR))
-                .call(self.multisig.init(2u32, board))
-                .expect(TxExpect::ok().no_result()),
+                .call(self.multisig.init(2u32, board)),
         );
 
         self
@@ -156,8 +155,7 @@ impl MultisigTestState {
             ScDeployStep::new()
                 .from(self.owner.clone())
                 .code(self.world.code_expression(ADDER_PATH_EXPR))
-                .call(self.adder.init(0u64))
-                .expect(TxExpect::ok().no_result()),
+                .call(self.adder.init(0u64)),
         );
 
         self
@@ -167,8 +165,7 @@ impl MultisigTestState {
         self.world.sc_call_step(
             ScCallStep::new()
                 .from(signer)
-                .call(self.multisig.sign(action_id))
-                .expect(TxExpect::ok().no_result()),
+                .call(self.multisig.sign(action_id)),
         );
     }