chore: fmt

PFC-developer · Apr 24, 2024 · a0d9e47 · a0d9e47
1 parent 3cec058
commit a0d9e47
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 32 deletions.
diff --git a/contracts/hub-tf/src/contract.rs b/contracts/hub-tf/src/contract.rs
@@ -1,8 +1,8 @@
 use std::convert::TryInto;
 
 use cosmwasm_std::{
-    entry_point, to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdError,
-    StdResult,
+    entry_point, to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response,
+    StdError, StdResult,
 };
 use cw2::{get_contract_version, set_contract_version, ContractVersion};
 use pfc_steak::{

diff --git a/contracts/hub-tf/src/math.rs b/contracts/hub-tf/src/math.rs
@@ -274,7 +274,8 @@ pub(crate) fn reconcile_batches(batches: &mut [Batch], native_to_deduct: Uint128
 
         if !remaining_underflow.is_zero() {
             // the remaining underflow will be applied by oldest batch first.
-            for  batch in batches.iter_mut() {//} .enumerate() {
+            for batch in batches.iter_mut() {
+                //} .enumerate() {
                 if !batch.amount_unclaimed.is_zero() && !remaining_underflow.is_zero() {
                     if batch.amount_unclaimed >= remaining_underflow {
                         batch.amount_unclaimed -= remaining_underflow;

diff --git a/contracts/hub-tf/src/testing/helpers.rs b/contracts/hub-tf/src/testing/helpers.rs
@@ -1,4 +1,9 @@
-use cosmwasm_std::{ testing::{mock_env, MockApi, MockStorage, MOCK_CONTRACT_ADDR}, Addr, BlockInfo, ContractInfo, Deps, Env, OwnedDeps, QuerierResult, SystemError, SystemResult, Timestamp, from_json};
+use cosmwasm_std::{
+    from_json,
+    testing::{mock_env, MockApi, MockStorage, MOCK_CONTRACT_ADDR},
+    Addr, BlockInfo, ContractInfo, Deps, Env, OwnedDeps, QuerierResult, SystemError, SystemResult,
+    Timestamp,
+};
 use pfc_steak::hub::QueryMsg;
 use serde::de::DeserializeOwned;
 

diff --git a/contracts/hub-tf/src/testing/tests.rs b/contracts/hub-tf/src/testing/tests.rs
@@ -1,6 +1,10 @@
 use std::str::FromStr;
 
-use cosmwasm_std::{testing::{mock_env, mock_info, MockApi, MockStorage, MOCK_CONTRACT_ADDR},  Addr, BankMsg, Coin, CosmosMsg, Decimal, DistributionMsg, Order, OwnedDeps, ReplyOn, StdError, SubMsg, Uint128, WasmMsg, to_json_binary};
+use cosmwasm_std::{
+    testing::{mock_env, mock_info, MockApi, MockStorage, MOCK_CONTRACT_ADDR},
+    to_json_binary, Addr, BankMsg, Coin, CosmosMsg, Decimal, DistributionMsg, Order, OwnedDeps,
+    ReplyOn, StdError, SubMsg, Uint128, WasmMsg,
+};
 use pfc_steak::{
     hub::{
         Batch, CallbackMsg, ConfigResponse, PendingBatch, QueryMsg, StateResponse, UnbondRequest,
@@ -1064,11 +1068,14 @@ fn withdrawing_unbonded() {
     );
 
     let err = previous_batches().load(deps.as_ref().storage, 2u64.into()).unwrap_err();
-    match err { StdError::NotFound {..} => {}, _=> {
-        panic!("Should have been not found")
-    } };
-
-
+    match err {
+        StdError::NotFound {
+            ..
+        } => {},
+        _ => {
+            panic!("Should have been not found")
+        },
+    };
 
     // User 1's unbond requests in batches 1 and 2 should have been deleted
     let err1 = unbond_requests()
@@ -1078,14 +1085,23 @@ fn withdrawing_unbonded() {
         .load(deps.as_ref().storage, (1u64.into(), &Addr::unchecked("user_1").as_str()))
         .unwrap_err();
 
-    match err1 { StdError::NotFound {..} => {}, _=> {
-        panic!("Should have been not found")
-    } };
-
-    match err2 { StdError::NotFound {..} => {}, _=> {
-        panic!("Should have been not found")
-    } };
+    match err1 {
+        StdError::NotFound {
+            ..
+        } => {},
+        _ => {
+            panic!("Should have been not found")
+        },
+    };
 
+    match err2 {
+        StdError::NotFound {
+            ..
+        } => {},
+        _ => {
+            panic!("Should have been not found")
+        },
+    };
 
     // User 3 attempt to withdraw; also specifying a receiver
     let res = execute(
@@ -1114,19 +1130,27 @@ fn withdrawing_unbonded() {
 
     // Batch 1 and user 2's unbonding request should have been purged from storage
     let err = previous_batches().load(deps.as_ref().storage, 1u64.into()).unwrap_err();
-    match err { StdError::NotFound {..} => {}, _=> {
-        panic!("Should have been not found")
-    } };
-
+    match err {
+        StdError::NotFound {
+            ..
+        } => {},
+        _ => {
+            panic!("Should have been not found")
+        },
+    };
 
     let err = unbond_requests()
         .load(deps.as_ref().storage, (1u64.into(), &Addr::unchecked("user_3").as_str()))
         .unwrap_err();
 
-    match err { StdError::NotFound {..} => {}, _=> {
-        panic!("Should have been not found")
-    } };
-
+    match err {
+        StdError::NotFound {
+            ..
+        } => {},
+        _ => {
+            panic!("Should have been not found")
+        },
+    };
 }
 
 #[test]

diff --git a/contracts/hub/src/contract.rs b/contracts/hub/src/contract.rs
@@ -1,8 +1,8 @@
 use std::convert::TryInto;
 
 use cosmwasm_std::{
-    entry_point, from_json, to_json_binary, Binary, Decimal, Deps, DepsMut, Env, MessageInfo, Reply,
-    Response, StdError, StdResult,
+    entry_point, from_json, to_json_binary, Binary, Decimal, Deps, DepsMut, Env, MessageInfo,
+    Reply, Response, StdError, StdResult,
 };
 use cw2::{get_contract_version, set_contract_version, ContractVersion};
 use cw20::Cw20ReceiveMsg;

diff --git a/contracts/hub/src/math.rs b/contracts/hub/src/math.rs
@@ -274,7 +274,8 @@ pub(crate) fn reconcile_batches(batches: &mut [Batch], native_to_deduct: Uint128
 
         if !remaining_underflow.is_zero() {
             // the remaining underflow will be applied by oldest batch first.
-            for  batch in batches.iter_mut(){//.enumerate() {
+            for batch in batches.iter_mut() {
+                //.enumerate() {
                 if !batch.amount_unclaimed.is_zero() && !remaining_underflow.is_zero() {
                     if batch.amount_unclaimed >= remaining_underflow {
                         batch.amount_unclaimed -= remaining_underflow;

diff --git a/contracts/hub/src/testing/tests.rs b/contracts/hub/src/testing/tests.rs
@@ -2,8 +2,8 @@ use std::str::FromStr;
 
 use cosmwasm_std::{
     testing::{mock_env, mock_info, MockApi, MockStorage, MOCK_CONTRACT_ADDR},
-    to_json_binary, Addr, BankMsg, Coin, CosmosMsg, Decimal, DistributionMsg, Event, Order, OwnedDeps,
-    Reply, ReplyOn, StdError, SubMsg, SubMsgResponse, Uint128, WasmMsg,
+    to_json_binary, Addr, BankMsg, Coin, CosmosMsg, Decimal, DistributionMsg, Event, Order,
+    OwnedDeps, Reply, ReplyOn, StdError, SubMsg, SubMsgResponse, Uint128, WasmMsg,
 };
 use cw20::{Cw20ExecuteMsg, MinterResponse};
 use cw20_base::msg::InstantiateMsg as Cw20InstantiateMsg;
@@ -1234,7 +1234,7 @@ fn withdrawing_unbonded() {
     assert_eq!(
         err,
         StdError::NotFound {
-            kind: "pfc_steak::hub::Batch".to_string()
+            kind: "pfc_steak::hub::Batch".to_string(),
         }
     );
 

diff --git a/contracts/hub/src/types/coins.rs b/contracts/hub/src/types/coins.rs
@@ -50,7 +50,6 @@ impl Coins {
             .iter()
             .find(|coin| coin.denom == denom)
             .cloned()
-
             .unwrap_or_else(|| Coin::new(0, denom))
     }
 }