cargo formatting

sei-protocol · Apr 8, 2024 · 9bec22b · 9bec22b
1 parent 353701d
commit 9bec22b
Show file tree

Hide file tree

Showing 7 changed files with 149 additions and 141 deletions.
diff --git a/contracts/sei-tester/src/contract.rs b/contracts/sei-tester/src/contract.rs
@@ -13,14 +13,14 @@ use crate::{
 };
 use ethaddr::Address;
 use protobuf::Message;
-use sei_cosmwasm::{BulkOrderPlacementsResponse, Cancellation, DenomAuthorityMetadataResponse,
-                   DenomUnit, DenomsFromCreatorResponse, DepositInfo, DexTwapsResponse,
-                   EpochResponse, ExchangeRatesResponse, GetLatestPriceResponse,
-                   GetOrderByIdResponse, GetOrdersResponse, Metadata, MsgPlaceOrdersResponse,
-                   OracleTwapsResponse, Order, OrderSimulationResponse, OrderType,
-                   PositionDirection, SeiMsg, SeiQuerier, SeiQueryWrapper, SettlementEntry,
-                   SudoMsg, EvmAddressResponse, SeiAddressResponse};
-
+use sei_cosmwasm::{
+    BulkOrderPlacementsResponse, Cancellation, DenomAuthorityMetadataResponse, DenomUnit,
+    DenomsFromCreatorResponse, DepositInfo, DexTwapsResponse, EpochResponse, EvmAddressResponse,
+    ExchangeRatesResponse, GetLatestPriceResponse, GetOrderByIdResponse, GetOrdersResponse,
+    Metadata, MsgPlaceOrdersResponse, OracleTwapsResponse, Order, OrderSimulationResponse,
+    OrderType, PositionDirection, SeiAddressResponse, SeiMsg, SeiQuerier, SeiQueryWrapper,
+    SettlementEntry, SudoMsg,
+};
 
 const PLACE_ORDER_REPLY_ID: u64 = 1;
 // version info for migration info
@@ -438,10 +438,12 @@ pub fn query(deps: Deps<SeiQueryWrapper>, _env: Env, msg: QueryMsg) -> StdResult
         QueryMsg::GetDenomsFromCreator { creator } => {
             to_json_binary(&query_denoms_from_creator(deps, creator)?)
         }
-        QueryMsg::GetEvmAddressBySeiAddress { sei_address } =>
-            to_json_binary(&query_evm_address(deps, sei_address)?),
-        QueryMsg::GetSeiAddressByEvmAddress { evm_address } =>
-            to_json_binary(&query_sei_address(deps, evm_address)?),
+        QueryMsg::GetEvmAddressBySeiAddress { sei_address } => {
+            to_json_binary(&query_evm_address(deps, sei_address)?)
+        }
+        QueryMsg::GetSeiAddressByEvmAddress { evm_address } => {
+            to_json_binary(&query_sei_address(deps, evm_address)?)
+        }
     }
 }
 
@@ -580,4 +582,3 @@ pub fn query_sei_address(
 
     Ok(res)
 }
-
diff --git a/contracts/sei-tester/tests/sei_tester_integration_tests.rs b/contracts/sei-tester/tests/sei_tester_integration_tests.rs
@@ -1,17 +1,21 @@
-use cosmwasm_std::{Addr, Api, BalanceResponse, coin, Coin, CosmosMsg, Decimal, Empty, from_json,
-                   GovMsg, IbcMsg, IbcQuery, QueryRequest, StdError, Storage,
-                   testing::{MockApi, MockStorage}, Uint128};
+use cosmwasm_std::{
+    coin, from_json,
+    testing::{MockApi, MockStorage},
+    Addr, Api, BalanceResponse, Coin, CosmosMsg, Decimal, Empty, GovMsg, IbcMsg, IbcQuery,
+    QueryRequest, StdError, Storage, Uint128,
+};
 use cosmwasm_std::{BlockInfo, Uint64};
 use cw_multi_test::{
     App, BankKeeper, ContractWrapper, DistributionKeeper, Executor, FailingModule, Router,
     StakeKeeper, WasmKeeper,
 };
 
