cargo fmt

Near-One · Dec 12, 2024 · ba82ea7 · ba82ea7
1 parent f046b2d
commit ba82ea7
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 36 deletions.
diff --git a/near/omni-bridge/src/lib.rs b/near/omni-bridge/src/lib.rs
@@ -631,10 +631,11 @@ impl Contract {
             recipient,
             U128(fast_transfer.amount.0 - fast_transfer.fee.fee.0),
             fast_transfer.msg,
-        ).then(
+        )
+        .then(
             Self::ext(env::current_account_id())
                 .with_static_gas(FT_RESOLVE_TRANSFER_GAS)
-                .ft_resolve_transfer(fast_transfer.amount)
+                .ft_resolve_transfer(fast_transfer.amount),
         )
     }
 
@@ -1023,10 +1024,7 @@ impl Contract {
     }
 
     #[private]
-    pub fn ft_resolve_transfer(
-        &mut self,
-        amount: U128,
-    ) -> U128 {
+    pub fn ft_resolve_transfer(&mut self, amount: U128) -> U128 {
         match env::promise_result(0) {
             PromiseResult::Successful(_) => U128(0),
             PromiseResult::Failed => amount,

diff --git a/near/omni-bridge/src/storage.rs b/near/omni-bridge/src/storage.rs
@@ -172,17 +172,13 @@ impl Contract {
     }
 
     pub fn required_balance_for_fast_transfer(&self) -> NearToken {
-        let key_len = borsh::to_vec(&[0u8; 32])
-            .sdk_expect("ERR_BORSH")
-            .len() as u64;
+        let key_len = borsh::to_vec(&[0u8; 32]).sdk_expect("ERR_BORSH").len() as u64;
 
         let max_account_id: AccountId = "a".repeat(64).parse().sdk_expect("ERR_PARSE_ACCOUNT_ID");
-        let value_len = borsh::to_vec(&max_account_id)
-            .sdk_expect("ERR_BORSH")
-            .len() as u64;
+        let value_len = borsh::to_vec(&max_account_id).sdk_expect("ERR_BORSH").len() as u64;
 
-        let storage_cost =
-            env::storage_byte_cost().saturating_mul((Self::get_basic_storage() + key_len + value_len).into());
+        let storage_cost = env::storage_byte_cost()
+            .saturating_mul((Self::get_basic_storage() + key_len + value_len).into());
         let ft_transfers_cost = NearToken::from_yoctonear(1);
 
         storage_cost.saturating_add(ft_transfers_cost)

diff --git a/near/omni-bridge/src/tests/lib_test.rs b/near/omni-bridge/src/tests/lib_test.rs
@@ -134,7 +134,11 @@ fn test_init_transfer_nonce_increment() {
         DEFAULT_FT_CONTRACT_ACCOUNT.to_string(),
         U128(100),
         None,
-        BridgeOnTransferMsg::InitTransfer(get_init_transfer_msg(DEFAULT_ETH_USER_ADDRESS.to_string(), 0, 0)),
+        BridgeOnTransferMsg::InitTransfer(get_init_transfer_msg(
+            DEFAULT_ETH_USER_ADDRESS.to_string(),
+            0,
+            0,
+        )),
     );
 
     assert_eq!(contract.current_origin_nonce, DEFAULT_NONCE + 1);
@@ -194,7 +198,11 @@ fn test_init_transfer_promise_result() {
         DEFAULT_FT_CONTRACT_ACCOUNT.to_string(),
         U128(DEFAULT_TRANSFER_AMOUNT),
         None,
-        BridgeOnTransferMsg::InitTransfer(get_init_transfer_msg(DEFAULT_ETH_USER_ADDRESS.to_string(), 0, 0)),
+        BridgeOnTransferMsg::InitTransfer(get_init_transfer_msg(
+            DEFAULT_ETH_USER_ADDRESS.to_string(),
+            0,
+            0,
+        )),
     );
 
     let remaining = match promise {
@@ -236,7 +244,11 @@ fn test_init_transfer_balance_updated() {
         DEFAULT_FT_CONTRACT_ACCOUNT.to_string(),
         U128(DEFAULT_TRANSFER_AMOUNT),
         Some(total_balance),
-        BridgeOnTransferMsg::InitTransfer(get_init_transfer_msg(DEFAULT_ETH_USER_ADDRESS.to_string(), 0, 0)),
+        BridgeOnTransferMsg::InitTransfer(get_init_transfer_msg(
+            DEFAULT_ETH_USER_ADDRESS.to_string(),
+            0,
+            0,
+        )),
     );
 
     let storage_balance = contract

diff --git a/near/omni-tests/src/fast_transfer.rs b/near/omni-tests/src/fast_transfer.rs
@@ -320,20 +320,27 @@ mod tests {
         let transfer_msg = get_transfer_msg_to_near(&env, transfer_amount);
         let fast_transfer_msg = get_fast_transfer_msg(transfer_msg);
 
-        let relayer_balance_before = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_before = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_before =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_before =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
         let result = do_fast_transfer(&env, transfer_amount, fast_transfer_msg).await?;
 
         assert_eq!(0, result.failures().len());
 
         let recipient_balance: U128 = get_balance(&env.token_contract, &account_n(1)).await?;
-        let relayer_balance_after = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_after = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_after =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_after =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
         assert_eq!(transfer_amount, recipient_balance.0);
         assert_eq!(contract_balance_before, contract_balance_after);
-        assert_eq!(relayer_balance_before, U128(relayer_balance_after.0 + transfer_amount));
+        assert_eq!(
+            relayer_balance_before,
+            U128(relayer_balance_after.0 + transfer_amount)
+        );
 
         Ok(())
     }
@@ -348,8 +355,10 @@ mod tests {
 
         do_fast_transfer(&env, transfer_amount, fast_transfer_msg.clone()).await?;
 
-        let relayer_balance_before = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_before = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_before =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_before =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
         let result = do_fast_transfer(&env, transfer_amount, fast_transfer_msg).await?;
         assert_eq!(1, result.failures().len());
@@ -359,8 +368,10 @@ mod tests {
             format!("{:?}", err).contains("Fast transfer is already performed")
         }));
 
-        let relayer_balance_after = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_after = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_after =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_after =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
         assert_eq!(relayer_balance_before, relayer_balance_after);
         assert_eq!(contract_balance_before, contract_balance_after);
@@ -426,8 +437,10 @@ mod tests {
         let transfer_msg = get_transfer_msg_to_other_chain(&env, transfer_amount);
         let fast_transfer_msg = get_fast_transfer_msg(transfer_msg.clone());
 
-        let relayer_balance_before = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_before = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_before =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_before =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
         let result = do_fast_transfer(&env, transfer_amount, fast_transfer_msg.clone()).await?;
 
@@ -459,11 +472,19 @@ mod tests {
             transfer_message.sender
         );
 
-        let relayer_balance_after = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_after = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_after =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_after =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
-        assert_eq!(contract_balance_before, U128(contract_balance_after.0 - transfer_amount));
-        assert_eq!(relayer_balance_before, U128(relayer_balance_after.0 + transfer_amount));
+        assert_eq!(
+            contract_balance_before,
+            U128(contract_balance_after.0 - transfer_amount)
+        );
+        assert_eq!(
+            relayer_balance_before,
+            U128(relayer_balance_after.0 + transfer_amount)
+        );
 
         Ok(())
     }
@@ -478,8 +499,10 @@ mod tests {
 
         do_fast_transfer(&env, transfer_amount, fast_transfer_msg.clone()).await?;
 
-        let relayer_balance_before = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_before = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_before =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_before =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
         let result = do_fast_transfer(&env, transfer_amount, fast_transfer_msg).await?;
 
@@ -490,8 +513,10 @@ mod tests {
             format!("{:?}", err).contains("Fast transfer is already performed")
         }));
 
-        let relayer_balance_after = get_balance(&env.token_contract, env.relayer_account.id()).await?;
-        let contract_balance_after = get_balance(&env.token_contract, env.bridge_contract.id()).await?;
+        let relayer_balance_after =
+            get_balance(&env.token_contract, env.relayer_account.id()).await?;
+        let contract_balance_after =
+            get_balance(&env.token_contract, env.bridge_contract.id()).await?;
 
         assert_eq!(relayer_balance_before, relayer_balance_after);
         assert_eq!(contract_balance_before, contract_balance_after);