post-review fmt

neutron-org · Apr 13, 2023 · d3b0160 · d3b0160
1 parent 2d08e28
commit d3b0160
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 36 deletions.
diff --git a/contracts/dao/cwd-core/src/contract.rs b/contracts/dao/cwd-core/src/contract.rs
@@ -330,9 +330,7 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
         QueryMsg::ListSubDaos { start_after, limit } => {
             query_list_sub_daos(deps, start_after, limit)
         }
-        QueryMsg::GetSubDao { address } => {
-            query_sub_dao(deps, address)
-        }
+        QueryMsg::GetSubDao { address } => query_sub_dao(deps, address),
         QueryMsg::DaoURI {} => query_dao_uri(deps),
     }
 }
@@ -517,18 +515,15 @@ pub fn query_list_sub_daos(
     to_binary(&subdaos)
 }
 
-pub fn query_sub_dao(
-    deps: Deps,
-    address: String,
-) -> StdResult<Binary> {
+pub fn query_sub_dao(deps: Deps, address: String) -> StdResult<Binary> {
     let addr = deps.api.addr_validate(&address)?;
     let item = SUBDAO_LIST.may_load(deps.storage, &addr)?;
     match item {
         None => Err(StdError::generic_err("SubDao not found")),
         Some(charter) => to_binary(&SubDao {
             addr: address,
             charter,
-        })
+        }),
     }
 }
 

diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/src/contract.rs b/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/src/contract.rs
@@ -226,7 +226,7 @@ fn is_subdao_legit(deps: &DepsMut, subdao_core: &Addr) -> Result<bool, PrePropos
 
     match subdao {
         Ok(subdao) => Ok(subdao.addr == *subdao_core),
-        Err(_) => Err(PreProposeOverruleError::ForbiddenSubdao {})
+        Err(_) => Err(PreProposeOverruleError::ForbiddenSubdao {}),
     }
 }
 

diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/src/testing/mock_querier.rs b/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/src/testing/mock_querier.rs
@@ -100,15 +100,12 @@ impl ContractQuerier for MockDaoQueries {
     fn query(&self, msg: &Binary) -> QuerierResult {
         let q: MainDaoQueryMsg = from_binary(msg).unwrap();
         match q {
-            MainDaoQueryMsg::GetSubDao {
-                address,
-            } =>
-            match self.sub_dao_set.contains(&address) {
+            MainDaoQueryMsg::GetSubDao { address } => match self.sub_dao_set.contains(&address) {
                 true => SystemResult::Ok(ContractResult::from(to_binary(&SubDao {
                     addr: address.clone(),
                     charter: None,
                 }))),
-                false => SystemResult::Err(SystemError::Unknown {})
+                false => SystemResult::Err(SystemError::Unknown {}),
             },
             _ => SystemResult::Err(SystemError::Unknown {}),
         }
@@ -247,9 +244,7 @@ pub fn get_properly_initialized_dao() -> HashMap<String, Box<dyn ContractQuerier
     contracts.insert(
         MOCK_DAO_CORE.to_string(),
         Box::new(MockDaoQueries {
-            sub_dao_set: HashSet::from([
-                MOCK_SUBDAO_CORE.to_string()
-            ]),
+            sub_dao_set: HashSet::from([MOCK_SUBDAO_CORE.to_string()]),
         }),
     );
     contracts.insert(
@@ -306,4 +301,3 @@ pub fn get_dao_with_impostor_subdao() -> HashMap<String, Box<dyn ContractQuerier
     );
     contracts
 }
-
diff --git a/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/src/testing/tests.rs b/contracts/dao/pre-propose/cwd-pre-propose-single-overrule/src/testing/tests.rs
@@ -15,10 +15,9 @@ use neutron_dao_pre_propose_overrule::msg::{
 
 use crate::error::PreProposeOverruleError;
 use crate::testing::mock_querier::{
-    get_dao_with_impostor_subdao, get_dao_with_impostor_timelock,
-    get_properly_initialized_dao, ContractQuerier, MOCK_DAO_PROPOSE_MODULE,
-    MOCK_IMPOSTOR_TIMELOCK_CONTRACT, MOCK_SUBDAO_CORE, NON_TIMELOCKED_PROPOSAL_ID, PROPOSALS_COUNT,
-    SUBDAO_NAME, TIMELOCKED_PROPOSAL_ID,
+    get_dao_with_impostor_subdao, get_dao_with_impostor_timelock, get_properly_initialized_dao,
+    ContractQuerier, MOCK_DAO_PROPOSE_MODULE, MOCK_IMPOSTOR_TIMELOCK_CONTRACT, MOCK_SUBDAO_CORE,
+    NON_TIMELOCKED_PROPOSAL_ID, PROPOSALS_COUNT, SUBDAO_NAME, TIMELOCKED_PROPOSAL_ID,
 };
 use cwd_pre_propose_base::state::Config;
 use cwd_proposal_single::msg::ExecuteMsg as ProposeMessageInternal;

diff --git a/contracts/dao/proposal/cwd-proposal-single/src/testing/tests.rs b/contracts/dao/proposal/cwd-proposal-single/src/testing/tests.rs
@@ -1,9 +1,16 @@
-use cosmwasm_std::{coins, testing::{mock_dependencies, mock_env}, to_binary, Addr, Attribute, BankMsg, ContractInfoResponse, CosmosMsg, Decimal, Empty, Reply, StdError, SubMsgResult, Uint128, WasmMsg, WasmQuery, StdResult};
+use cosmwasm_std::{
+    coins,
+    testing::{mock_dependencies, mock_env},
+    to_binary, Addr, Attribute, BankMsg, ContractInfoResponse, CosmosMsg, Decimal, Empty, Reply,
+    StdError, StdResult, SubMsgResult, Uint128, WasmMsg, WasmQuery,
+};
 use cosmwasm_std::{Api, Storage};
 use cw2::ContractVersion;
 use cw20::Cw20Coin;
 use cw_multi_test::{custom_app, BasicApp, Executor, Router};
 use cw_utils::Duration;
+use cwd_core::msg::{ExecuteMsg as DaoExecuteMsg, QueryMsg as DaoQueryMsg};
+use cwd_core::query::SubDao;
 use cwd_hooks::{HookError, HooksResponse};
 use cwd_interface::voting::InfoResponse;
 use cwd_voting::{
@@ -18,11 +25,6 @@ use cwd_voting::{
     voting::{Vote, Votes},
 };
 use neutron_bindings::bindings::msg::NeutronMsg;
-use cwd_core::msg::{
-    QueryMsg as DaoQueryMsg,
-    ExecuteMsg as DaoExecuteMsg,
-};
-use cwd_core::query::SubDao;
 
 use crate::testing::execute::{execute_proposal, execute_proposal_should_fail};
 use crate::{
@@ -1365,11 +1367,23 @@ fn test_subdao_queries() {
     let core_addr = instantiate_with_native_bonded_balances_governance(&mut app, instantiate, None);
 
     let subdao_addr = Addr::unchecked("subdao");
-    let res: StdResult<SubDao> = app.wrap()
-        .query_wasm_smart(core_addr.clone(), &DaoQueryMsg::GetSubDao { address: subdao_addr.to_string() });
+    let res: StdResult<SubDao> = app.wrap().query_wasm_smart(
+        core_addr.clone(),
+        &DaoQueryMsg::GetSubDao {
+            address: subdao_addr.to_string(),
+        },
+    );
     assert!(res.is_err());
-    let res: Vec<SubDao> = app.wrap()
-        .query_wasm_smart(core_addr.clone(), &DaoQueryMsg::ListSubDaos { start_after: None, limit: None }).unwrap();
+    let res: Vec<SubDao> = app
+        .wrap()
+        .query_wasm_smart(
+            core_addr.clone(),
+            &DaoQueryMsg::ListSubDaos {
+                start_after: None,
+                limit: None,
+            },
+        )
+        .unwrap();
     assert_eq!(res.len(), 0);
 
     let res = app.execute_contract(
@@ -1385,11 +1399,23 @@ fn test_subdao_queries() {
         &[],
     );
     assert!(res.is_ok());
-    let res: StdResult<SubDao> = app.wrap()
-        .query_wasm_smart(core_addr.clone(), &DaoQueryMsg::GetSubDao { address: subdao_addr.to_string() });
+    let res: StdResult<SubDao> = app.wrap().query_wasm_smart(
+        core_addr.clone(),
+        &DaoQueryMsg::GetSubDao {
+            address: subdao_addr.to_string(),
+        },
+    );
     assert!(res.is_ok());
-    let res: Vec<SubDao> = app.wrap()
-        .query_wasm_smart(core_addr.clone(), &DaoQueryMsg::ListSubDaos { start_after: None, limit: None }).unwrap();
+    let res: Vec<SubDao> = app
+        .wrap()
+        .query_wasm_smart(
+            core_addr.clone(),
+            &DaoQueryMsg::ListSubDaos {
+                start_after: None,
+                limit: None,
+            },
+        )
+        .unwrap();
     assert_eq!(res.len(), 1);
 }