-use sei_cosmwasm::{Cancellation, DenomOracleExchangeRatePair, DexPair, DexTwap, DexTwapsResponse,
-                   EpochResponse, EvmAddressResponse, ExchangeRatesResponse, GetOrderByIdResponse,
-                   GetOrdersResponse, OracleExchangeRate, OracleTwapsResponse, Order,
-                   OrderSimulationResponse, OrderStatus, OrderType, PositionDirection,
-                   SeiAddressResponse, SeiMsg, SeiQuery, SeiQueryWrapper, SeiRoute};
+use sei_cosmwasm::{
+    Cancellation, DenomOracleExchangeRatePair, DexPair, DexTwap, DexTwapsResponse, EpochResponse,
+    EvmAddressResponse, ExchangeRatesResponse, GetOrderByIdResponse, GetOrdersResponse,
+    OracleExchangeRate, OracleTwapsResponse, Order, OrderSimulationResponse, OrderStatus,
+    OrderType, PositionDirection, SeiAddressResponse, SeiMsg, SeiQuery, SeiQueryWrapper, SeiRoute,
+};
 use sei_integration_tests::{
     helper::{get_balance, mock_app},
     module::{SeiModule, EVM_ADDRESS, SEI_ADDRESS},
@@ -151,7 +155,7 @@ fn test_tokenfactory_integration_foundation() {
             },
         })],
     )
-        .unwrap();
+    .unwrap();
 
     let res: BalanceResponse = get_balance(&app, ADMIN.to_string(), out.to_string());
     assert_eq!(res.amount.amount, Uint128::new(1));
@@ -184,7 +188,7 @@ fn test_tokenfactory_integration_foundation() {
             },
         })],
     )
-        .unwrap();
+    .unwrap();
 
     let res: BalanceResponse = get_balance(&app, ADMIN.to_string(), out.to_string());
     assert_eq!(res.amount.amount, Uint128::new(0));
@@ -570,7 +574,7 @@ fn test_dex_module_query_order_simulation() {
             contract_address: Addr::unchecked(&sei_tester_addr.to_string()),
         })],
     )
-        .unwrap();
+    .unwrap();
 
     // Test all of sim order can be fulfilled
     let res: OrderSimulationResponse = app
@@ -850,7 +854,7 @@ fn test_dex_module_query_dex_twap() {
             contract_address: Addr::unchecked(&sei_tester_addr.to_string()),
         })],
     )
-        .unwrap();
+    .unwrap();
 
     app.set_block(BlockInfo {
         height: 2,
@@ -894,7 +898,7 @@ fn test_dex_module_query_dex_twap() {
             contract_address: Addr::unchecked(&sei_tester_addr.to_string()),
         })],
     )
