chore: cargo fmt

Finschia · Feb 9, 2024 · f3231de · f3231de
1 parent 7defcca
commit f3231de
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 76 deletions.
diff --git a/contracts/call-number/src/contract.rs b/contracts/call-number/src/contract.rs
@@ -54,8 +54,7 @@ pub fn execute(
 
 fn handle_add(deps: Deps, by: i32) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -77,8 +76,7 @@ fn handle_add(deps: Deps, by: i32) -> Result<Response, ContractError> {
 
 fn handle_sub(deps: Deps, by: i32) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -100,8 +98,7 @@ fn handle_sub(deps: Deps, by: i32) -> Result<Response, ContractError> {
 
 fn handle_mul(deps: Deps, by: i32) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -123,8 +120,7 @@ fn handle_mul(deps: Deps, by: i32) -> Result<Response, ContractError> {
 
 fn handle_submsg_reply_add(deps: Deps, by: i32) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -138,8 +134,7 @@ fn handle_submsg_reply_add(deps: Deps, by: i32) -> Result<Response, ContractErro
 
 fn handle_submsg_reply_sub(deps: Deps, by: i32) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -153,8 +148,7 @@ fn handle_submsg_reply_sub(deps: Deps, by: i32) -> Result<Response, ContractErro
 
 fn handle_submsg_reply_mul(deps: Deps, by: i32) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -168,8 +162,7 @@ fn handle_submsg_reply_mul(deps: Deps, by: i32) -> Result<Response, ContractErro
 
 fn handle_log_query(deps: Deps) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -184,8 +177,7 @@ fn handle_log_query(deps: Deps) -> Result<Response, ContractError> {
 
 fn handle_log_query_dyn(deps: Deps) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -200,8 +192,7 @@ fn handle_log_query_dyn(deps: Deps) -> Result<Response, ContractError> {
 #[entry_point]
 pub fn reply(deps: DepsMut, _env: Env, _msg: Reply) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -232,8 +223,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, ContractErr
 
 fn query_number_dyn(deps: Deps) -> Result<NumberResponse, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -247,8 +237,7 @@ fn query_number_dyn(deps: Deps) -> Result<NumberResponse, ContractError> {
 // https://github.com/Finschia/cosmwasm/blob/03abb0871ca5cfe8b874561795bc59d12562002f/packages/vm/src/dynamic_link.rs#L333-L336
 fn query_add(deps: Deps, by: i32) -> Result<NumberResponse, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -263,8 +252,7 @@ fn query_add(deps: Deps, by: i32) -> Result<NumberResponse, ContractError> {
 // https://github.com/Finschia/cosmwasm/blob/03abb0871ca5cfe8b874561795bc59d12562002f/packages/vm/src/dynamic_link.rs#L333-L336
 fn query_sub(deps: Deps, by: i32) -> Result<NumberResponse, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -279,8 +267,7 @@ fn query_sub(deps: Deps, by: i32) -> Result<NumberResponse, ContractError> {
 // https://github.com/Finschia/cosmwasm/blob/03abb0871ca5cfe8b874561795bc59d12562002f/packages/vm/src/dynamic_link.rs#L333-L336
 fn query_mul(deps: Deps, by: i32) -> Result<NumberResponse, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;
@@ -292,8 +279,7 @@ fn query_mul(deps: Deps, by: i32) -> Result<NumberResponse, ContractError> {
 
 fn query_number(deps: Deps) -> Result<NumberResponse, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )?;

diff --git a/contracts/dynamic-callee-contract/tests/integration.rs b/contracts/dynamic-callee-contract/tests/integration.rs
@@ -61,7 +61,7 @@ fn make_callee_instance() -> Instance<MockApi, MockStorage, MockQuerier> {
     let querier = MockQuerier::new(&[]);
     let env = to_json_vec(&mock_env()).unwrap();
     let contract = Contract::from_code(CONTRACT_CALLEE, &env, &options, None).unwrap();
-    
+
     contract.generate_instance(api, querier, &options).unwrap()
 }
 
@@ -105,12 +105,8 @@ fn callable_point_pong_works() {
     let required_exports = required_exports();
     let export_index = 0;
     assert_eq!("pong".to_string(), required_exports[export_index].0);
-    let call_result = call_function(
-        &mut instance,
-        "pong",
-        &[env_region_ptr, param_region_ptr],
-    )
-    .unwrap();
+    let call_result =
+        call_function(&mut instance, "pong", &[env_region_ptr, param_region_ptr]).unwrap();
     assert_eq!(call_result.len(), 1);
 
     let serialized_return =
@@ -212,11 +208,7 @@ fn callable_point_pong_with_tuple_takes_2_args_works() {
     let call_result = call_function(
         &mut instance,
         "pong_with_tuple_takes_2_args",
-        &[
-            env_region_ptr,
-            param_region_ptr1,
-            param_region_ptr2,
-        ],
+        &[env_region_ptr, param_region_ptr1, param_region_ptr2],
     )
     .unwrap();
     assert_eq!(call_result.len(), 1);

diff --git a/contracts/dynamic-caller-contract/src/contract.rs b/contracts/dynamic-caller-contract/src/contract.rs
@@ -141,8 +141,7 @@ pub fn execute(
 
 pub fn try_ping(deps: DepsMut, ping_num: Uint128) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(b"dynamic_callee_contract")
             .ok_or_else(|| ContractError::Storage("cannot get callee address".to_string()))?,
     )?;
@@ -191,8 +190,7 @@ pub fn try_re_entrancy(deps: DepsMut, _env: Env) -> Result<Response, ContractErr
     // It will be tried to call the should_never_be_called function below.
     // But, should be blocked by VM host side normally because it's a reentrancy case.
     let address = from_json(
-        deps
-            .storage
+        deps.storage
             .get(b"dynamic_callee_contract")
             .ok_or_else(|| ContractError::Storage("cannot get callee address".to_string()))?,
     )?;
@@ -203,8 +201,7 @@ pub fn try_re_entrancy(deps: DepsMut, _env: Env) -> Result<Response, ContractErr
 
 pub fn try_do_panic(deps: DepsMut, _env: Env) -> Result<Response, ContractError> {
     let address = from_json(
-        deps
-            .storage
+        deps.storage
             .get(b"dynamic_callee_contract")
             .ok_or_else(|| ContractError::Storage("cannot get callee address".to_string()))?,
     )?;
@@ -215,8 +212,7 @@ pub fn try_do_panic(deps: DepsMut, _env: Env) -> Result<Response, ContractError>
 
 pub fn try_validate_interface(deps: Deps, _env: Env) -> Result<Response, ContractError> {
     let address = from_json(
-        deps
-            .storage
+        deps.storage
             .get(b"dynamic_callee_contract")
             .ok_or_else(|| ContractError::Storage("cannot get callee address".to_string()))?,
     )?;
@@ -228,8 +224,7 @@ pub fn try_validate_interface(deps: Deps, _env: Env) -> Result<Response, Contrac
 // should error
 pub fn try_validate_interface_err(deps: Deps, _env: Env) -> Result<Response, ContractError> {
     let address = from_json(
-        deps
-            .storage
+        deps.storage
             .get(b"dynamic_callee_contract")
             .ok_or_else(|| ContractError::Storage("cannot get callee address".to_string()))?,
     )?;
@@ -251,8 +246,7 @@ pub fn try_call_caller_address_of(
     target: Addr,
 ) -> Result<Response, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(b"dynamic_callee_contract")
             .ok_or_else(|| ContractError::Storage("cannot get callee address".to_string()))?,
     )?;
@@ -283,8 +277,7 @@ fn get_own_address_via_callees_get_caller_address(
     _env: Env,
 ) -> Result<Binary, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(b"dynamic_callee_contract")
             .ok_or_else(|| ContractError::Storage("cannot get callee address".to_string()))?,
     )?;

diff --git a/contracts/intermediate-number/src/contract.rs b/contracts/intermediate-number/src/contract.rs
@@ -146,8 +146,7 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> Result<Binary, ContractErr
 
 fn query_number(deps: Deps) -> Result<NumberResponse, ContractError> {
     let address: Addr = from_json(
-        deps
-            .storage
+        deps.storage
             .get(ADDRESS_KEY)
             .ok_or(ContractError::StorageError)?,
     )

diff --git a/contracts/number/tests/integration.rs b/contracts/number/tests/integration.rs
@@ -28,7 +28,6 @@ fn make_number_instance() -> Instance<MockApi, MockStorage, MockQuerier> {
     let env = to_json_vec(&mock_env()).unwrap();
     let querier = MockQuerier::new(&[]);
     let contract = Contract::from_code(CONTRACT, &env, &options, None).unwrap();
-
 
     contract.generate_instance(api, querier, &options).unwrap()
 }
@@ -76,12 +75,8 @@ fn callable_point_add_works() {
 
     // Before solving #213, it issues an error.
     // This is because `add` panics without number in deps.storage.
-    let call_result = call_function(
-        &mut instance,
-        "add",
-        &[env_region_ptr, param_region_ptr],
-    )
-    .unwrap_err();
+    let call_result =
+        call_function(&mut instance, "add", &[env_region_ptr, param_region_ptr]).unwrap_err();
     assert!(call_result
         .to_string()
         .contains("RuntimeError: unreachable"))
@@ -104,12 +99,8 @@ fn callable_point_sub_works() {
 
     // Before solving #213, it issues an error.
     // This is because `sub` panics without number in deps.storage.
-    let call_result = call_function(
-        &mut instance,
-        "sub",
-        &[env_region_ptr, param_region_ptr],
-    )
-    .unwrap_err();
+    let call_result =
+        call_function(&mut instance, "sub", &[env_region_ptr, param_region_ptr]).unwrap_err();
     assert!(call_result
         .to_string()
         .contains("RuntimeError: unreachable"))
@@ -132,12 +123,8 @@ fn callable_point_mul_works() {
 
     // Before solving #213, it issues an error.
     // This is because `mul` panics without number in deps.storage.
-    let call_result = call_function(
-        &mut instance,
-        "mul",
-        &[env_region_ptr, param_region_ptr],
-    )
-    .unwrap_err();
+    let call_result =
+        call_function(&mut instance, "mul", &[env_region_ptr, param_region_ptr]).unwrap_err();
     assert!(call_result
         .to_string()
         .contains("RuntimeError: unreachable"))

diff --git a/contracts/simple-callee/tests/integration.rs b/contracts/simple-callee/tests/integration.rs
@@ -28,7 +28,6 @@ fn make_instance() -> Instance<MockApi, MockStorage, MockQuerier> {
     let api = MockApi::default();
     let querier = MockQuerier::new(&[]);
     let contract = Contract::from_code(CONTRACT, &env, &options, None).unwrap();
-
 
     contract.generate_instance(api, querier, &options).unwrap()
 }