Update import formatting (#218)

* Move import statements to be coherent based on import level * group imports by default * update all other workspaces * add formatting config * formatting [skip ci] * remove toml formatter from push hook (too slow) * clippy * format * fmt merge
AbstractSDK · Jan 31, 2024 · d8038f7 · d8038f7
1 parent 0658ee8
commit d8038f7
Show file tree

Hide file tree

Showing 320 changed files with 2,129 additions and 1,986 deletions.
diff --git a/framework/contracts/account/manager/src/commands.rs b/framework/contracts/account/manager/src/commands.rs
@@ -1,41 +1,44 @@
-use crate::{contract::ManagerResult, error::ManagerError, queries::query_module_version};
-use crate::{validation, versioning};
-use abstract_core::manager::state::{
-    PENDING_GOVERNANCE, REMOVE_ADAPTER_AUTHORIZED_CONTEXT, SUB_ACCOUNTS,
-};
-
-use abstract_core::adapter::{
-    AdapterBaseMsg, AuthorizedAddressesResponse, BaseExecuteMsg, BaseQueryMsg,
-    ExecuteMsg as AdapterExecMsg, QueryMsg as AdapterQuery,
-};
-use abstract_core::manager::{InternalConfigAction, ModuleInstallConfig, UpdateSubAccountAction};
-use abstract_core::module_factory::FactoryModuleInstallConfig;
-use abstract_core::objects::gov_type::GovernanceDetails;
-use abstract_core::objects::module::{self, assert_module_data_validity};
-use abstract_core::objects::nested_admin::{query_top_level_owner, MAX_ADMIN_RECURSION};
-use abstract_core::objects::{AccountId, AssetEntry};
-
-use abstract_core::objects::version_control::VersionControlContract;
-use abstract_core::proxy::state::ACCOUNT_ID;
-use abstract_core::version_control::ModuleResponse;
-use abstract_macros::abstract_response;
-use abstract_sdk::cw_helpers::AbstractAttributes;
-
-use abstract_sdk::core::{
-    manager::state::DEPENDENTS,
-    manager::state::{
-        AccountInfo, SuspensionStatus, ACCOUNT_MODULES, CONFIG, INFO, SUSPENSION_STATUS,
+use abstract_core::{
+    adapter::{
+        AdapterBaseMsg, AuthorizedAddressesResponse, BaseExecuteMsg, BaseQueryMsg,
+        ExecuteMsg as AdapterExecMsg, QueryMsg as AdapterQuery,
+    },
+    manager::{
+        state::{PENDING_GOVERNANCE, REMOVE_ADAPTER_AUTHORIZED_CONTEXT, SUB_ACCOUNTS},
+        InternalConfigAction, ModuleInstallConfig, UpdateSubAccountAction,
     },
-    manager::{CallbackMsg, ExecuteMsg},
-    module_factory::ExecuteMsg as ModuleFactoryMsg,
+    module_factory::FactoryModuleInstallConfig,
     objects::{
-        dependency::Dependency,
-        module::{Module, ModuleInfo, ModuleVersion},
-        module_reference::ModuleReference,
-        validation::{validate_description, validate_link, validate_name},
+        gov_type::GovernanceDetails,
+        module::{self, assert_module_data_validity},
+        nested_admin::{query_top_level_owner, MAX_ADMIN_RECURSION},
+        version_control::VersionControlContract,
+        AccountId, AssetEntry,
     },
-    proxy::ExecuteMsg as ProxyMsg,
-    IBC_CLIENT, MANAGER, PROXY,
+    proxy::state::ACCOUNT_ID,
+    version_control::ModuleResponse,
+};
+use abstract_macros::abstract_response;
+use abstract_sdk::{
+    core::{
+        manager::{
+            state::{
+                AccountInfo, SuspensionStatus, ACCOUNT_MODULES, CONFIG, DEPENDENTS, INFO,
+                SUSPENSION_STATUS,
+            },
+            CallbackMsg, ExecuteMsg,
+        },
+        module_factory::ExecuteMsg as ModuleFactoryMsg,
+        objects::{
+            dependency::Dependency,
+            module::{Module, ModuleInfo, ModuleVersion},
+            module_reference::ModuleReference,
+            validation::{validate_description, validate_link, validate_name},
+        },
+        proxy::ExecuteMsg as ProxyMsg,
+        IBC_CLIENT, MANAGER, PROXY,
+    },
+    cw_helpers::AbstractAttributes,
 };
 use cosmwasm_std::{
     ensure, from_json, to_json_binary, wasm_execute, Addr, Attribute, Binary, Coin, CosmosMsg,
@@ -47,6 +50,11 @@ use cw_ownable::OwnershipError;
 use cw_storage_plus::Item;
 use semver::Version;
 
+use crate::{
+    contract::ManagerResult, error::ManagerError, queries::query_module_version, validation,
+    versioning,
+};
+
 pub const REGISTER_MODULES_DEPENDENCIES: u64 = 1;
 pub const HANDLE_ADAPTER_AUTHORIZED_REMOVE: u64 = 2;
 
@@ -1169,16 +1177,14 @@ pub(crate) fn adapter_authorized_remove(deps: DepsMut, result: SubMsgResult) ->
 #[cfg(test)]
 mod tests {
     use abstract_testing::prelude::*;
-    use cosmwasm_std::testing::{
-        mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage,
+    use cosmwasm_std::{
+        testing::{mock_dependencies, mock_env, mock_info, MockApi, MockQuerier, MockStorage},
+        Order, OwnedDeps, StdError, Storage,
     };
-    use cosmwasm_std::{Order, OwnedDeps, StdError, Storage};
-
-    use crate::contract;
     use speculoos::prelude::*;
 
     use super::*;
-    use crate::test_common::mock_init;
+    use crate::{contract, test_common::mock_init};
 
     type ManagerTestResult = Result<(), ManagerError>;
 
@@ -1331,9 +1337,10 @@ mod tests {
     }
 
     mod update_module_addresses {
-        use super::*;
         use abstract_core::manager::InternalConfigAction;
 
+        use super::*;
+
         #[test]
         fn manual_adds_module_to_account_modules() -> ManagerTestResult {
             let mut deps = mock_dependencies();
@@ -1477,10 +1484,10 @@ mod tests {
     }
 
     mod uninstall_module {
-        use super::*;
-
         use std::collections::HashSet;
 
+        use super::*;
+
         #[test]
         fn only_owner() -> ManagerTestResult {
             let msg = ExecuteMsg::UninstallModule {
@@ -1843,10 +1850,10 @@ mod tests {
     }
 
     mod handle_callback {
-        use super::*;
-
         use cosmwasm_std::StdError;
 
+        use super::*;
+
         #[test]
         fn only_by_contract() -> ManagerTestResult {
             let mut deps = mock_dependencies();
@@ -1950,9 +1957,9 @@ mod tests {
     }
 
     mod update_internal_config {
+        use abstract_core::manager::{InternalConfigAction::UpdateModuleAddresses, QueryMsg};
+
         use super::*;
-        use abstract_core::manager::InternalConfigAction::UpdateModuleAddresses;
-        use abstract_core::manager::QueryMsg;
 
         #[test]
         fn only_account_owner() -> ManagerTestResult {
@@ -2002,9 +2009,10 @@ mod tests {
     }
 
     mod add_module_upgrade_to_context {
-        use super::*;
         use cosmwasm_std::testing::mock_dependencies;
 
+        use super::*;
+
         #[test]
         fn should_allow_migrate_msg() -> ManagerTestResult {
             let mut deps = mock_dependencies();

diff --git a/framework/contracts/account/manager/src/contract.rs b/framework/contracts/account/manager/src/contract.rs
@@ -1,8 +1,3 @@
-use crate::{
-    commands::{self, *},
-    error::ManagerError,
-    queries, versioning,
-};
 use abstract_core::{
     manager::{
         state::{ACCOUNT_MODULES, PENDING_GOVERNANCE},
@@ -16,8 +11,10 @@ use abstract_sdk::core::{
         state::{AccountInfo, Config, CONFIG, INFO, SUSPENSION_STATUS},
         CallbackMsg, ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg,
     },
-    objects::module_version::assert_contract_upgrade,
-    objects::validation::{validate_description, validate_link, validate_name},
+    objects::{
+        module_version::assert_contract_upgrade,
+        validation::{validate_description, validate_link, validate_name},
+    },
     proxy::state::ACCOUNT_ID,
     MANAGER,
 };
@@ -28,6 +25,12 @@ use cosmwasm_std::{
 use cw2::set_contract_version;
 use semver::Version;
 
+use crate::{
+    commands::{self, *},
+    error::ManagerError,
+    queries, versioning,
+};
+
 pub type ManagerResult<R = Response> = Result<R, ManagerError>;
 
 pub const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -288,18 +291,18 @@ pub fn reply(deps: DepsMut, _env: Env, msg: Reply) -> ManagerResult {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::contract;
     use cosmwasm_std::testing::*;
     use speculoos::prelude::*;
 
-    use crate::test_common::mock_init;
+    use super::*;
+    use crate::{contract, test_common::mock_init};
 
     mod migrate {
-        use super::*;
         use abstract_core::AbstractError;
         use cw2::get_contract_version;
 
+        use super::*;
+
         #[test]
         fn disallow_same_version() -> ManagerResult<()> {
             let mut deps = mock_dependencies();

diff --git a/framework/contracts/account/manager/src/error.rs b/framework/contracts/account/manager/src/error.rs
@@ -1,7 +1,8 @@
-use abstract_core::objects::{validation::ValidationError, version_control::VersionControlError};
-use abstract_core::AbstractError;
-use abstract_sdk::core::objects::module::ModuleInfo;
-use abstract_sdk::AbstractSdkError;
+use abstract_core::{
+    objects::{validation::ValidationError, version_control::VersionControlError},
+    AbstractError,
+};
+use abstract_sdk::{core::objects::module::ModuleInfo, AbstractSdkError};
 use cosmwasm_std::{Instantiate2AddressError, StdError};
 use cw_controllers::AdminError;
 use thiserror::Error;

diff --git a/framework/contracts/account/manager/src/lib.rs b/framework/contracts/account/manager/src/lib.rs
@@ -7,14 +7,15 @@ mod versioning;
 
 #[cfg(test)]
 mod test_common {
-    use crate::contract::ManagerResult;
     use abstract_core::{
         manager,
         objects::{account::AccountTrace, gov_type::GovernanceDetails, AccountId},
     };
     use abstract_testing::prelude::*;
     use cosmwasm_std::{testing::*, DepsMut};
 
+    use crate::contract::ManagerResult;
+
     /// Initialize the manager with the test owner as the owner
     pub(crate) fn mock_init(mut deps: DepsMut) -> ManagerResult {
         let info = mock_info(TEST_ACCOUNT_FACTORY, &[]);

diff --git a/framework/contracts/account/manager/src/queries.rs b/framework/contracts/account/manager/src/queries.rs
@@ -1,18 +1,27 @@
-use abstract_core::manager::state::{Config, SUB_ACCOUNTS, SUSPENSION_STATUS};
-use abstract_core::manager::SubAccountIdsResponse;
-use abstract_core::objects::module::{self, ModuleInfo};
-use abstract_core::objects::nested_admin::{query_top_level_owner, TopLevelOwnerResponse};
-use abstract_core::AbstractError;
-use abstract_sdk::core::manager::state::{AccountInfo, ACCOUNT_ID, ACCOUNT_MODULES, CONFIG, INFO};
-use abstract_sdk::core::manager::{
-    ConfigResponse, InfoResponse, ManagerModuleInfo, ModuleAddressesResponse, ModuleInfosResponse,
-    ModuleVersionsResponse,
+use std::collections::BTreeMap;
+
+use abstract_core::{
+    manager::{
+        state::{Config, SUB_ACCOUNTS, SUSPENSION_STATUS},
+        SubAccountIdsResponse,
+    },
+    objects::{
+        module::{self, ModuleInfo},
+        nested_admin::{query_top_level_owner, TopLevelOwnerResponse},
+    },
+    AbstractError,
+};
+use abstract_sdk::{
+    core::manager::{
+        state::{AccountInfo, ACCOUNT_ID, ACCOUNT_MODULES, CONFIG, INFO},
+        ConfigResponse, InfoResponse, ManagerModuleInfo, ModuleAddressesResponse,
+        ModuleInfosResponse, ModuleVersionsResponse,
+    },
+    feature_objects::VersionControlContract,
 };
-use abstract_sdk::feature_objects::VersionControlContract;
 use cosmwasm_std::{to_json_binary, Addr, Binary, Deps, Env, Order, StdError, StdResult};
 use cw2::ContractVersion;
 use cw_storage_plus::Bound;
-use std::collections::BTreeMap;
 
 const DEFAULT_LIMIT: u8 = 5;
 const MAX_LIMIT: u8 = 10;

diff --git a/framework/contracts/account/manager/src/validation.rs b/framework/contracts/account/manager/src/validation.rs
@@ -1,6 +1,7 @@
-use crate::error::ManagerError;
 use abstract_sdk::core::PROXY;
 
+use crate::error::ManagerError;
+
 pub fn validate_not_proxy(module_id: &str) -> Result<(), ManagerError> {
     match module_id {
         PROXY => Err(ManagerError::CannotRemoveProxy {}),

diff --git a/framework/contracts/account/manager/src/versioning.rs b/framework/contracts/account/manager/src/versioning.rs
@@ -181,12 +181,12 @@ pub fn maybe_add_new_deps(
 
 #[cfg(test)]
 mod test {
-    use super::*;
-    use speculoos::prelude::*;
+    use std::collections::HashSet;
 
     use cosmwasm_std::testing::mock_dependencies;
+    use speculoos::prelude::*;
 
-    use std::collections::HashSet;
+    use super::*;
 
     mod set_as_dependent {
         use super::*;

diff --git a/framework/contracts/account/manager/tests/adapters.rs b/framework/contracts/account/manager/tests/adapters.rs
@@ -1,26 +1,29 @@
-use abstract_adapter::mock::{self, MockError};
-use abstract_adapter::mock::{MockExecMsg, MockInitMsg};
-use abstract_adapter::AdapterError;
-use abstract_core::adapter::{AdapterBaseMsg, AdapterRequestMsg, BaseExecuteMsg};
-use abstract_core::manager::{ManagerModuleInfo, ModuleInstallConfig};
-use abstract_core::objects::fee::FixedFee;
-use abstract_core::objects::module::{ModuleInfo, ModuleVersion, Monetization};
-use abstract_core::objects::AccountId;
-use abstract_core::{adapter::BaseQueryMsgFns, *};
-use abstract_integration_tests::mock_modules::adapter_1::{BootMockAdapter1V1, BootMockAdapter1V2};
+use abstract_adapter::{
+    mock::{self, MockError, MockExecMsg, MockInitMsg},
+    AdapterError,
+};
+use abstract_core::{
+    adapter::{AdapterBaseMsg, AdapterRequestMsg, BaseExecuteMsg, BaseQueryMsgFns},
+    manager::{ManagerModuleInfo, ModuleInstallConfig},
+    objects::{
+        fee::FixedFee,
+        module::{ModuleInfo, ModuleVersion, Monetization},
+        AccountId,
+    },
+    *,
+};
 use abstract_integration_tests::{
-    add_mock_adapter_install_fee, init_mock_adapter, install_adapter, install_adapter_with_funds,
+    add_mock_adapter_install_fee, create_default_account, init_mock_adapter, install_adapter,
+    install_adapter_with_funds, mock_modules,
+    mock_modules::adapter_1::{BootMockAdapter1V1, BootMockAdapter1V2},
+    AResult,
 };
-use abstract_integration_tests::{create_default_account, mock_modules, AResult};
 use abstract_interface::*;
 use abstract_testing::prelude::*;
-use cosmwasm_std::{coin, coins};
-use cosmwasm_std::{Addr, Coin, Empty};
-use cw_orch::deploy::Deploy;
-use cw_orch::prelude::*;
-use speculoos::{assert_that, result::ResultAssertions, string::StrAssertions};
-
+use cosmwasm_std::{coin, coins, Addr, Coin, Empty};
+use cw_orch::{deploy::Deploy, prelude::*};
 use mock_modules::{adapter_1, V1, V2};
+use speculoos::{assert_that, result::ResultAssertions, string::StrAssertions};
 
 #[test]
 fn installing_one_adapter_should_succeed() -> AResult {
@@ -628,12 +631,12 @@ fn subaccount_adapter_ownership() -> AResult {
 }
 
 mod old_mock {
-    use super::*;
-    use abstract_integration_tests::{create_default_account, mock_modules, AResult};
-
     use abstract_adapter::gen_adapter_old_mock;
+    use abstract_integration_tests::{create_default_account, mock_modules, AResult};
     use mock_modules::adapter_1::MOCK_ADAPTER_ID;
 
+    use super::*;
+
     gen_adapter_old_mock!(OldMockAdapter1V1, MOCK_ADAPTER_ID, "1.0.0", &[]);
 
     #[test]