-        .unwrap();
+    .unwrap();
 
     app.set_block(BlockInfo {
         height: 3,
@@ -938,9 +942,12 @@ fn test_evm_address_query() {
     // Test associated EVM address
     let res: EvmAddressResponse = app
         .wrap()
-        .query_wasm_smart(sei_tester_addr.clone(), &QueryMsg::GetEvmAddressBySeiAddress {
-            sei_address: SEI_ADDRESS.to_string(),
-        })
+        .query_wasm_smart(
+            sei_tester_addr.clone(),
+            &QueryMsg::GetEvmAddressBySeiAddress {
+                sei_address: SEI_ADDRESS.to_string(),
+            },
+        )
         .unwrap();
 
     let expected_res = EvmAddressResponse {
@@ -952,9 +959,12 @@ fn test_evm_address_query() {
     // Test non-associated EVM address
     let res: EvmAddressResponse = app
         .wrap()
-        .query_wasm_smart(sei_tester_addr.clone(), &QueryMsg::GetEvmAddressBySeiAddress {
-            sei_address: "fake_address".to_string(),
-        })
+        .query_wasm_smart(
+            sei_tester_addr.clone(),
+            &QueryMsg::GetEvmAddressBySeiAddress {
+                sei_address: "fake_address".to_string(),
+            },
+        )
         .unwrap();
 
     let expected_res = EvmAddressResponse {
@@ -972,9 +982,12 @@ fn test_sei_address_query() {
     // // Test associated SEI address
     let res: SeiAddressResponse = app
         .wrap()
-        .query_wasm_smart(sei_tester_addr.clone(), &QueryMsg::GetSeiAddressByEvmAddress {
-            evm_address: "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B".to_string(),
-        })
+        .query_wasm_smart(
+            sei_tester_addr.clone(),
+            &QueryMsg::GetSeiAddressByEvmAddress {
+                evm_address: "0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B".to_string(),
+            },
+        )
         .unwrap();
 
     let expected_res = SeiAddressResponse {
@@ -983,13 +996,15 @@ fn test_sei_address_query() {
     };
     assert_eq!(res, expected_res);
 
-
     // Test non-associated SEI address
     let res: SeiAddressResponse = app
         .wrap()
-        .query_wasm_smart(sei_tester_addr.clone(), &QueryMsg::GetSeiAddressByEvmAddress {
-            evm_address: "0x999999cf1046e68e36E1aA2E0E07105eDDD1f08E".to_string(),
-        })
+        .query_wasm_smart(
+            sei_tester_addr.clone(),
+            &QueryMsg::GetSeiAddressByEvmAddress {
+                evm_address: "0x999999cf1046e68e36E1aA2E0E07105eDDD1f08E".to_string(),
+            },
+        )
         .unwrap();
 
     let expected_res = SeiAddressResponse {
@@ -999,16 +1014,19 @@ fn test_sei_address_query() {
     assert_eq!(res, expected_res);
 
     // Test error case when EVM address is invalid
-    let res: Result<SeiAddressResponse, StdError> = app
-        .wrap()
-        .query_wasm_smart(sei_tester_addr.clone(), &QueryMsg::GetSeiAddressByEvmAddress {
+    let res: Result<SeiAddressResponse, StdError> = app.wrap().query_wasm_smart(
+        sei_tester_addr.clone(),
+        &QueryMsg::GetSeiAddressByEvmAddress {
             evm_address: "fakeaddress".to_string(),
-        });
+        },
+    );
 
     assert!(res.is_err());
 
     let err = res.expect_err("Expected an error because the EVM address is invalid");
-    assert_eq!(err.to_string(),
-               "Generic error: Querier contract error: Generic error: Failed to parse Ethereum \
-               address");
-}
+    assert_eq!(
+        err.to_string(),
+        "Generic error: Querier contract error: Generic error: Failed to parse Ethereum \
+               address"
+    );
+}
diff --git a/packages/sei-cosmwasm/src/lib.rs b/packages/sei-cosmwasm/src/lib.rs
@@ -13,9 +13,9 @@ pub use proto_structs::{
 pub use querier::SeiQuerier;
 pub use query::{
     DenomAuthorityMetadataResponse, DenomsFromCreatorResponse, DexTwapsResponse, EpochResponse,
-    ExchangeRatesResponse, GetLatestPriceResponse, GetOrderByIdResponse, GetOrdersResponse,
-    OracleTwapsResponse, OrderSimulationResponse, PriceResponse, SeiQuery, SeiQueryWrapper,
-    EvmAddressResponse, SeiAddressResponse
+    EvmAddressResponse, ExchangeRatesResponse, GetLatestPriceResponse, GetOrderByIdResponse,
+    GetOrdersResponse, OracleTwapsResponse, OrderSimulationResponse, PriceResponse,
+    SeiAddressResponse, SeiQuery, SeiQueryWrapper,
 };
 pub use route::SeiRoute;
 pub use sei_types::{