small framework syntax updates

Author: psorinionut

dex/pair/src/pair_actions/remove_liq.rs

@@ -1,7 +1,7 @@
 use crate::{
     contexts::remove_liquidity::RemoveLiquidityContext, StorageCache, SwapTokensOrder,
     ERROR_BAD_PAYMENT_TOKENS, ERROR_INVALID_ARGS, ERROR_K_INVARIANT_FAILED,
-    ERROR_LP_TOKEN_NOT_ISSUED, ERROR_NOT_ACTIVE, ERROR_NOT_WHITELISTED, ERROR_SLIPPAGE_ON_REMOVE,
+    ERROR_LP_TOKEN_NOT_ISSUED, ERROR_NOT_ACTIVE, ERROR_NOT_WHITELISTED,
 };
 
 use super::common_result_types::RemoveLiquidityResultType;
@@ -86,15 +86,6 @@ pub trait RemoveLiquidityModule:
         let output_payments =
             self.build_remove_liq_output_payments(&storage_cache, &remove_liq_context);
 
-        require!(
-            output_payments.get(0).amount >= remove_liq_context.first_token_amount_min,
-            ERROR_SLIPPAGE_ON_REMOVE
-        );
-        require!(
-            output_payments.get(1).amount >= remove_liq_context.second_token_amount_min,
-            ERROR_SLIPPAGE_ON_REMOVE
-        );
-
         self.send_multiple_tokens_if_not_zero(&caller, &output_payments);
 
         self.emit_remove_liquidity_event(&storage_cache, remove_liq_context);

dex/pair/src/safe_price.rs

@@ -268,7 +268,10 @@ pub trait SafePriceModule:
         observation.lp_supply_accumulated += BigUint::from(weight) * lp_supply;
         observation.weight_accumulated += weight;
         observation.recording_round = current_round;
-        observation.recording_timestamp = self.blockchain().get_block_timestamp();
+        observation.recording_timestamp = self
+            .blockchain()
+            .get_block_timestamp_seconds()
+            .as_u64_seconds();
     }
 
     fn compute_new_observation(

farm-staking/farm-staking/src/lib.rs

@@ -97,10 +97,6 @@ pub trait FarmStaking:
         let current_epoch = self.blockchain().get_block_epoch();
         self.first_week_start_epoch().set_if_empty(current_epoch);
 
-        // Initialize last_reward_timestamp
-        let current_timestamp = self.blockchain().get_block_timestamp_seconds();
-        self.last_reward_timestamp().set_if_empty(current_timestamp);
-
         // Farm position migration code
         let farm_token_mapper = self.farm_token();
         self.try_set_farm_position_migration_nonce(farm_token_mapper);
@@ -128,7 +124,7 @@ pub trait FarmStaking:
         let per_block_reward = per_block_reward_amount_mapper.take();
 
         let block_nonce_diff = current_block_nonce - last_reward_nonce;
-        if per_block_reward > 0 {
+        if self.produces_per_second_rewards() {
             // CALCULATE PER BLOCK REWARDS
             let extra_rewards_unbounded = if current_block_nonce <= last_reward_nonce {
                 BigUint::zero()
@@ -138,8 +134,9 @@ pub trait FarmStaking:
 
             let farm_token_supply = self.farm_token_supply().get();
             let max_apr = self.max_annual_percentage_rewards().get();
-            let extra_rewards_apr_bounded_per_block =
-                farm_token_supply * &max_apr / MAX_PERCENT / (SECONDS_IN_YEAR.as_u64_seconds() / 6u64);
+            let extra_rewards_apr_bounded_per_block = farm_token_supply * &max_apr
+                / MAX_PERCENT
+                / (SECONDS_IN_YEAR.as_u64_seconds() / 6u64);
 
             let extra_rewards_apr_bounded = extra_rewards_apr_bounded_per_block * block_nonce_diff;