Added reset functionality + fixed tests

multiversx · Aug 8, 2024 · f29280c · f29280c
1 parent 15c2cc8
commit f29280c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/contracts/on-chain-claim/src/contract.rs b/contracts/on-chain-claim/src/contract.rs
@@ -72,7 +72,7 @@ pub trait OnChainClaimContract:
 
         address_info_mapper.update(|address_info| {
             address_info.current_streak = 1;
-            address_info.total_epochs_claimed = 1;
+            address_info.total_epochs_claimed += 1;
             address_info.last_epoch_claimed = current_epoch;
 
             self.new_claim_event(&caller, address_info);

diff --git a/contracts/on-chain-claim/tests/tests.rs b/contracts/on-chain-claim/tests/tests.rs
@@ -241,10 +241,23 @@ fn check_after_claim() {
             assert_eq!(address_info.last_epoch_claimed, 21);
         })
         .set_state_step(SetStateStep::new().block_epoch(25))
+        .whitebox_call_check(
+            &on_chain_claim_whitebox,
+            ScCallStep::new()
+                .from(USER1_ADDR)
+                .to(SC_ADDR)
+                .no_expect(),
+            |sc| {
+                sc.claim();
+            },
+            |r| {
+                r.assert_user_error("missed epoch");
+            },
+        )
         .whitebox_call(
             &on_chain_claim_whitebox,
             ScCallStep::new().from(USER1_ADDR),
-            |sc| sc.claim(),
+            |sc| sc.reset(),
         )
         .whitebox_query(&on_chain_claim_whitebox, |sc| {
             let address = AddressValue::from(USER1_ADDR).to_address();
@@ -552,7 +565,7 @@ fn test_best_streak() {
         .whitebox_call(
             &on_chain_claim_whitebox,
             ScCallStep::new().from(USER1_ADDR),
-            |sc| sc.claim(),
+            |sc| sc.reset(),
         )
         .whitebox_query(&on_chain_claim_whitebox, |sc| {
             let address = AddressValue::from(USER1_ADDR).to_address();
@@ -725,7 +738,7 @@ fn on_chain_claim_whitebox() {
         .whitebox_call(
             &on_chain_claim_whitebox,
             ScCallStep::new().from(USER1_ADDR),
-            |sc| sc.claim(),
+            |sc| sc.reset(),
         )
         .whitebox_query(&on_chain_claim_whitebox, |sc| {
             let address = AddressValue::from(USER1_ADDR).to_address();