Use idiomatic math operations (#591)

filecoin-project · Sep 1, 2022 · bacf044 · bacf044
1 parent b7ad2c5
commit bacf044
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/actors/miner/tests/prove_commit.rs b/actors/miner/tests/prove_commit.rs
@@ -421,7 +421,7 @@ fn invalid_proof_rejected() {
     //require.NoError(t, err)
     //assert.Equal(t, []uint64{uint64(sectorNo)}, newSectors)
     // Verify pledge lock-up
-    assert!(st.initial_pledge > TokenAmount::zero());
+    assert!(st.initial_pledge.is_positive());
     rt.reset();
 
     // Duplicate proof (sector no-longer pre-committed)

diff --git a/actors/miner/tests/util.rs b/actors/miner/tests/util.rs
@@ -503,7 +503,7 @@ impl ActorHarness {
 
         let state = self.get_state(rt);
         // burn networkFee
-        if state.fee_debt > TokenAmount::zero() || params.sectors.len() > 1 {
+        if state.fee_debt.is_positive() || params.sectors.len() > 1 {
             let expected_network_fee =
                 aggregate_pre_commit_network_fee(params.sectors.len() as i64, base_fee);
             let expected_burn = expected_network_fee + state.fee_debt;
@@ -589,7 +589,7 @@ impl ActorHarness {
         // in the original test the else branch does some redundant checks which we can omit.
 
         let state = self.get_state(rt);
-        if state.fee_debt > TokenAmount::zero() {
+        if state.fee_debt.is_positive() {
             rt.expect_send(
                 *BURNT_FUNDS_ACTOR_ADDR,
                 METHOD_SEND,
@@ -939,7 +939,7 @@ impl ActorHarness {
                 }
             }
 
-            if expected_pledge != TokenAmount::zero() {
+            if !expected_pledge.is_zero() {
                 rt.expect_send(
                     *STORAGE_POWER_ACTOR_ADDR,
                     PowerMethod::UpdatePledgeTotal as u64,
@@ -1029,7 +1029,7 @@ impl ActorHarness {
         penalty_total += cfg.repaid_fee_debt.clone();
         penalty_total += cfg.expired_precommit_penalty.clone();
 
-        if penalty_total != TokenAmount::zero() {
+        if !penalty_total.is_zero() {
             rt.expect_send(
                 *BURNT_FUNDS_ACTOR_ADDR,
                 METHOD_SEND,
@@ -1053,7 +1053,7 @@ impl ActorHarness {
         pledge_delta += cfg.expired_sectors_pledge_delta;
         pledge_delta -= immediately_vesting_funds(rt, &state);
 
-        if pledge_delta != TokenAmount::zero() {
+        if !pledge_delta.is_zero() {
             rt.expect_send(
                 *STORAGE_POWER_ACTOR_ADDR,
                 PowerMethod::UpdatePledgeTotal as u64,
@@ -1407,7 +1407,7 @@ impl ActorHarness {
             ExitCode::OK,
         );
 
-        if penalty > TokenAmount::zero() {
+        if penalty.is_positive() {
             rt.expect_send(
                 *BURNT_FUNDS_ACTOR_ADDR,
                 METHOD_SEND,
@@ -1587,7 +1587,7 @@ impl ActorHarness {
         rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, self.worker);
         rt.expect_validate_caller_addr(self.caller_addrs());
 
-        if expected_debt_repaid > TokenAmount::zero() {
+        if expected_debt_repaid.is_positive() {
             rt.expect_send(
                 *BURNT_FUNDS_ACTOR_ADDR,
                 METHOD_SEND,
@@ -1924,7 +1924,7 @@ impl ActorHarness {
         }
 
         let total_repaid = expected_repaid_from_vest + expected_repaid_from_balance;
-        if total_repaid > TokenAmount::zero() {
+        if total_repaid.is_positive() {
             rt.expect_send(
                 *BURNT_FUNDS_ACTOR_ADDR,
                 METHOD_SEND,

diff --git a/actors/reward/src/lib.rs b/actors/reward/src/lib.rs
@@ -121,7 +121,7 @@ impl Actor {
 
         let total_reward = rt.transaction(|st: &mut State, rt| {
             let mut block_reward: TokenAmount =
-                (&st.this_epoch_reward * params.win_count).div_rem(EXPECTED_LEADERS_PER_EPOCH).0;
+                (&st.this_epoch_reward * params.win_count).div_floor(EXPECTED_LEADERS_PER_EPOCH);
             let mut total_reward = &params.gas_reward + &block_reward;
             let curr_balance = rt.current_balance();
             if total_reward > curr_balance {

diff --git a/actors/reward/src/state.rs b/actors/reward/src/state.rs
@@ -174,7 +174,7 @@ impl Reward {
                 if elapsed >= vest_duration {
                     self.value.clone()
                 } else {
-                    (self.value.clone() * elapsed as u64).div_rem(vest_duration).0
+                    (self.value.clone() * elapsed as u64).div_floor(vest_duration)
                 }
             }
         }