diff --git a/contracts/account-nft/src/lib.rs b/contracts/account-nft/src/lib.rs index 0c2c364c4..6eb3ab7cb 100644 --- a/contracts/account-nft/src/lib.rs +++ b/contracts/account-nft/src/lib.rs @@ -4,3 +4,5 @@ pub mod execute; pub mod migrations; pub mod query; pub mod state; +#[cfg(test)] +mod tests; diff --git a/contracts/account-nft/tests/test_burn_allowance.rs b/contracts/account-nft/src/tests/burn_allowance.rs similarity index 97% rename from contracts/account-nft/tests/test_burn_allowance.rs rename to contracts/account-nft/src/tests/burn_allowance.rs index 37a955a81..71e5290fc 100644 --- a/contracts/account-nft/tests/test_burn_allowance.rs +++ b/contracts/account-nft/src/tests/burn_allowance.rs @@ -3,15 +3,13 @@ use std::ops::Add; use cosmwasm_std::{Addr, Empty, StdResult, Uint128}; use cw721::NftInfoResponse; use cw721_base::{ContractError::Ownership, OwnershipError::NotOwner}; -use mars_account_nft::error::{ +use mars_types::{account_nft::QueryMsg::NftInfo, health::AccountKind}; + +use super::helpers::{below_max_for_burn, generate_health_response, MockEnv, MAX_VALUE_FOR_BURN}; +use crate::error::{ ContractError, ContractError::{BaseError, BurnNotAllowed, HealthContractNotSet}, }; -use mars_types::{account_nft::QueryMsg::NftInfo, health::AccountKind}; - -use crate::helpers::{below_max_for_burn, generate_health_response, MockEnv, MAX_VALUE_FOR_BURN}; - -pub mod helpers; #[test] fn only_token_owner_can_burn() { diff --git a/contracts/account-nft/tests/test_burn_empty_accounts.rs b/contracts/account-nft/src/tests/burn_empty_accounts.rs similarity index 96% rename from contracts/account-nft/tests/test_burn_empty_accounts.rs rename to contracts/account-nft/src/tests/burn_empty_accounts.rs index c9ce06c87..75272bc39 100644 --- a/contracts/account-nft/tests/test_burn_empty_accounts.rs +++ b/contracts/account-nft/src/tests/burn_empty_accounts.rs @@ -1,13 +1,11 @@ use cosmwasm_std::{Addr, StdError}; -use mars_account_nft::error::{ContractError, ContractError::HealthContractNotSet}; use mars_types::{ account_nft::QueryMsg::{AllTokens, NumTokens, Tokens}, health::AccountKind, }; -use crate::helpers::{generate_health_response, MockEnv}; - -pub mod helpers; +use super::helpers::{generate_health_response, MockEnv}; +use crate::error::{ContractError, ContractError::HealthContractNotSet}; #[test] fn burning_empty_accounts_not_allowed_if_no_health_contract_set() { diff --git a/contracts/account-nft/tests/helpers/health_responses.rs b/contracts/account-nft/src/tests/helpers/health_responses.rs similarity index 100% rename from contracts/account-nft/tests/helpers/health_responses.rs rename to contracts/account-nft/src/tests/helpers/health_responses.rs diff --git a/contracts/account-nft/tests/helpers/mock_contracts.rs b/contracts/account-nft/src/tests/helpers/mock_contracts.rs similarity index 85% rename from contracts/account-nft/tests/helpers/mock_contracts.rs rename to contracts/account-nft/src/tests/helpers/mock_contracts.rs index 119bf6b47..1f5793658 100644 --- a/contracts/account-nft/tests/helpers/mock_contracts.rs +++ b/contracts/account-nft/src/tests/helpers/mock_contracts.rs @@ -3,9 +3,9 @@ use cw_multi_test::{Contract, ContractWrapper}; pub fn mock_nft_contract() -> Box> { let contract = ContractWrapper::new( - mars_account_nft::contract::execute, - mars_account_nft::contract::instantiate, - mars_account_nft::contract::query, + crate::contract::execute, + crate::contract::instantiate, + crate::contract::query, ); Box::new(contract) } diff --git a/contracts/account-nft/tests/helpers/mock_env.rs b/contracts/account-nft/src/tests/helpers/mock_env.rs similarity index 99% rename from contracts/account-nft/tests/helpers/mock_env.rs rename to contracts/account-nft/src/tests/helpers/mock_env.rs index 07a596ad9..57554eb44 100644 --- a/contracts/account-nft/tests/helpers/mock_env.rs +++ b/contracts/account-nft/src/tests/helpers/mock_env.rs @@ -17,7 +17,7 @@ use mars_types::{ health::{AccountKind, HealthValuesResponse}, }; -use crate::helpers::MockEnvBuilder; +use super::MockEnvBuilder; pub struct MockEnv { pub app: BasicApp, diff --git a/contracts/account-nft/tests/helpers/mock_env_builder.rs b/contracts/account-nft/src/tests/helpers/mock_env_builder.rs similarity index 97% rename from contracts/account-nft/tests/helpers/mock_env_builder.rs rename to contracts/account-nft/src/tests/helpers/mock_env_builder.rs index d77feca29..86aa7752e 100644 --- a/contracts/account-nft/tests/helpers/mock_env_builder.rs +++ b/contracts/account-nft/src/tests/helpers/mock_env_builder.rs @@ -7,8 +7,10 @@ use mars_mock_credit_manager::msg::InstantiateMsg as CmMockInstantiateMsg; use mars_owner::OwnerResponse; use mars_types::{account_nft::InstantiateMsg, credit_manager::ConfigResponse}; -use super::mock_credit_manager_contract; -use crate::helpers::{mock_health_contract, mock_nft_contract, MockEnv, MAX_VALUE_FOR_BURN}; +use super::{ + mock_credit_manager_contract, mock_health_contract, mock_nft_contract, MockEnv, + MAX_VALUE_FOR_BURN, +}; pub struct MockEnvBuilder { pub app: BasicApp, diff --git a/contracts/account-nft/tests/helpers/mod.rs b/contracts/account-nft/src/tests/helpers/mod.rs similarity index 100% rename from contracts/account-nft/tests/helpers/mod.rs rename to contracts/account-nft/src/tests/helpers/mod.rs index 8ed2d450b..c773cf091 100644 --- a/contracts/account-nft/tests/helpers/mod.rs +++ b/contracts/account-nft/src/tests/helpers/mod.rs @@ -1,6 +1,6 @@ -pub use self::{health_responses::*, mock_contracts::*, mock_env::*, mock_env_builder::*}; - mod health_responses; mod mock_contracts; mod mock_env; mod mock_env_builder; + +pub use self::{health_responses::*, mock_contracts::*, mock_env::*, mock_env_builder::*}; diff --git a/contracts/account-nft/tests/test_instantiate.rs b/contracts/account-nft/src/tests/instantiate.rs similarity index 93% rename from contracts/account-nft/tests/test_instantiate.rs rename to contracts/account-nft/src/tests/instantiate.rs index b9fb88008..49b0e47a7 100644 --- a/contracts/account-nft/tests/test_instantiate.rs +++ b/contracts/account-nft/src/tests/instantiate.rs @@ -1,6 +1,4 @@ -use crate::helpers::{MockEnv, MAX_VALUE_FOR_BURN}; - -pub mod helpers; +use super::helpers::{MockEnv, MAX_VALUE_FOR_BURN}; #[test] fn instantiated_storage_vars() { diff --git a/contracts/account-nft/tests/test_migration.rs b/contracts/account-nft/src/tests/migration.rs similarity index 97% rename from contracts/account-nft/tests/test_migration.rs rename to contracts/account-nft/src/tests/migration.rs index 722e24171..2afd889ac 100644 --- a/contracts/account-nft/tests/test_migration.rs +++ b/contracts/account-nft/src/tests/migration.rs @@ -8,12 +8,9 @@ use cw721_base::{Cw721Contract, Ownership, QueryMsg}; use cw721_base_v16::{ msg::InstantiateMsg as Cw721v16InstantiateMsg, Cw721Contract as Cw721ContractV16, }; -use mars_account_nft::{ - contract::migrate, error::ContractError, migrations::v2_0_0::v1_state, state::CONFIG, -}; use mars_types::account_nft::NftConfig; -pub mod helpers; +use crate::{contract::migrate, error::ContractError, migrations::v2_0_0::v1_state, state::CONFIG}; #[test] fn invalid_contract_name() { diff --git a/contracts/account-nft/tests/test_mint.rs b/contracts/account-nft/src/tests/mint.rs similarity index 95% rename from contracts/account-nft/tests/test_mint.rs rename to contracts/account-nft/src/tests/mint.rs index dec5b8140..1343c1407 100644 --- a/contracts/account-nft/tests/test_mint.rs +++ b/contracts/account-nft/src/tests/mint.rs @@ -2,15 +2,13 @@ use cosmwasm_std::Addr; use cw721::OwnerOfResponse; use cw721_base::{ContractError::Ownership, OwnershipError::NotOwner}; use cw_multi_test::Executor; -use mars_account_nft::error::{ContractError, ContractError::BaseError}; use mars_types::{ account_nft::{ExecuteMsg, QueryMsg::OwnerOf}, health::AccountKind, }; -use crate::helpers::{below_max_for_burn, MockEnv}; - -pub mod helpers; +use super::helpers::{below_max_for_burn, MockEnv}; +use crate::error::{ContractError, ContractError::BaseError}; #[test] fn id_incrementer() { diff --git a/contracts/account-nft/src/tests/mod.rs b/contracts/account-nft/src/tests/mod.rs new file mode 100644 index 000000000..db34e3a09 --- /dev/null +++ b/contracts/account-nft/src/tests/mod.rs @@ -0,0 +1,8 @@ +mod burn_allowance; +mod burn_empty_accounts; +mod helpers; +mod instantiate; +mod migration; +mod mint; +mod proposed_minter; +mod update_config; diff --git a/contracts/account-nft/tests/test_proposed_minter.rs b/contracts/account-nft/src/tests/proposed_minter.rs similarity index 97% rename from contracts/account-nft/tests/test_proposed_minter.rs rename to contracts/account-nft/src/tests/proposed_minter.rs index 1b0fa0035..a0e1c7d27 100644 --- a/contracts/account-nft/tests/test_proposed_minter.rs +++ b/contracts/account-nft/src/tests/proposed_minter.rs @@ -2,9 +2,7 @@ use cosmwasm_std::Addr; use cw721_base::MinterResponse; use mars_types::account_nft::QueryMsg; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; #[test] fn only_minter_can_propose_new_minter() { diff --git a/contracts/account-nft/tests/test_update_config.rs b/contracts/account-nft/src/tests/update_config.rs similarity index 96% rename from contracts/account-nft/tests/test_update_config.rs rename to contracts/account-nft/src/tests/update_config.rs index acafc81b1..0566318aa 100644 --- a/contracts/account-nft/tests/test_update_config.rs +++ b/contracts/account-nft/src/tests/update_config.rs @@ -1,9 +1,7 @@ use cosmwasm_std::{Addr, Uint128}; use mars_types::account_nft::NftConfigUpdates; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; #[test] fn only_minter_can_update_config() { diff --git a/contracts/address-provider/src/lib.rs b/contracts/address-provider/src/lib.rs index a6b13fbad..5b4196b68 100644 --- a/contracts/address-provider/src/lib.rs +++ b/contracts/address-provider/src/lib.rs @@ -4,3 +4,5 @@ mod helpers; mod key; pub mod migrations; pub mod state; +#[cfg(test)] +mod tests; diff --git a/contracts/address-provider/tests/tests/test_addresses.rs b/contracts/address-provider/src/tests/addresses.rs similarity index 97% rename from contracts/address-provider/tests/tests/test_addresses.rs rename to contracts/address-provider/src/tests/addresses.rs index 76a8185da..604707a5c 100644 --- a/contracts/address-provider/tests/tests/test_addresses.rs +++ b/contracts/address-provider/src/tests/addresses.rs @@ -1,9 +1,9 @@ use cosmwasm_std::testing::{mock_env, mock_info}; -use mars_address_provider::{contract::execute, error::ContractError, state::ADDRESSES}; use mars_owner::OwnerError; use mars_types::address_provider::{AddressResponseItem, ExecuteMsg, MarsAddressType, QueryMsg}; use super::helpers::{th_query, th_setup}; +use crate::{contract::execute, error::ContractError, state::ADDRESSES}; #[test] fn setting_address_if_unauthorized() { diff --git a/contracts/address-provider/tests/tests/helpers/mod.rs b/contracts/address-provider/src/tests/helpers.rs similarity index 90% rename from contracts/address-provider/tests/tests/helpers/mod.rs rename to contracts/address-provider/src/tests/helpers.rs index ec33e033e..4cad6b83b 100644 --- a/contracts/address-provider/tests/tests/helpers/mod.rs +++ b/contracts/address-provider/src/tests/helpers.rs @@ -1,5 +1,3 @@ -#![allow(dead_code)] - use cosmwasm_std::{ from_binary, testing::{ @@ -7,9 +5,10 @@ use cosmwasm_std::{ }, Deps, OwnedDeps, }; -use mars_address_provider::contract::{instantiate, query}; use mars_types::address_provider::{InstantiateMsg, QueryMsg}; +use crate::contract::{instantiate, query}; + pub fn th_setup() -> OwnedDeps { let mut deps = mock_dependencies_with_balance(&[]); diff --git a/contracts/address-provider/tests/tests/test_instantiate.rs b/contracts/address-provider/src/tests/instantiate.rs similarity index 93% rename from contracts/address-provider/tests/tests/test_instantiate.rs rename to contracts/address-provider/src/tests/instantiate.rs index b04326ea3..54174b348 100644 --- a/contracts/address-provider/tests/tests/test_instantiate.rs +++ b/contracts/address-provider/src/tests/instantiate.rs @@ -1,8 +1,8 @@ use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info}; -use mars_address_provider::{contract::instantiate, error::ContractError}; use mars_types::address_provider::{ConfigResponse, InstantiateMsg, QueryMsg}; use super::helpers::th_query; +use crate::{contract::instantiate, error::ContractError}; #[test] fn invalid_chain_prefix() { diff --git a/contracts/address-provider/tests/tests/test_migration_v2.rs b/contracts/address-provider/src/tests/migration_v2.rs similarity index 98% rename from contracts/address-provider/tests/tests/test_migration_v2.rs rename to contracts/address-provider/src/tests/migration_v2.rs index 178326b9f..39b763e6e 100644 --- a/contracts/address-provider/tests/tests/test_migration_v2.rs +++ b/contracts/address-provider/src/tests/migration_v2.rs @@ -1,12 +1,13 @@ use cosmwasm_std::{attr, testing::mock_env, Addr, Empty, Event}; use cw2::{ContractVersion, VersionError}; -use mars_address_provider::{ +use mars_testing::mock_dependencies; + +use crate::{ contract::migrate, error::ContractError, migrations::v2_0_0::v1_state::{self, OwnerSetNoneProposed}, state::OWNER, }; -use mars_testing::mock_dependencies; #[test] fn wrong_contract_name() { diff --git a/contracts/address-provider/src/tests/mod.rs b/contracts/address-provider/src/tests/mod.rs new file mode 100644 index 000000000..0b9f8cf62 --- /dev/null +++ b/contracts/address-provider/src/tests/mod.rs @@ -0,0 +1,5 @@ +mod addresses; +mod helpers; +mod instantiate; +mod migration_v2; +mod update_owner; diff --git a/contracts/address-provider/tests/tests/test_update_owner.rs b/contracts/address-provider/src/tests/update_owner.rs similarity index 96% rename from contracts/address-provider/tests/tests/test_update_owner.rs rename to contracts/address-provider/src/tests/update_owner.rs index 2f1de8909..56998a2d0 100644 --- a/contracts/address-provider/tests/tests/test_update_owner.rs +++ b/contracts/address-provider/src/tests/update_owner.rs @@ -1,9 +1,9 @@ use cosmwasm_std::testing::{mock_env, mock_info}; -use mars_address_provider::{contract::execute, error::ContractError}; use mars_owner::{OwnerError::NotOwner, OwnerUpdate}; use mars_types::address_provider::{ConfigResponse, ExecuteMsg, QueryMsg}; use super::helpers::{th_query, th_setup}; +use crate::{contract::execute, error::ContractError}; #[test] fn initialized_state() { diff --git a/contracts/address-provider/tests/all_tests.rs b/contracts/address-provider/tests/all_tests.rs deleted file mode 100644 index 14f00389d..000000000 --- a/contracts/address-provider/tests/all_tests.rs +++ /dev/null @@ -1 +0,0 @@ -mod tests; diff --git a/contracts/address-provider/tests/tests/mod.rs b/contracts/address-provider/tests/tests/mod.rs deleted file mode 100644 index b9582efb8..000000000 --- a/contracts/address-provider/tests/tests/mod.rs +++ /dev/null @@ -1,6 +0,0 @@ -mod helpers; - -mod test_addresses; -mod test_instantiate; -mod test_migration_v2; -mod test_update_owner; diff --git a/contracts/credit-manager/tests/files/Rover - Dynamic LB & CF test cases v1.1.xlsx b/contracts/credit-manager/files/Rover - Dynamic LB & CF test cases v1.1.xlsx similarity index 100% rename from contracts/credit-manager/tests/files/Rover - Dynamic LB & CF test cases v1.1.xlsx rename to contracts/credit-manager/files/Rover - Dynamic LB & CF test cases v1.1.xlsx diff --git a/contracts/credit-manager/src/lib.rs b/contracts/credit-manager/src/lib.rs index fe6be5fed..754f29c23 100644 --- a/contracts/credit-manager/src/lib.rs +++ b/contracts/credit-manager/src/lib.rs @@ -18,6 +18,8 @@ pub mod refund; pub mod repay; pub mod state; pub mod swap; +#[cfg(test)] +mod tests; pub mod update_coin_balances; pub mod update_config; pub mod utils; diff --git a/contracts/credit-manager/tests/test_borrow.rs b/contracts/credit-manager/src/tests/borrow.rs similarity index 98% rename from contracts/credit-manager/tests/test_borrow.rs rename to contracts/credit-manager/src/tests/borrow.rs index 0d454eae7..cf84da3dc 100644 --- a/contracts/credit-manager/tests/test_borrow.rs +++ b/contracts/credit-manager/src/tests/borrow.rs @@ -1,14 +1,12 @@ use std::ops::{Mul, Sub}; use cosmwasm_std::{coin, coins, Addr, Uint128}; -use mars_credit_manager::{borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED, error::ContractError}; use mars_types::credit_manager::Action::{Borrow, Deposit}; -use crate::helpers::{ +use super::helpers::{ assert_err, blacklisted_coin, uosmo_info, AccountToFund, MockEnv, DEFAULT_RED_BANK_COIN_BALANCE, }; - -pub mod helpers; +use crate::{borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED, error::ContractError}; #[test] fn only_token_owner_can_borrow() { diff --git a/contracts/credit-manager/tests/test_claim_rewards.rs b/contracts/credit-manager/src/tests/claim_rewards.rs similarity index 98% rename from contracts/credit-manager/tests/test_claim_rewards.rs rename to contracts/credit-manager/src/tests/claim_rewards.rs index 3f9577df8..6de13232a 100644 --- a/contracts/credit-manager/tests/test_claim_rewards.rs +++ b/contracts/credit-manager/src/tests/claim_rewards.rs @@ -1,15 +1,13 @@ use cosmwasm_std::{Addr, Uint128}; -use mars_credit_manager::error::ContractError; use mars_types::{ credit_manager::Action::{Borrow, ClaimRewards, Deposit}, params::{AssetParamsUpdate::AddOrUpdate, HlsAssetType}, }; -use crate::helpers::{ +use super::helpers::{ assert_err, get_coin, lp_token_info, uatom_info, ujake_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn claiming_rewards_when_having_none() { diff --git a/contracts/credit-manager/tests/test_coin_balances.rs b/contracts/credit-manager/src/tests/coin_balances.rs similarity index 97% rename from contracts/credit-manager/tests/test_coin_balances.rs rename to contracts/credit-manager/src/tests/coin_balances.rs index 0c05e7b6e..411f6e348 100644 --- a/contracts/credit-manager/tests/test_coin_balances.rs +++ b/contracts/credit-manager/src/tests/coin_balances.rs @@ -1,11 +1,9 @@ use cosmwasm_std::{coin, coins, Addr, Uint128}; use cw_multi_test::{BankSudo, SudoMsg}; -use mars_credit_manager::error::ContractError; use mars_types::credit_manager::{Action::Deposit, CallbackMsg, ChangeExpected}; -use crate::helpers::{assert_err, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, uosmo_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test] fn only_rover_can_call_update_coin_balances() { diff --git a/contracts/credit-manager/tests/test_create_credit_account.rs b/contracts/credit-manager/src/tests/create_credit_account.rs similarity index 96% rename from contracts/credit-manager/tests/test_create_credit_account.rs rename to contracts/credit-manager/src/tests/create_credit_account.rs index 3fa33ba73..a28d65070 100644 --- a/contracts/credit-manager/tests/test_create_credit_account.rs +++ b/contracts/credit-manager/src/tests/create_credit_account.rs @@ -2,9 +2,7 @@ use cosmwasm_std::{Addr, Empty}; use cw721::OwnerOfResponse; use cw721_base::QueryMsg as NftQueryMsg; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; #[test] fn create_credit_account_fails_without_nft_contract_set() { diff --git a/contracts/credit-manager/tests/test_deposit.rs b/contracts/credit-manager/src/tests/deposit.rs similarity index 98% rename from contracts/credit-manager/tests/test_deposit.rs rename to contracts/credit-manager/src/tests/deposit.rs index 1d41774ca..44a16b296 100644 --- a/contracts/credit-manager/tests/test_deposit.rs +++ b/contracts/credit-manager/src/tests/deposit.rs @@ -1,15 +1,13 @@ use cosmwasm_std::{coin, coins, Addr, Coin, Coins, Uint128}; -use mars_credit_manager::error::ContractError::{ - ExtraFundsReceived, FundsMismatch, NotTokenOwner, NotWhitelisted, -}; use mars_types::credit_manager::{Action, Positions}; -use crate::helpers::{ +use super::helpers::{ assert_err, blacklisted_coin, uatom_info, ujake_info, uosmo_info, AccountToFund, CoinInfo, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError::{ + ExtraFundsReceived, FundsMismatch, NotTokenOwner, NotWhitelisted, +}; #[test] fn only_owner_of_token_can_deposit() { diff --git a/contracts/credit-manager/tests/test_deposit_cap.rs b/contracts/credit-manager/src/tests/deposit_cap.rs similarity index 95% rename from contracts/credit-manager/tests/test_deposit_cap.rs rename to contracts/credit-manager/src/tests/deposit_cap.rs index dd2c815fe..969980aa9 100644 --- a/contracts/credit-manager/tests/test_deposit_cap.rs +++ b/contracts/credit-manager/src/tests/deposit_cap.rs @@ -1,17 +1,14 @@ -// must be public module so that clippy doesn't complain "dead code" -pub mod helpers; - use std::collections::HashMap; use cosmwasm_std::{Addr, Coin, Coins, Decimal, StdResult, Uint128}; -use mars_credit_manager::error::ContractError; use mars_types::{ credit_manager::{Action, ActionAmount, ActionCoin}, params::{AssetParams, AssetParamsUpdate}, }; use test_case::test_case; -use crate::helpers::{uatom_info, uosmo_info, AccountToFund, MockEnv}; +use super::helpers::{uatom_info, uosmo_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test_case( [].into(), diff --git a/contracts/credit-manager/tests/test_dispatch.rs b/contracts/credit-manager/src/tests/dispatch.rs similarity index 90% rename from contracts/credit-manager/tests/test_dispatch.rs rename to contracts/credit-manager/src/tests/dispatch.rs index 26a8730e7..8bb0247c3 100644 --- a/contracts/credit-manager/tests/test_dispatch.rs +++ b/contracts/credit-manager/src/tests/dispatch.rs @@ -1,11 +1,8 @@ use cosmwasm_std::{coin, Addr}; -use helpers::assert_err; -use mars_credit_manager::error::{ContractError, ContractError::NotTokenOwner}; use mars_types::credit_manager::CallbackMsg; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::{assert_err, MockEnv}; +use crate::error::{ContractError, ContractError::NotTokenOwner}; #[test] fn dispatch_only_allowed_for_token_owner() { diff --git a/contracts/credit-manager/tests/test_enumerate_accounts.rs b/contracts/credit-manager/src/tests/enumerate_accounts.rs similarity index 97% rename from contracts/credit-manager/tests/test_enumerate_accounts.rs rename to contracts/credit-manager/src/tests/enumerate_accounts.rs index bac6fc157..e255c9e42 100644 --- a/contracts/credit-manager/tests/test_enumerate_accounts.rs +++ b/contracts/credit-manager/src/tests/enumerate_accounts.rs @@ -1,9 +1,7 @@ use cosmwasm_std::Addr; use mars_types::{credit_manager::Account, health::AccountKind}; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; fn account_default(id: &str) -> Account { Account { diff --git a/contracts/credit-manager/tests/test_enumerate_coin_balances.rs b/contracts/credit-manager/src/tests/enumerate_coin_balances.rs similarity index 98% rename from contracts/credit-manager/tests/test_enumerate_coin_balances.rs rename to contracts/credit-manager/src/tests/enumerate_coin_balances.rs index 37c660c65..a73652247 100644 --- a/contracts/credit-manager/tests/test_enumerate_coin_balances.rs +++ b/contracts/credit-manager/src/tests/enumerate_coin_balances.rs @@ -1,9 +1,7 @@ use cosmwasm_std::{coin, Addr, Uint128}; use mars_types::credit_manager::{Action, CoinBalanceResponseItem}; -use crate::helpers::{build_mock_coin_infos, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{build_mock_coin_infos, AccountToFund, MockEnv}; #[test] fn pagination_on_all_coin_balances_query_works() { diff --git a/contracts/credit-manager/tests/test_enumerate_debt_shares.rs b/contracts/credit-manager/src/tests/enumerate_debt_shares.rs similarity index 97% rename from contracts/credit-manager/tests/test_enumerate_debt_shares.rs rename to contracts/credit-manager/src/tests/enumerate_debt_shares.rs index fc94d8acd..dd0201853 100644 --- a/contracts/credit-manager/tests/test_enumerate_debt_shares.rs +++ b/contracts/credit-manager/src/tests/enumerate_debt_shares.rs @@ -1,10 +1,8 @@ use cosmwasm_std::{coin, Addr}; -use mars_credit_manager::borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED; use mars_types::credit_manager::{Action, SharesResponseItem}; -use crate::helpers::{build_mock_coin_infos, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{build_mock_coin_infos, AccountToFund, MockEnv}; +use crate::borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED; #[test] fn pagination_on_all_debt_shares_query_works() { diff --git a/contracts/credit-manager/tests/test_enumerate_total_debt_shares.rs b/contracts/credit-manager/src/tests/enumerate_total_debt_shares.rs similarity index 97% rename from contracts/credit-manager/tests/test_enumerate_total_debt_shares.rs rename to contracts/credit-manager/src/tests/enumerate_total_debt_shares.rs index 816806f3e..233b6f990 100644 --- a/contracts/credit-manager/tests/test_enumerate_total_debt_shares.rs +++ b/contracts/credit-manager/src/tests/enumerate_total_debt_shares.rs @@ -1,10 +1,8 @@ use cosmwasm_std::{coin, Addr}; -use mars_credit_manager::borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED; use mars_types::credit_manager::{Action, DebtShares}; -use crate::helpers::{build_mock_coin_infos, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{build_mock_coin_infos, AccountToFund, MockEnv}; +use crate::borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED; #[test] fn pagination_on_all_total_debt_shares_query_works() { diff --git a/contracts/credit-manager/tests/test_enumerate_vault_positions.rs b/contracts/credit-manager/src/tests/enumerate_vault_positions.rs similarity index 98% rename from contracts/credit-manager/tests/test_enumerate_vault_positions.rs rename to contracts/credit-manager/src/tests/enumerate_vault_positions.rs index d4a9c1b89..ab2bf61b4 100644 --- a/contracts/credit-manager/tests/test_enumerate_vault_positions.rs +++ b/contracts/credit-manager/src/tests/enumerate_vault_positions.rs @@ -2,12 +2,10 @@ use cosmwasm_std::Addr; use itertools::Itertools; use mars_types::credit_manager::Action; -use crate::helpers::{ +use super::helpers::{ assert_contents_equal, build_mock_vaults, lp_token_info, AccountToFund, MockEnv, }; -pub mod helpers; - #[test] fn pagination_on_all_vault_positions_query_works() { let lp_token = lp_token_info(); diff --git a/contracts/credit-manager/tests/test_health.rs b/contracts/credit-manager/src/tests/health.rs similarity index 99% rename from contracts/credit-manager/tests/test_health.rs rename to contracts/credit-manager/src/tests/health.rs index faf04482b..387c99c86 100644 --- a/contracts/credit-manager/tests/test_health.rs +++ b/contracts/credit-manager/src/tests/health.rs @@ -1,7 +1,6 @@ use std::ops::{Add, Mul}; use cosmwasm_std::{coin, coins, Addr, Coin, Decimal, Uint128}; -use mars_credit_manager::{borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED, error::ContractError}; use mars_mock_oracle::msg::CoinPrice; use mars_types::{ credit_manager::{ @@ -13,12 +12,11 @@ use mars_types::{ params::{AssetParamsUpdate::AddOrUpdate, LiquidationBonus, VaultConfigUpdate}, }; -use crate::helpers::{ +use super::helpers::{ assert_err, lp_token_info, uatom_info, ujake_info, unlocked_vault_info, uosmo_info, AccountToFund, CoinInfo, MockEnv, }; - -pub mod helpers; +use crate::{borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED, error::ContractError}; // Health scenarios: // https://docs.google.com/spreadsheets/d/1YhydvetAkLywgyFjpzLIdRe-_z-KbjFOigiPuQBh-ac/edit#gid=1394903922 diff --git a/contracts/credit-manager/tests/helpers/assertions.rs b/contracts/credit-manager/src/tests/helpers/assertions.rs similarity index 87% rename from contracts/credit-manager/tests/helpers/assertions.rs rename to contracts/credit-manager/src/tests/helpers/assertions.rs index 15091d492..ef02e66da 100644 --- a/contracts/credit-manager/tests/helpers/assertions.rs +++ b/contracts/credit-manager/src/tests/helpers/assertions.rs @@ -2,7 +2,8 @@ use std::hash::Hash; use anyhow::Result as AnyResult; use cw_multi_test::AppResponse; -use mars_credit_manager::{error::ContractError, utils::contents_equal}; + +use crate::{error::ContractError, utils::contents_equal}; pub fn assert_err(res: AnyResult, err: ContractError) { match res { diff --git a/contracts/credit-manager/tests/helpers/builders.rs b/contracts/credit-manager/src/tests/helpers/builders.rs similarity index 96% rename from contracts/credit-manager/tests/helpers/builders.rs rename to contracts/credit-manager/src/tests/helpers/builders.rs index fac7e2760..a6f753d21 100644 --- a/contracts/credit-manager/tests/helpers/builders.rs +++ b/contracts/credit-manager/src/tests/helpers/builders.rs @@ -2,7 +2,7 @@ use cosmwasm_std::{coin, Decimal}; use cw_utils::Duration; use mars_types::params::LiquidationBonus; -use crate::helpers::{lp_token_info, CoinInfo, VaultTestInfo}; +use super::{lp_token_info, CoinInfo, VaultTestInfo}; pub fn build_mock_coin_infos(count: usize) -> Vec { (1..=count) diff --git a/contracts/credit-manager/tests/helpers/contracts.rs b/contracts/credit-manager/src/tests/helpers/contracts.rs similarity index 90% rename from contracts/credit-manager/tests/helpers/contracts.rs rename to contracts/credit-manager/src/tests/helpers/contracts.rs index bccce77df..6abe98e92 100644 --- a/contracts/credit-manager/tests/helpers/contracts.rs +++ b/contracts/credit-manager/src/tests/helpers/contracts.rs @@ -1,17 +1,13 @@ use cosmwasm_std::Empty; -use cw_multi_test::{App, Contract, ContractWrapper}; - -pub fn mock_app() -> App { - App::default() -} +use cw_multi_test::{Contract, ContractWrapper}; pub fn mock_rover_contract() -> Box> { let contract = ContractWrapper::new( - mars_credit_manager::contract::execute, - mars_credit_manager::contract::instantiate, - mars_credit_manager::contract::query, + crate::contract::execute, + crate::contract::instantiate, + crate::contract::query, ) - .with_reply(mars_credit_manager::contract::reply); + .with_reply(crate::contract::reply); Box::new(contract) } diff --git a/contracts/credit-manager/tests/helpers/mock_entity_info.rs b/contracts/credit-manager/src/tests/helpers/mock_entity_info.rs similarity index 99% rename from contracts/credit-manager/tests/helpers/mock_entity_info.rs rename to contracts/credit-manager/src/tests/helpers/mock_entity_info.rs index 237d2c934..1327534c6 100644 --- a/contracts/credit-manager/tests/helpers/mock_entity_info.rs +++ b/contracts/credit-manager/src/tests/helpers/mock_entity_info.rs @@ -4,7 +4,7 @@ use cosmwasm_std::{coin, Decimal}; use cw_utils::Duration; use mars_types::params::{HlsAssetType, HlsParamsUnchecked, LiquidationBonus}; -use crate::helpers::{CoinInfo, VaultTestInfo}; +use super::{CoinInfo, VaultTestInfo}; pub fn coin_info(denom: &str) -> CoinInfo { CoinInfo { diff --git a/contracts/credit-manager/tests/helpers/mock_env.rs b/contracts/credit-manager/src/tests/helpers/mock_env.rs similarity index 99% rename from contracts/credit-manager/tests/helpers/mock_env.rs rename to contracts/credit-manager/src/tests/helpers/mock_env.rs index aa23f09b3..aa29e9da9 100644 --- a/contracts/credit-manager/tests/helpers/mock_env.rs +++ b/contracts/credit-manager/src/tests/helpers/mock_env.rs @@ -64,7 +64,7 @@ use mars_types::{ }; use mars_zapper_mock::msg::{InstantiateMsg as ZapperInstantiateMsg, LpConfig}; -use crate::helpers::{ +use super::{ lp_token_info, mock_account_nft_contract, mock_address_provider_contract, mock_health_contract, mock_incentives_contract, mock_oracle_contract, mock_params_contract, mock_red_bank_contract, mock_rover_contract, mock_swapper_contract, mock_v2_zapper_contract, mock_vault_contract, @@ -1299,11 +1299,6 @@ impl MockEnvBuilder { self } - pub fn emergency_owner(&mut self, eo: &Addr) -> &mut Self { - self.emergency_owner = Some(eo.clone()); - self - } - pub fn vault_configs(&mut self, vault_configs: &[VaultTestInfo]) -> &mut Self { self.vault_configs = Some(vault_configs.to_vec()); self diff --git a/contracts/credit-manager/tests/helpers/mod.rs b/contracts/credit-manager/src/tests/helpers/mod.rs similarity index 100% rename from contracts/credit-manager/tests/helpers/mod.rs rename to contracts/credit-manager/src/tests/helpers/mod.rs diff --git a/contracts/credit-manager/tests/helpers/types.rs b/contracts/credit-manager/src/tests/helpers/types.rs similarity index 100% rename from contracts/credit-manager/tests/helpers/types.rs rename to contracts/credit-manager/src/tests/helpers/types.rs diff --git a/contracts/credit-manager/tests/helpers/utils.rs b/contracts/credit-manager/src/tests/helpers/utils.rs similarity index 100% rename from contracts/credit-manager/tests/helpers/utils.rs rename to contracts/credit-manager/src/tests/helpers/utils.rs diff --git a/contracts/credit-manager/tests/test_hls_accounts.rs b/contracts/credit-manager/src/tests/hls_accounts.rs similarity index 99% rename from contracts/credit-manager/tests/test_hls_accounts.rs rename to contracts/credit-manager/src/tests/hls_accounts.rs index d209194ce..e0baea311 100644 --- a/contracts/credit-manager/tests/test_hls_accounts.rs +++ b/contracts/credit-manager/src/tests/hls_accounts.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{coins, Addr, Decimal, Uint128}; -use mars_credit_manager::error::ContractError; use mars_types::{ credit_manager::Action::{Borrow, Deposit, EnterVault, Lend}, health::{AccountKind, HealthValuesResponse}, @@ -7,11 +6,10 @@ use mars_types::{ params::{AssetParamsUpdate::AddOrUpdate, HlsAssetType}, }; -use crate::helpers::{ +use super::helpers::{ assert_err, lp_token_info, uatom_info, ujake_info, unlocked_vault_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn queries_return_the_expected_kind() { diff --git a/contracts/credit-manager/tests/test_instantiate.rs b/contracts/credit-manager/src/tests/instantiate.rs similarity index 97% rename from contracts/credit-manager/tests/test_instantiate.rs rename to contracts/credit-manager/src/tests/instantiate.rs index b940423c0..242858a57 100644 --- a/contracts/credit-manager/tests/test_instantiate.rs +++ b/contracts/credit-manager/src/tests/instantiate.rs @@ -1,6 +1,4 @@ -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; #[test] fn owner_set_on_instantiate() { diff --git a/contracts/credit-manager/tests/test_lend.rs b/contracts/credit-manager/src/tests/lend.rs similarity index 99% rename from contracts/credit-manager/tests/test_lend.rs rename to contracts/credit-manager/src/tests/lend.rs index d256e1520..7468b6c5f 100644 --- a/contracts/credit-manager/tests/test_lend.rs +++ b/contracts/credit-manager/src/tests/lend.rs @@ -1,18 +1,16 @@ use std::ops::Add; use cosmwasm_std::{coin, coins, Addr, Coin, OverflowError, OverflowOperation, Uint128}; -use mars_credit_manager::error::ContractError; use mars_types::credit_manager::{ Action::{Deposit, Lend}, ActionAmount, ActionCoin, }; -use crate::helpers::{ +use super::helpers::{ assert_err, blacklisted_coin, coin_info, uosmo_info, AccountToFund, MockEnv, DEFAULT_RED_BANK_COIN_BALANCE, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn only_token_owner_can_lend() { diff --git a/contracts/credit-manager/tests/test_liquidate_deposit.rs b/contracts/credit-manager/src/tests/liquidate_deposit.rs similarity index 99% rename from contracts/credit-manager/tests/test_liquidate_deposit.rs rename to contracts/credit-manager/src/tests/liquidate_deposit.rs index 3c6901a4a..5e08aef5d 100644 --- a/contracts/credit-manager/tests/test_liquidate_deposit.rs +++ b/contracts/credit-manager/src/tests/liquidate_deposit.rs @@ -1,8 +1,4 @@ use cosmwasm_std::{coins, Addr, Coin, Decimal, OverflowError, OverflowOperation, Uint128}; -use mars_credit_manager::error::{ - ContractError, - ContractError::{AboveMaxLTV, LiquidationNotProfitable, NotLiquidatable}, -}; use mars_mock_oracle::msg::CoinPrice; use mars_types::{ credit_manager::{ @@ -13,12 +9,14 @@ use mars_types::{ oracle::ActionKind, }; -use crate::helpers::{ +use super::helpers::{ assert_err, get_coin, get_debt, lp_token_info, uatom_info, ujake_info, unlocked_vault_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::{ + ContractError, + ContractError::{AboveMaxLTV, LiquidationNotProfitable, NotLiquidatable}, +}; // Reference figures behind various scenarios // https://docs.google.com/spreadsheets/d/14Dk0L2oqI4gOKQZqe12TyjE4ZbVsJMViN1h1B4sJaQs/edit#gid=884610559 diff --git a/contracts/credit-manager/tests/test_liquidate_guard.rs b/contracts/credit-manager/src/tests/liquidate_guard.rs similarity index 90% rename from contracts/credit-manager/tests/test_liquidate_guard.rs rename to contracts/credit-manager/src/tests/liquidate_guard.rs index e97f45dd6..7f23d19d3 100644 --- a/contracts/credit-manager/tests/test_liquidate_guard.rs +++ b/contracts/credit-manager/src/tests/liquidate_guard.rs @@ -1,13 +1,11 @@ use cosmwasm_std::{coins, Addr}; -use mars_credit_manager::error::ContractError; use mars_types::credit_manager::{ Action::{Borrow, Deposit, Liquidate}, LiquidateRequest, }; -use crate::helpers::{assert_err, uatom_info, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, uatom_info, uosmo_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test] fn cannot_liquidate_own_account() { diff --git a/contracts/credit-manager/tests/test_liquidate_lend.rs b/contracts/credit-manager/src/tests/liquidate_lend.rs similarity index 99% rename from contracts/credit-manager/tests/test_liquidate_lend.rs rename to contracts/credit-manager/src/tests/liquidate_lend.rs index 52bd81c51..3632658cc 100644 --- a/contracts/credit-manager/tests/test_liquidate_lend.rs +++ b/contracts/credit-manager/src/tests/liquidate_lend.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{coins, Addr, Decimal, Event, Uint128}; -use mars_credit_manager::error::{ContractError, ContractError::NotLiquidatable}; use mars_mock_oracle::msg::CoinPrice; use mars_types::{ credit_manager::{ @@ -10,11 +9,10 @@ use mars_types::{ oracle::ActionKind, }; -use crate::helpers::{ +use super::helpers::{ assert_err, get_coin, get_debt, uatom_info, ujake_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::{ContractError, ContractError::NotLiquidatable}; // Reference figures behind various scenarios // https://docs.google.com/spreadsheets/d/14Dk0L2oqI4gOKQZqe12TyjE4ZbVsJMViN1h1B4sJaQs/edit#gid=884610559 diff --git a/contracts/credit-manager/tests/test_liquidate_vault.rs b/contracts/credit-manager/src/tests/liquidate_vault.rs similarity index 99% rename from contracts/credit-manager/tests/test_liquidate_vault.rs rename to contracts/credit-manager/src/tests/liquidate_vault.rs index 0c7bb87bf..b114ad6b3 100644 --- a/contracts/credit-manager/tests/test_liquidate_vault.rs +++ b/contracts/credit-manager/src/tests/liquidate_vault.rs @@ -1,7 +1,6 @@ use cosmwasm_std::{ Addr, Decimal, OverflowError, OverflowOperation::Sub, StdError::NotFound, Uint128, }; -use mars_credit_manager::error::ContractError; use mars_mock_oracle::msg::CoinPrice; use mars_types::{ adapters::vault::{VaultBase, VaultError, VaultPositionType}, @@ -13,12 +12,11 @@ use mars_types::{ oracle::ActionKind, }; -use crate::helpers::{ +use super::helpers::{ assert_err, get_coin, get_debt, locked_vault_info, lp_token_info, uatom_info, ujake_info, unlocked_vault_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError; // Reference figures behind various scenarios // https://docs.google.com/spreadsheets/d/14Dk0L2oqI4gOKQZqe12TyjE4ZbVsJMViN1h1B4sJaQs/edit#gid=884610559 diff --git a/contracts/credit-manager/tests/test_liquidation_pricing.rs b/contracts/credit-manager/src/tests/liquidation_pricing.rs similarity index 95% rename from contracts/credit-manager/tests/test_liquidation_pricing.rs rename to contracts/credit-manager/src/tests/liquidation_pricing.rs index 0af800d7e..b6dd38e07 100644 --- a/contracts/credit-manager/tests/test_liquidation_pricing.rs +++ b/contracts/credit-manager/src/tests/liquidation_pricing.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{coins, Addr, Coin, Decimal}; -use mars_credit_manager::error::ContractError; use mars_mock_oracle::msg::CoinPrice; use mars_types::{ credit_manager::{ @@ -9,9 +8,8 @@ use mars_types::{ oracle::ActionKind, }; -use crate::helpers::{assert_err, uatom_info, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, uatom_info, uosmo_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test] fn liquidation_uses_correct_price_kind() { diff --git a/contracts/credit-manager/tests/test_migration_v2.rs b/contracts/credit-manager/src/tests/migration_v2.rs similarity index 99% rename from contracts/credit-manager/tests/test_migration_v2.rs rename to contracts/credit-manager/src/tests/migration_v2.rs index c6af64099..ea8a4741b 100644 --- a/contracts/credit-manager/tests/test_migration_v2.rs +++ b/contracts/credit-manager/src/tests/migration_v2.rs @@ -3,15 +3,6 @@ use cosmwasm_std::{ Addr, Decimal, }; use cw2::VersionError; -use mars_credit_manager::{ - contract::migrate, - error::ContractError, - migrations::v2_0_0::{v1_state, v1_state::OwnerSetNoneProposed}, - state::{ - ACCOUNT_NFT, HEALTH_CONTRACT, INCENTIVES, MAX_SLIPPAGE, OWNER, PARAMS, RED_BANK, - REWARDS_COLLECTOR, SWAPPER, - }, -}; use mars_types::{ adapters::{ health::HealthContractUnchecked, incentives::IncentivesUnchecked, params::ParamsUnchecked, @@ -20,7 +11,15 @@ use mars_types::{ credit_manager::{MigrateMsg, V2Updates}, }; -pub mod helpers; +use crate::{ + contract::migrate, + error::ContractError, + migrations::v2_0_0::{v1_state, v1_state::OwnerSetNoneProposed}, + state::{ + ACCOUNT_NFT, HEALTH_CONTRACT, INCENTIVES, MAX_SLIPPAGE, OWNER, PARAMS, RED_BANK, + REWARDS_COLLECTOR, SWAPPER, + }, +}; #[test] fn wrong_contract_name() { diff --git a/contracts/credit-manager/src/tests/mod.rs b/contracts/credit-manager/src/tests/mod.rs new file mode 100644 index 000000000..ffe312d80 --- /dev/null +++ b/contracts/credit-manager/src/tests/mod.rs @@ -0,0 +1,43 @@ +mod borrow; +mod claim_rewards; +mod coin_balances; +mod create_credit_account; +mod deposit; +mod deposit_cap; +mod dispatch; +mod enumerate_accounts; +mod enumerate_coin_balances; +mod enumerate_debt_shares; +mod enumerate_total_debt_shares; +mod enumerate_vault_positions; +mod health; +mod helpers; +mod hls_accounts; +mod instantiate; +mod lend; +mod liquidate_deposit; +mod liquidate_guard; +mod liquidate_lend; +mod liquidate_vault; +mod liquidation_pricing; +mod migration_v2; +mod no_health_check; +mod reclaim; +mod reentrancy_guard; +mod refund_balances; +mod repay; +mod repay_for_recipient; +mod repay_from_wallet; +mod swap; +mod update_admin; +mod update_config; +mod update_nft_config; +mod utilization_query; +mod vault_enter; +mod vault_exit; +mod vault_exit_unlocked; +mod vault_query_value; +mod vault_request_unlock; +mod withdraw; +mod zap_provide; +mod zap_withdraw; diff --git a/contracts/credit-manager/tests/test_no_health_check.rs b/contracts/credit-manager/src/tests/no_health_check.rs similarity index 98% rename from contracts/credit-manager/tests/test_no_health_check.rs rename to contracts/credit-manager/src/tests/no_health_check.rs index 90556a213..3791b01f3 100644 --- a/contracts/credit-manager/tests/test_no_health_check.rs +++ b/contracts/credit-manager/src/tests/no_health_check.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{coin, coins, Addr, StdError, Uint128}; -use mars_credit_manager::error::ContractError; use mars_types::{ credit_manager::{ Action::{Borrow, Deposit, Repay, Withdraw}, @@ -8,9 +7,8 @@ use mars_types::{ oracle::ActionKind, }; -use crate::helpers::{assert_err, get_coin, get_debt, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, get_coin, get_debt, uosmo_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test] fn deposit_and_repay_works_without_hf_check() { diff --git a/contracts/credit-manager/tests/test_reclaim.rs b/contracts/credit-manager/src/tests/reclaim.rs similarity index 98% rename from contracts/credit-manager/tests/test_reclaim.rs rename to contracts/credit-manager/src/tests/reclaim.rs index 3cc5e9afa..d7117bf76 100644 --- a/contracts/credit-manager/tests/test_reclaim.rs +++ b/contracts/credit-manager/src/tests/reclaim.rs @@ -1,10 +1,8 @@ use cosmwasm_std::{coin, coins, Addr, Event, Uint128}; -use mars_credit_manager::error::ContractError; use mars_types::credit_manager::Action::{Deposit, Lend, Reclaim}; -use crate::helpers::{assert_err, get_coin, uatom_info, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, get_coin, uatom_info, uosmo_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test] fn only_token_owner_can_reclaim() { diff --git a/contracts/credit-manager/tests/test_reentrancy_guard.rs b/contracts/credit-manager/src/tests/reentrancy_guard.rs similarity index 93% rename from contracts/credit-manager/tests/test_reentrancy_guard.rs rename to contracts/credit-manager/src/tests/reentrancy_guard.rs index a93fe16b1..450a6e237 100644 --- a/contracts/credit-manager/tests/test_reentrancy_guard.rs +++ b/contracts/credit-manager/src/tests/reentrancy_guard.rs @@ -1,14 +1,12 @@ use cosmwasm_std::Addr; -use mars_credit_manager::error::ContractError; use mars_types::credit_manager::{ Action::{Deposit, EnterVault}, CallbackMsg, }; use mars_utils::error::GuardError; -use crate::helpers::{assert_err, lp_token_info, unlocked_vault_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, lp_token_info, unlocked_vault_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test] fn reentrancy_guard_protects_against_evil_vault() { diff --git a/contracts/credit-manager/tests/test_refund_balances.rs b/contracts/credit-manager/src/tests/refund_balances.rs similarity index 98% rename from contracts/credit-manager/tests/test_refund_balances.rs rename to contracts/credit-manager/src/tests/refund_balances.rs index 4efd8ffa9..ba199ee4e 100644 --- a/contracts/credit-manager/tests/test_refund_balances.rs +++ b/contracts/credit-manager/src/tests/refund_balances.rs @@ -1,12 +1,10 @@ use cosmwasm_std::{coin, Addr, Uint128}; use mars_types::credit_manager::Action::{Deposit, EnterVault, RefundAllCoinBalances}; -use crate::helpers::{ +use super::helpers::{ locked_vault_info, lp_token_info, uatom_info, uosmo_info, AccountToFund, MockEnv, }; -pub mod helpers; - #[test] fn refund_coin_balances_when_balances() { let uosmo_info = uosmo_info(); diff --git a/contracts/credit-manager/tests/test_repay.rs b/contracts/credit-manager/src/tests/repay.rs similarity index 98% rename from contracts/credit-manager/tests/test_repay.rs rename to contracts/credit-manager/src/tests/repay.rs index edc19091f..a9c881129 100644 --- a/contracts/credit-manager/tests/test_repay.rs +++ b/contracts/credit-manager/src/tests/repay.rs @@ -1,17 +1,15 @@ use std::ops::{Add, Mul, Sub}; use cosmwasm_std::{coin, coins, Addr, Decimal, OverflowError, OverflowOperation, Uint128}; -use mars_credit_manager::{borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED, error::ContractError}; use mars_types::{ credit_manager::Action::{Borrow, Deposit, Repay, Withdraw}, params::LiquidationBonus, }; -use crate::helpers::{ +use super::helpers::{ assert_err, uosmo_info, AccountToFund, CoinInfo, MockEnv, DEFAULT_RED_BANK_COIN_BALANCE, }; - -pub mod helpers; +use crate::{borrow::DEFAULT_DEBT_SHARES_PER_COIN_BORROWED, error::ContractError}; #[test] fn only_token_owner_can_repay() { diff --git a/contracts/credit-manager/tests/test_repay_for_recipient.rs b/contracts/credit-manager/src/tests/repay_for_recipient.rs similarity index 99% rename from contracts/credit-manager/tests/test_repay_for_recipient.rs rename to contracts/credit-manager/src/tests/repay_for_recipient.rs index e5c910a00..5f53cc01c 100644 --- a/contracts/credit-manager/tests/test_repay_for_recipient.rs +++ b/contracts/credit-manager/src/tests/repay_for_recipient.rs @@ -1,17 +1,15 @@ use std::ops::{Add, Sub}; use cosmwasm_std::{coin, coins, Addr, OverflowError, OverflowOperation, Uint128}; -use mars_credit_manager::error::ContractError; use mars_types::credit_manager::{ Action::{Borrow, Deposit, Repay}, ActionAmount, ActionCoin, CallbackMsg, }; -use crate::helpers::{ +use super::helpers::{ assert_err, uosmo_info, AccountToFund, MockEnv, DEFAULT_RED_BANK_COIN_BALANCE, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn only_rover_can_call_repay_for_recipient_callback() { diff --git a/contracts/credit-manager/tests/test_repay_from_wallet.rs b/contracts/credit-manager/src/tests/repay_from_wallet.rs similarity index 97% rename from contracts/credit-manager/tests/test_repay_from_wallet.rs rename to contracts/credit-manager/src/tests/repay_from_wallet.rs index 262bd3502..9408f5932 100644 --- a/contracts/credit-manager/tests/test_repay_from_wallet.rs +++ b/contracts/credit-manager/src/tests/repay_from_wallet.rs @@ -1,14 +1,12 @@ use cosmwasm_std::{coin, coins, Addr, Uint128}; use cw_utils::PaymentError; -use mars_credit_manager::error::ContractError; use mars_types::{ credit_manager::Action::{Borrow, Deposit}, params::AssetParamsUpdate::AddOrUpdate, }; -use crate::helpers::{assert_err, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, uosmo_info, AccountToFund, MockEnv}; +use crate::error::ContractError; #[test] fn raises_when_sending_incorrect_funds() { diff --git a/contracts/credit-manager/tests/test_swap.rs b/contracts/credit-manager/src/tests/swap.rs similarity index 99% rename from contracts/credit-manager/tests/test_swap.rs rename to contracts/credit-manager/src/tests/swap.rs index 5e867a1e9..c9c947fe3 100644 --- a/contracts/credit-manager/tests/test_swap.rs +++ b/contracts/credit-manager/src/tests/swap.rs @@ -1,18 +1,16 @@ use std::str::FromStr; use cosmwasm_std::{coins, Addr, Coin, Decimal, OverflowError, OverflowOperation::Sub, Uint128}; -use mars_credit_manager::error::ContractError; use mars_swapper_mock::contract::MOCK_SWAP_RESULT; use mars_types::credit_manager::{ Action::{Deposit, SwapExactIn}, ActionAmount, ActionCoin, }; -use crate::helpers::{ +use super::helpers::{ assert_err, blacklisted_coin, uatom_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn only_token_owner_can_swap_for_account() { diff --git a/contracts/credit-manager/tests/test_update_admin.rs b/contracts/credit-manager/src/tests/update_admin.rs similarity index 97% rename from contracts/credit-manager/tests/test_update_admin.rs rename to contracts/credit-manager/src/tests/update_admin.rs index 17d201939..b12e0a2fa 100644 --- a/contracts/credit-manager/tests/test_update_admin.rs +++ b/contracts/credit-manager/src/tests/update_admin.rs @@ -1,13 +1,11 @@ use cosmwasm_std::Addr; -use mars_credit_manager::error::ContractError::Owner; use mars_owner::{ OwnerError::{NotOwner, NotProposedOwner, StateTransitionError}, OwnerUpdate, }; -use crate::helpers::{assert_err, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, MockEnv}; +use crate::error::ContractError::Owner; #[test] fn initialized_state() { diff --git a/contracts/credit-manager/tests/test_update_config.rs b/contracts/credit-manager/src/tests/update_config.rs similarity index 98% rename from contracts/credit-manager/tests/test_update_config.rs rename to contracts/credit-manager/src/tests/update_config.rs index 5a10b401b..1a15319d1 100644 --- a/contracts/credit-manager/tests/test_update_config.rs +++ b/contracts/credit-manager/src/tests/update_config.rs @@ -1,7 +1,5 @@ use cosmwasm_std::{Addr, Decimal, Empty, Uint128}; use cw_multi_test::{BasicApp, Executor}; -use helpers::assert_err; -use mars_credit_manager::error::ContractError; use mars_mock_oracle::msg::{CoinPrice, InstantiateMsg as OracleInstantiateMsg}; use mars_types::{ adapters::{ @@ -14,9 +12,8 @@ use mars_types::{ oracle::ActionKind, }; -use crate::helpers::{mock_oracle_contract, mock_red_bank_contract, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, mock_oracle_contract, mock_red_bank_contract, MockEnv}; +use crate::error::ContractError; #[test] fn only_owner_can_update_config() { diff --git a/contracts/credit-manager/tests/test_update_nft_config.rs b/contracts/credit-manager/src/tests/update_nft_config.rs similarity index 97% rename from contracts/credit-manager/tests/test_update_nft_config.rs rename to contracts/credit-manager/src/tests/update_nft_config.rs index dabd883f2..410709a3c 100644 --- a/contracts/credit-manager/tests/test_update_nft_config.rs +++ b/contracts/credit-manager/src/tests/update_nft_config.rs @@ -2,13 +2,11 @@ extern crate core; use cosmwasm_std::{Addr, Uint128}; use cw_multi_test::Executor; -use mars_credit_manager::error::ContractError; use mars_owner::OwnerError::NotOwner; use mars_types::account_nft::{ExecuteMsg, NftConfigUpdates}; -use crate::helpers::{assert_err, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, MockEnv}; +use crate::error::ContractError; #[test] fn only_owner_can_update_nft_config() { diff --git a/contracts/credit-manager/tests/test_utilization_query.rs b/contracts/credit-manager/src/tests/utilization_query.rs similarity index 99% rename from contracts/credit-manager/tests/test_utilization_query.rs rename to contracts/credit-manager/src/tests/utilization_query.rs index 47fa483fa..a103ff55b 100644 --- a/contracts/credit-manager/tests/test_utilization_query.rs +++ b/contracts/credit-manager/src/tests/utilization_query.rs @@ -11,12 +11,10 @@ use mars_types::{ params::LiquidationBonus, }; -use crate::helpers::{ +use super::helpers::{ ujake_info, unlocked_vault_info, uosmo_info, AccountToFund, CoinInfo, MockEnv, VaultTestInfo, }; -pub mod helpers; - #[test] fn raises_if_vault_not_found() { let mock = MockEnv::new().build().unwrap(); diff --git a/contracts/credit-manager/tests/test_vault_enter.rs b/contracts/credit-manager/src/tests/vault_enter.rs similarity index 99% rename from contracts/credit-manager/tests/test_vault_enter.rs rename to contracts/credit-manager/src/tests/vault_enter.rs index da8ed44ec..73eb78985 100644 --- a/contracts/credit-manager/tests/test_vault_enter.rs +++ b/contracts/credit-manager/src/tests/vault_enter.rs @@ -1,7 +1,6 @@ use cosmwasm_std::{ coin, Addr, Decimal, OverflowError, OverflowOperation::Sub, StdError::NotFound, Uint128, }; -use mars_credit_manager::error::ContractError; use mars_mock_vault::contract::STARTING_VAULT_SHARES; use mars_types::{ adapters::vault::VaultBase, @@ -11,12 +10,11 @@ use mars_types::{ }, }; -use crate::helpers::{ +use super::helpers::{ assert_err, locked_vault_info, lp_token_info, uatom_info, unlocked_vault_info, uosmo_info, AccountToFund, MockEnv, VaultTestInfo, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn only_account_owner_can_take_action() { diff --git a/contracts/credit-manager/tests/test_vault_exit.rs b/contracts/credit-manager/src/tests/vault_exit.rs similarity index 98% rename from contracts/credit-manager/tests/test_vault_exit.rs rename to contracts/credit-manager/src/tests/vault_exit.rs index 0473ba324..a27009f4c 100644 --- a/contracts/credit-manager/tests/test_vault_exit.rs +++ b/contracts/credit-manager/src/tests/vault_exit.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{coin, Addr, Coin, OverflowError, OverflowOperation::Sub, Uint128}; -use mars_credit_manager::error::ContractError::NotTokenOwner; use mars_mock_vault::contract::STARTING_VAULT_SHARES; use mars_types::{ adapters::vault::{VaultBase, VaultError}, @@ -7,12 +6,11 @@ use mars_types::{ params::VaultConfigUpdate, }; -use crate::helpers::{ +use super::helpers::{ assert_err, locked_vault_info, lp_token_info, uatom_info, unlocked_vault_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError::NotTokenOwner; #[test] fn only_owner_of_token_can_withdraw_from_vault() { diff --git a/contracts/credit-manager/tests/test_vault_exit_unlocked.rs b/contracts/credit-manager/src/tests/vault_exit_unlocked.rs similarity index 99% rename from contracts/credit-manager/tests/test_vault_exit_unlocked.rs rename to contracts/credit-manager/src/tests/vault_exit_unlocked.rs index 885203591..4805ceb2a 100644 --- a/contracts/credit-manager/tests/test_vault_exit_unlocked.rs +++ b/contracts/credit-manager/src/tests/vault_exit_unlocked.rs @@ -1,6 +1,5 @@ use cosmwasm_std::{Addr, Uint128}; use cw_utils::Duration; -use mars_credit_manager::error::ContractError; use mars_mock_vault::contract::STARTING_VAULT_SHARES; use mars_types::{ adapters::vault::VaultError, @@ -11,12 +10,11 @@ use mars_types::{ params::VaultConfigUpdate, }; -use crate::helpers::{ +use super::helpers::{ assert_err, generate_mock_vault, get_coin, locked_vault_info, lp_token_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn only_owner_can_withdraw_unlocked_for_account() { diff --git a/contracts/credit-manager/tests/test_vault_query_value.rs b/contracts/credit-manager/src/tests/vault_query_value.rs similarity index 98% rename from contracts/credit-manager/tests/test_vault_query_value.rs rename to contracts/credit-manager/src/tests/vault_query_value.rs index 90795850b..65b33c957 100644 --- a/contracts/credit-manager/tests/test_vault_query_value.rs +++ b/contracts/credit-manager/src/tests/vault_query_value.rs @@ -7,12 +7,10 @@ use mars_types::{ credit_manager::Action::{Deposit, EnterVault, RequestVaultUnlock}, }; -use crate::helpers::{ +use super::helpers::{ locked_vault_info, lp_token_info, unlocked_vault_info, AccountToFund, MockEnv, }; -pub mod helpers; - #[test] fn raises_if_vault_not_available_to_price() { let mock = MockEnv::new().build().unwrap(); diff --git a/contracts/credit-manager/tests/test_vault_request_unlock.rs b/contracts/credit-manager/src/tests/vault_request_unlock.rs similarity index 99% rename from contracts/credit-manager/tests/test_vault_request_unlock.rs rename to contracts/credit-manager/src/tests/vault_request_unlock.rs index 64b596825..c54612177 100644 --- a/contracts/credit-manager/tests/test_vault_request_unlock.rs +++ b/contracts/credit-manager/src/tests/vault_request_unlock.rs @@ -1,18 +1,16 @@ use cosmwasm_std::{coins, Addr, OverflowError, OverflowOperation::Sub, Uint128}; use cw_multi_test::{BankSudo, SudoMsg}; use cw_utils::{Duration, Expiration}; -use mars_credit_manager::error::ContractError; use mars_mock_vault::contract::STARTING_VAULT_SHARES; use mars_types::{ adapters::vault::{VaultError, VaultUnchecked}, credit_manager::Action::{Deposit, EnterVault, RequestVaultUnlock}, }; -use crate::helpers::{ +use super::helpers::{ assert_err, locked_vault_info, lp_token_info, unlocked_vault_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError; #[test] fn only_owner_can_request_unlocked() { diff --git a/contracts/credit-manager/tests/test_withdraw.rs b/contracts/credit-manager/src/tests/withdraw.rs similarity index 98% rename from contracts/credit-manager/tests/test_withdraw.rs rename to contracts/credit-manager/src/tests/withdraw.rs index c3c2c3f06..d310bd70f 100644 --- a/contracts/credit-manager/tests/test_withdraw.rs +++ b/contracts/credit-manager/src/tests/withdraw.rs @@ -1,10 +1,8 @@ use cosmwasm_std::{coin, coins, Addr, Coin, OverflowError, OverflowOperation::Sub, Uint128}; -use mars_credit_manager::error::{ContractError, ContractError::NotTokenOwner}; use mars_types::credit_manager::Action; -use crate::helpers::{assert_err, uatom_info, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, uatom_info, uosmo_info, AccountToFund, MockEnv}; +use crate::error::{ContractError, ContractError::NotTokenOwner}; #[test] fn only_owner_of_token_can_withdraw() { diff --git a/contracts/credit-manager/tests/test_zap_provide.rs b/contracts/credit-manager/src/tests/zap_provide.rs similarity index 99% rename from contracts/credit-manager/tests/test_zap_provide.rs rename to contracts/credit-manager/src/tests/zap_provide.rs index c783aa728..bfd2345f4 100644 --- a/contracts/credit-manager/tests/test_zap_provide.rs +++ b/contracts/credit-manager/src/tests/zap_provide.rs @@ -1,18 +1,16 @@ use std::ops::Mul; use cosmwasm_std::{Addr, Decimal, OverflowError, OverflowOperation::Sub, Uint128}; -use mars_credit_manager::error::ContractError as RoverError; use mars_types::credit_manager::{ Action::{Deposit, ProvideLiquidity, WithdrawLiquidity}, ActionAmount, ActionCoin, }; use mars_zapper_mock::{contract::STARTING_LP_POOL_TOKENS, error::ContractError}; -use crate::helpers::{ +use super::helpers::{ assert_err, get_coin, lp_token_info, uatom_info, ujake_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError as RoverError; #[test] fn only_token_owner_can_zap_for_account() { diff --git a/contracts/credit-manager/tests/test_zap_withdraw.rs b/contracts/credit-manager/src/tests/zap_withdraw.rs similarity index 99% rename from contracts/credit-manager/tests/test_zap_withdraw.rs rename to contracts/credit-manager/src/tests/zap_withdraw.rs index 554b71d8f..646bde24e 100644 --- a/contracts/credit-manager/tests/test_zap_withdraw.rs +++ b/contracts/credit-manager/src/tests/zap_withdraw.rs @@ -1,16 +1,14 @@ use cosmwasm_std::{Addr, Decimal, OverflowError, OverflowOperation::Sub, Uint128}; -use mars_credit_manager::error::ContractError as RoverError; use mars_types::credit_manager::{ Action::{Deposit, ProvideLiquidity, WithdrawLiquidity}, ActionAmount, ActionCoin, }; use mars_zapper_mock::contract::STARTING_LP_POOL_TOKENS; -use crate::helpers::{ +use super::helpers::{ assert_err, get_coin, lp_token_info, uatom_info, uosmo_info, AccountToFund, MockEnv, }; - -pub mod helpers; +use crate::error::ContractError as RoverError; #[test] fn only_token_owner_can_unzap_for_account() { diff --git a/contracts/health/src/lib.rs b/contracts/health/src/lib.rs index b202a2fad..9b3650556 100644 --- a/contracts/health/src/lib.rs +++ b/contracts/health/src/lib.rs @@ -2,4 +2,6 @@ pub mod compute; pub mod contract; pub mod querier; pub mod state; +#[cfg(test)] +mod tests; pub mod update_config; diff --git a/contracts/health/tests/test_health_state.rs b/contracts/health/src/tests/health_state.rs similarity index 97% rename from contracts/health/tests/test_health_state.rs rename to contracts/health/src/tests/health_state.rs index 78c5e7294..9ab789545 100644 --- a/contracts/health/tests/test_health_state.rs +++ b/contracts/health/src/tests/health_state.rs @@ -6,9 +6,7 @@ use mars_types::{ params::AssetParamsUpdate::AddOrUpdate, }; -use crate::helpers::{default_asset_params, MockEnv}; - -pub mod helpers; +use super::helpers::{default_asset_params, MockEnv}; #[test] fn zero_debts_results_in_healthy_state() { diff --git a/contracts/health/tests/test_health_values.rs b/contracts/health/src/tests/health_values.rs similarity index 99% rename from contracts/health/tests/test_health_values.rs rename to contracts/health/src/tests/health_values.rs index 44159cdaf..c2b60529c 100644 --- a/contracts/health/tests/test_health_values.rs +++ b/contracts/health/src/tests/health_values.rs @@ -15,9 +15,7 @@ use mars_types::{ }, }; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; #[test] fn raises_when_credit_manager_not_set() { diff --git a/contracts/health/tests/helpers/defaults.rs b/contracts/health/src/tests/helpers/defaults.rs similarity index 100% rename from contracts/health/tests/helpers/defaults.rs rename to contracts/health/src/tests/helpers/defaults.rs diff --git a/contracts/health/tests/helpers/mock_contracts.rs b/contracts/health/src/tests/helpers/mock_contracts.rs similarity index 90% rename from contracts/health/tests/helpers/mock_contracts.rs rename to contracts/health/src/tests/helpers/mock_contracts.rs index e533e8282..0908b2649 100644 --- a/contracts/health/tests/helpers/mock_contracts.rs +++ b/contracts/health/src/tests/helpers/mock_contracts.rs @@ -3,9 +3,9 @@ use cw_multi_test::{Contract, ContractWrapper}; pub fn mock_health_contract() -> Box> { let contract = ContractWrapper::new( - mars_rover_health::contract::execute, - mars_rover_health::contract::instantiate, - mars_rover_health::contract::query, + crate::contract::execute, + crate::contract::instantiate, + crate::contract::query, ); Box::new(contract) } diff --git a/contracts/health/tests/helpers/mock_env.rs b/contracts/health/src/tests/helpers/mock_env.rs similarity index 99% rename from contracts/health/tests/helpers/mock_env.rs rename to contracts/health/src/tests/helpers/mock_env.rs index 3b1613a75..6d55aca69 100644 --- a/contracts/health/tests/helpers/mock_env.rs +++ b/contracts/health/src/tests/helpers/mock_env.rs @@ -22,7 +22,7 @@ use mars_types::{ }, }; -use crate::helpers::MockEnvBuilder; +use super::MockEnvBuilder; pub struct MockEnv { pub app: BasicApp, diff --git a/contracts/health/tests/helpers/mock_env_builder.rs b/contracts/health/src/tests/helpers/mock_env_builder.rs similarity index 99% rename from contracts/health/tests/helpers/mock_env_builder.rs rename to contracts/health/src/tests/helpers/mock_env_builder.rs index 2ac69f474..3a0cac15c 100644 --- a/contracts/health/tests/helpers/mock_env_builder.rs +++ b/contracts/health/src/tests/helpers/mock_env_builder.rs @@ -18,7 +18,7 @@ use mars_types::{ }, }; -use crate::helpers::{ +use super::{ mock_credit_manager_contract, mock_health_contract, mock_oracle_contract, mock_params_contract, mock_vault_contract, MockEnv, }; diff --git a/contracts/health/tests/helpers/mod.rs b/contracts/health/src/tests/helpers/mod.rs similarity index 100% rename from contracts/health/tests/helpers/mod.rs rename to contracts/health/src/tests/helpers/mod.rs diff --git a/contracts/health/tests/test_hls.rs b/contracts/health/src/tests/hls.rs similarity index 97% rename from contracts/health/tests/test_hls.rs rename to contracts/health/src/tests/hls.rs index 159103dd0..b76f31235 100644 --- a/contracts/health/tests/test_hls.rs +++ b/contracts/health/src/tests/hls.rs @@ -9,9 +9,7 @@ use mars_types::{ params::AssetParamsUpdate::AddOrUpdate, }; -use crate::helpers::{default_asset_params, MockEnv}; - -pub mod helpers; +use super::helpers::{default_asset_params, MockEnv}; #[test] fn hls_account_kind_passed_along() { diff --git a/contracts/health/tests/test_instantiate.rs b/contracts/health/src/tests/instantiate.rs similarity index 97% rename from contracts/health/tests/test_instantiate.rs rename to contracts/health/src/tests/instantiate.rs index adad1e1ae..550efd496 100644 --- a/contracts/health/tests/test_instantiate.rs +++ b/contracts/health/src/tests/instantiate.rs @@ -1,11 +1,10 @@ use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info}; -use mars_rover_health::{ +use mars_types::health::InstantiateMsg; + +use crate::{ contract::instantiate, state::{CREDIT_MANAGER, OWNER}, }; -use mars_types::health::InstantiateMsg; - -pub mod helpers; #[test] fn instantiate_without_credit_manager() { diff --git a/contracts/health/tests/test_liquidation_pricing.rs b/contracts/health/src/tests/liquidation_pricing.rs similarity index 98% rename from contracts/health/tests/test_liquidation_pricing.rs rename to contracts/health/src/tests/liquidation_pricing.rs index 1da92e102..12d51fbf2 100644 --- a/contracts/health/tests/test_liquidation_pricing.rs +++ b/contracts/health/src/tests/liquidation_pricing.rs @@ -11,9 +11,7 @@ use mars_types::{ }, }; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; #[test] fn uses_liquidation_pricing() { diff --git a/contracts/health/src/tests/mod.rs b/contracts/health/src/tests/mod.rs new file mode 100644 index 000000000..274c2d718 --- /dev/null +++ b/contracts/health/src/tests/mod.rs @@ -0,0 +1,7 @@ +mod health_state; +mod health_values; +mod helpers; +mod hls; +mod instantiate; +mod liquidation_pricing; +mod update_config; diff --git a/contracts/health/tests/test_update_config.rs b/contracts/health/src/tests/update_config.rs similarity index 96% rename from contracts/health/tests/test_update_config.rs rename to contracts/health/src/tests/update_config.rs index 2b2ead9d8..eab0c2dcb 100644 --- a/contracts/health/tests/test_update_config.rs +++ b/contracts/health/src/tests/update_config.rs @@ -5,9 +5,7 @@ use mars_types::health::{ HealthError::{Owner, Std}, }; -use crate::helpers::MockEnv; - -pub mod helpers; +use super::helpers::MockEnv; #[test] fn only_owner_can_update_config() { diff --git a/contracts/incentives/src/lib.rs b/contracts/incentives/src/lib.rs index 88d83aeaf..06d248bf2 100644 --- a/contracts/incentives/src/lib.rs +++ b/contracts/incentives/src/lib.rs @@ -3,5 +3,7 @@ mod error; pub mod helpers; pub mod migrations; pub mod state; +#[cfg(test)] +mod tests; pub use error::ContractError; diff --git a/contracts/incentives/tests/tests/test_admin.rs b/contracts/incentives/src/tests/admin.rs similarity index 99% rename from contracts/incentives/tests/tests/test_admin.rs rename to contracts/incentives/src/tests/admin.rs index b58ddcf6b..e9f995cc4 100644 --- a/contracts/incentives/tests/tests/test_admin.rs +++ b/contracts/incentives/src/tests/admin.rs @@ -2,15 +2,15 @@ use cosmwasm_std::{ testing::{mock_env, mock_info}, Addr, SubMsg, }; -use mars_incentives::{ - contract::{execute, instantiate}, - ContractError, -}; use mars_owner::OwnerError::NotOwner; use mars_testing::mock_dependencies; use mars_types::incentives::{ConfigResponse, ExecuteMsg, InstantiateMsg, QueryMsg}; use super::helpers::{th_query, th_setup}; +use crate::{ + contract::{execute, instantiate}, + ContractError, +}; #[test] fn proper_initialization() { diff --git a/contracts/incentives/tests/tests/test_balance_change.rs b/contracts/incentives/src/tests/balance_change.rs similarity index 99% rename from contracts/incentives/tests/tests/test_balance_change.rs rename to contracts/incentives/src/tests/balance_change.rs index cd7317ab1..54da8c2e1 100644 --- a/contracts/incentives/tests/tests/test_balance_change.rs +++ b/contracts/incentives/src/tests/balance_change.rs @@ -3,11 +3,6 @@ use cosmwasm_std::{ testing::{mock_env, mock_info}, Addr, Decimal, Event, Response, Timestamp, Uint128, }; -use mars_incentives::{ - contract::{execute, execute_balance_change, query_user_unclaimed_rewards}, - helpers::{compute_incentive_index, compute_user_accrued_rewards}, - state::{EMISSIONS, INCENTIVE_STATES, USER_ASSET_INDICES, USER_UNCLAIMED_REWARDS}, -}; use mars_testing::MockEnvParams; use mars_types::{ error::MarsError, @@ -17,6 +12,11 @@ use mars_types::{ }; use super::helpers::{th_setup, ths_setup_with_epoch_duration}; +use crate::{ + contract::{execute, execute_balance_change, query_user_unclaimed_rewards}, + helpers::{compute_incentive_index, compute_user_accrued_rewards}, + state::{EMISSIONS, INCENTIVE_STATES, USER_ASSET_INDICES, USER_UNCLAIMED_REWARDS}, +}; #[test] fn balance_change_unauthorized() { diff --git a/contracts/incentives/tests/tests/test_claim_rewards.rs b/contracts/incentives/src/tests/claim_rewards.rs similarity index 99% rename from contracts/incentives/tests/tests/test_claim_rewards.rs rename to contracts/incentives/src/tests/claim_rewards.rs index b65b42aa0..398f30621 100644 --- a/contracts/incentives/tests/tests/test_claim_rewards.rs +++ b/contracts/incentives/src/tests/claim_rewards.rs @@ -3,11 +3,6 @@ use cosmwasm_std::{ testing::{mock_env, mock_info}, Addr, BankMsg, CosmosMsg, Decimal, SubMsg, Timestamp, Uint128, }; -use mars_incentives::{ - contract::{execute, query_user_unclaimed_rewards}, - helpers::{compute_incentive_index, compute_user_accrued_rewards}, - state::{EMISSIONS, INCENTIVE_STATES, USER_ASSET_INDICES, USER_UNCLAIMED_REWARDS}, -}; use mars_testing::MockEnvParams; use mars_types::{ incentives::{ExecuteMsg, IncentiveState}, @@ -16,6 +11,11 @@ use mars_types::{ }; use super::helpers::{th_setup, ths_setup_with_epoch_duration}; +use crate::{ + contract::{execute, query_user_unclaimed_rewards}, + helpers::{compute_incentive_index, compute_user_accrued_rewards}, + state::{EMISSIONS, INCENTIVE_STATES, USER_ASSET_INDICES, USER_UNCLAIMED_REWARDS}, +}; #[test] fn execute_claim_rewards() { diff --git a/contracts/incentives/tests/tests/helpers/mod.rs b/contracts/incentives/src/tests/helpers.rs similarity index 96% rename from contracts/incentives/tests/tests/helpers/mod.rs rename to contracts/incentives/src/tests/helpers.rs index 9fa4a3121..0897bc341 100644 --- a/contracts/incentives/tests/tests/helpers/mod.rs +++ b/contracts/incentives/src/tests/helpers.rs @@ -1,15 +1,14 @@ -#![allow(dead_code)] - use cosmwasm_schema::serde; use cosmwasm_std::{ from_binary, testing::{mock_env, mock_info, MockApi, MockStorage}, Deps, DepsMut, Env, OwnedDeps, Uint128, }; -use mars_incentives::contract::{execute, instantiate, query}; use mars_testing::{mock_dependencies, MarsMockQuerier}; use mars_types::incentives::{ExecuteMsg, InstantiateMsg, QueryMsg}; +use crate::contract::{execute, instantiate, query}; + pub fn th_setup() -> OwnedDeps { th_setup_with_env(mock_env()) } diff --git a/contracts/incentives/tests/tests/test_indices_usage.rs b/contracts/incentives/src/tests/indices_usage.rs similarity index 99% rename from contracts/incentives/tests/tests/test_indices_usage.rs rename to contracts/incentives/src/tests/indices_usage.rs index 0d44f41da..c3319abe3 100644 --- a/contracts/incentives/tests/tests/test_indices_usage.rs +++ b/contracts/incentives/src/tests/indices_usage.rs @@ -2,14 +2,15 @@ use cosmwasm_std::{ testing::MockStorage, Addr, Decimal, OverflowError, OverflowOperation, StdError, Storage, Uint128, }; -use mars_incentives::{ +use mars_types::incentives::{Config, IncentiveState}; + +use crate::{ helpers::{ compute_incentive_index, compute_user_accrued_rewards, update_incentive_index, MaybeMutStorage, }, state::{CONFIG, EMISSIONS, EPOCH_DURATION, INCENTIVE_STATES}, }; -use mars_types::incentives::{Config, IncentiveState}; fn store_config_with_epoch_duration(storage: &mut dyn Storage, epoch_duration: u64) { CONFIG diff --git a/contracts/incentives/tests/tests/test_migration_v2.rs b/contracts/incentives/src/tests/migration_v2.rs similarity index 99% rename from contracts/incentives/tests/tests/test_migration_v2.rs rename to contracts/incentives/src/tests/migration_v2.rs index bc4eafa8d..5cf8aa707 100644 --- a/contracts/incentives/tests/tests/test_migration_v2.rs +++ b/contracts/incentives/src/tests/migration_v2.rs @@ -6,7 +6,15 @@ use cosmwasm_std::{ Addr, Decimal, Event, Order, StdResult, Timestamp, Uint128, }; use cw2::{ContractVersion, VersionError}; -use mars_incentives::{ +use mars_testing::{mock_dependencies, MockEnvParams}; +use mars_types::{ + incentives::{Config, ExecuteMsg, IncentiveState, MigrateMsg, MigrateV1ToV2}, + keys::{UserId, UserIdKey}, + red_bank::{Market, UserCollateralResponse}, +}; +use mars_utils::error::GuardError; + +use crate::{ contract::{execute, migrate}, migrations::v2_0_0::v1_state::{self, OwnerSetNoneProposed}, state::{ @@ -15,13 +23,6 @@ use mars_incentives::{ }, ContractError, }; -use mars_testing::{mock_dependencies, MockEnvParams}; -use mars_types::{ - incentives::{Config, ExecuteMsg, IncentiveState, MigrateMsg, MigrateV1ToV2}, - keys::{UserId, UserIdKey}, - red_bank::{Market, UserCollateralResponse}, -}; -use mars_utils::error::GuardError; #[test] fn wrong_contract_name() { diff --git a/contracts/incentives/src/tests/mod.rs b/contracts/incentives/src/tests/mod.rs new file mode 100644 index 000000000..220b0c4e1 --- /dev/null +++ b/contracts/incentives/src/tests/mod.rs @@ -0,0 +1,10 @@ +mod admin; +mod balance_change; +mod claim_rewards; +mod helpers; +mod indices_usage; +mod migration_v2; +mod querying; +mod set_asset_incentive; +mod update_owner; +mod whitelist; diff --git a/contracts/incentives/tests/tests/test_quering.rs b/contracts/incentives/src/tests/querying.rs similarity index 99% rename from contracts/incentives/tests/tests/test_quering.rs rename to contracts/incentives/src/tests/querying.rs index 2f1b20d75..d58c54210 100644 --- a/contracts/incentives/tests/tests/test_quering.rs +++ b/contracts/incentives/src/tests/querying.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{Decimal, Timestamp, Uint128}; -use mars_incentives::state::{EMISSIONS, INCENTIVE_STATES}; use mars_testing::{mock_env, MockEnvParams}; use mars_types::incentives::{ ActiveEmission, EmissionResponse, IncentiveState, IncentiveStateResponse, QueryMsg, @@ -7,6 +6,7 @@ use mars_types::incentives::{ use test_case::test_case; use super::helpers::{th_query, th_query_with_env, th_setup}; +use crate::state::{EMISSIONS, INCENTIVE_STATES}; #[test] fn query_incentive_state() { diff --git a/contracts/incentives/tests/tests/test_set_asset_incentive.rs b/contracts/incentives/src/tests/set_asset_incentive.rs similarity index 99% rename from contracts/incentives/tests/tests/test_set_asset_incentive.rs rename to contracts/incentives/src/tests/set_asset_incentive.rs index d3dac87c4..a9e853be6 100644 --- a/contracts/incentives/tests/tests/test_set_asset_incentive.rs +++ b/contracts/incentives/src/tests/set_asset_incentive.rs @@ -3,11 +3,6 @@ use cosmwasm_std::{ testing::{mock_env, mock_info}, Decimal, StdResult, Timestamp, Uint128, }; -use mars_incentives::{ - contract::execute, - state::{EMISSIONS, INCENTIVE_STATES}, - ContractError, -}; use mars_testing::MockEnvParams; use mars_types::{incentives::ExecuteMsg, red_bank::Market}; use mars_utils::error::ValidationError; @@ -15,6 +10,11 @@ use mars_utils::error::ValidationError; use super::helpers::{ th_setup, th_setup_with_env, th_whitelist_denom, ths_setup_with_epoch_duration, }; +use crate::{ + contract::execute, + state::{EMISSIONS, INCENTIVE_STATES}, + ContractError, +}; const ONE_WEEK_IN_SECS: u64 = 604800; @@ -476,7 +476,7 @@ fn incorrect_denom_deposit() { assert_eq!( err, - mars_incentives::ContractError::InvalidFunds { + ContractError::InvalidFunds { expected: coin(total_emissions, incentive_denom), } ); diff --git a/contracts/incentives/tests/tests/test_update_owner.rs b/contracts/incentives/src/tests/update_owner.rs similarity index 97% rename from contracts/incentives/tests/tests/test_update_owner.rs rename to contracts/incentives/src/tests/update_owner.rs index a91020c20..98ca12c1b 100644 --- a/contracts/incentives/tests/tests/test_update_owner.rs +++ b/contracts/incentives/src/tests/update_owner.rs @@ -1,9 +1,9 @@ use cosmwasm_std::testing::{mock_env, mock_info}; -use mars_incentives::{contract::execute, ContractError}; use mars_owner::{OwnerError::NotOwner, OwnerUpdate}; use mars_types::incentives::{ConfigResponse, ExecuteMsg, QueryMsg}; use super::helpers::{th_query, th_setup}; +use crate::{contract::execute, ContractError}; #[test] fn initialized_state() { diff --git a/contracts/incentives/tests/tests/test_whitelist.rs b/contracts/incentives/src/tests/whitelist.rs similarity index 99% rename from contracts/incentives/tests/tests/test_whitelist.rs rename to contracts/incentives/src/tests/whitelist.rs index cff866681..5496cd91c 100644 --- a/contracts/incentives/tests/tests/test_whitelist.rs +++ b/contracts/incentives/src/tests/whitelist.rs @@ -3,11 +3,6 @@ use cosmwasm_std::{ testing::{mock_env, mock_info}, Addr, Coin, Timestamp, Uint128, }; -use mars_incentives::{ - contract::{execute, execute_balance_change}, - state::{EMISSIONS, WHITELIST_COUNT}, - ContractError, -}; use mars_owner::OwnerError::NotOwner; use mars_testing::MockEnvParams; use mars_types::{ @@ -19,6 +14,11 @@ use mars_utils::error::ValidationError; use super::helpers::{ th_query, th_query_with_env, th_setup, th_setup_with_env, ths_setup_with_epoch_duration, }; +use crate::{ + contract::{execute, execute_balance_change}, + state::{EMISSIONS, WHITELIST_COUNT}, + ContractError, +}; #[test] fn initialized_state() { diff --git a/contracts/incentives/tests/all_tests.rs b/contracts/incentives/tests/all_tests.rs deleted file mode 100644 index 14f00389d..000000000 --- a/contracts/incentives/tests/all_tests.rs +++ /dev/null @@ -1 +0,0 @@ -mod tests; diff --git a/contracts/incentives/tests/tests/mod.rs b/contracts/incentives/tests/tests/mod.rs deleted file mode 100644 index e95d9f695..000000000 --- a/contracts/incentives/tests/tests/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -mod helpers; - -mod test_admin; -mod test_balance_change; -mod test_claim_rewards; -mod test_indices_usage; -mod test_migration_v2; -mod test_quering; -mod test_set_asset_incentive; -mod test_update_owner; -mod test_whitelist; diff --git a/contracts/params/src/lib.rs b/contracts/params/src/lib.rs index 7d346e7ee..1402e5f82 100644 --- a/contracts/params/src/lib.rs +++ b/contracts/params/src/lib.rs @@ -4,3 +4,5 @@ pub mod error; pub mod execute; pub mod query; pub mod state; +#[cfg(test)] +mod tests; diff --git a/contracts/params/tests/tests/test_asset_validation.rs b/contracts/params/src/tests/asset_validation.rs similarity index 99% rename from contracts/params/tests/tests/test_asset_validation.rs rename to contracts/params/src/tests/asset_validation.rs index 13a72c92d..3c28602d4 100644 --- a/contracts/params/tests/tests/test_asset_validation.rs +++ b/contracts/params/src/tests/asset_validation.rs @@ -1,7 +1,6 @@ use std::str::FromStr; use cosmwasm_std::Decimal; -use mars_params::error::ContractError; use mars_types::{ error::MarsError::Validation, params::{AssetParamsUpdate, HlsAssetType, HlsParamsUnchecked}, @@ -9,6 +8,7 @@ use mars_types::{ use mars_utils::error::ValidationError::{InvalidDenom, InvalidParam}; use super::helpers::{assert_err, default_asset_params, MockEnv}; +use crate::error::ContractError; #[test] fn denom_must_be_native() { diff --git a/contracts/params/tests/tests/test_deposit_cap.rs b/contracts/params/src/tests/deposit_cap.rs similarity index 99% rename from contracts/params/tests/tests/test_deposit_cap.rs rename to contracts/params/src/tests/deposit_cap.rs index d4f47290f..cd2c723c3 100644 --- a/contracts/params/tests/tests/test_deposit_cap.rs +++ b/contracts/params/src/tests/deposit_cap.rs @@ -2,10 +2,6 @@ use std::str::FromStr; use cosmwasm_std::{coins, Addr, Decimal, Uint128}; use mars_interest_rate::get_underlying_liquidity_amount; -use mars_params::{ - query::query_total_deposit, - state::{ADDRESS_PROVIDER, ASSET_PARAMS}, -}; use mars_testing::{mock_dependencies, mock_env_at_block_time}; use mars_types::{ params::TotalDepositResponse, @@ -14,6 +10,10 @@ use mars_types::{ use test_case::test_case; use super::helpers::default_asset_params; +use crate::{ + query::query_total_deposit, + state::{ADDRESS_PROVIDER, ASSET_PARAMS}, +}; const CREDIT_MANAGER: &str = "credit_manager"; const MOCK_DENOM: &str = "utoken"; diff --git a/contracts/params/tests/tests/test_emergency_powers.rs b/contracts/params/src/tests/emergency_powers.rs similarity index 99% rename from contracts/params/tests/tests/test_emergency_powers.rs rename to contracts/params/src/tests/emergency_powers.rs index 7859eada0..85227525e 100644 --- a/contracts/params/tests/tests/test_emergency_powers.rs +++ b/contracts/params/src/tests/emergency_powers.rs @@ -1,12 +1,12 @@ use cosmwasm_std::Addr; use mars_owner::OwnerError; -use mars_params::error::ContractError::Owner; use mars_types::params::{ AssetParamsUpdate, CmEmergencyUpdate, EmergencyUpdate, RedBankEmergencyUpdate, VaultConfigUpdate, }; use super::helpers::{assert_err, default_asset_params, default_vault_config, MockEnv}; +use crate::error::ContractError::Owner; #[test] fn only_owner_can_invoke_emergency_powers() { diff --git a/contracts/params/tests/tests/helpers/assertions.rs b/contracts/params/src/tests/helpers/assertions.rs similarity index 94% rename from contracts/params/tests/tests/helpers/assertions.rs rename to contracts/params/src/tests/helpers/assertions.rs index 857060fd9..a99bf489d 100644 --- a/contracts/params/tests/tests/helpers/assertions.rs +++ b/contracts/params/src/tests/helpers/assertions.rs @@ -2,7 +2,8 @@ use std::{collections::HashSet, hash::Hash}; use anyhow::Result as AnyResult; use cw_multi_test::AppResponse; -use mars_params::error::ContractError; + +use crate::error::ContractError; pub fn assert_err(res: AnyResult, err: ContractError) { match res { diff --git a/contracts/params/tests/tests/helpers/contracts.rs b/contracts/params/src/tests/helpers/contracts.rs similarity index 62% rename from contracts/params/tests/tests/helpers/contracts.rs rename to contracts/params/src/tests/helpers/contracts.rs index 52c2cfef9..db33128d8 100644 --- a/contracts/params/tests/tests/helpers/contracts.rs +++ b/contracts/params/src/tests/helpers/contracts.rs @@ -3,9 +3,9 @@ use cw_multi_test::{Contract, ContractWrapper}; pub fn mock_params_contract() -> Box> { let contract = ContractWrapper::new( - mars_params::contract::execute, - mars_params::contract::instantiate, - mars_params::contract::query, + crate::contract::execute, + crate::contract::instantiate, + crate::contract::query, ); Box::new(contract) } diff --git a/contracts/params/tests/tests/helpers/generator.rs b/contracts/params/src/tests/helpers/generator.rs similarity index 100% rename from contracts/params/tests/tests/helpers/generator.rs rename to contracts/params/src/tests/helpers/generator.rs diff --git a/contracts/params/tests/tests/helpers/mock_env.rs b/contracts/params/src/tests/helpers/mock_env.rs similarity index 100% rename from contracts/params/tests/tests/helpers/mock_env.rs rename to contracts/params/src/tests/helpers/mock_env.rs diff --git a/contracts/params/tests/tests/helpers/mod.rs b/contracts/params/src/tests/helpers/mod.rs similarity index 100% rename from contracts/params/tests/tests/helpers/mod.rs rename to contracts/params/src/tests/helpers/mod.rs diff --git a/contracts/params/src/tests/mod.rs b/contracts/params/src/tests/mod.rs new file mode 100644 index 000000000..5a92faa41 --- /dev/null +++ b/contracts/params/src/tests/mod.rs @@ -0,0 +1,10 @@ +mod asset_validation; +mod deposit_cap; +mod emergency_powers; +mod helpers; +mod owner; +mod target_health_factor; +mod update_asset_params; +mod update_config; +mod vault_validation; +mod vaults; diff --git a/contracts/params/tests/tests/test_owner.rs b/contracts/params/src/tests/owner.rs similarity index 96% rename from contracts/params/tests/tests/test_owner.rs rename to contracts/params/src/tests/owner.rs index 79ca8aaa6..1ced3f1d6 100644 --- a/contracts/params/tests/tests/test_owner.rs +++ b/contracts/params/src/tests/owner.rs @@ -1,8 +1,8 @@ use cosmwasm_std::Addr; use mars_owner::{OwnerError, OwnerUpdate}; -use mars_params::error::ContractError::Owner; use super::helpers::{assert_err, MockEnv}; +use crate::error::ContractError::Owner; #[test] fn owner_set_on_init() { diff --git a/contracts/params/tests/tests/test_target_health_factor.rs b/contracts/params/src/tests/target_health_factor.rs similarity index 97% rename from contracts/params/tests/tests/test_target_health_factor.rs rename to contracts/params/src/tests/target_health_factor.rs index 9eaa6f1ee..11aeb5d23 100644 --- a/contracts/params/tests/tests/test_target_health_factor.rs +++ b/contracts/params/src/tests/target_health_factor.rs @@ -2,10 +2,10 @@ use std::str::FromStr; use cosmwasm_std::{Addr, Decimal}; use mars_owner::OwnerError; -use mars_params::error::ContractError::{Owner, Validation}; use mars_utils::error::ValidationError::InvalidParam; use super::helpers::{assert_err, MockEnv}; +use crate::error::ContractError::{Owner, Validation}; #[test] fn thf_set_on_init() { diff --git a/contracts/params/tests/tests/test_update_asset_params.rs b/contracts/params/src/tests/update_asset_params.rs similarity index 99% rename from contracts/params/tests/tests/test_update_asset_params.rs rename to contracts/params/src/tests/update_asset_params.rs index 14d514c5b..4f22faaab 100644 --- a/contracts/params/tests/tests/test_update_asset_params.rs +++ b/contracts/params/src/tests/update_asset_params.rs @@ -1,9 +1,9 @@ use cosmwasm_std::Addr; use mars_owner::OwnerError; -use mars_params::error::ContractError::Owner; use mars_types::params::AssetParamsUpdate; use super::helpers::{assert_contents_equal, assert_err, default_asset_params, MockEnv}; +use crate::error::ContractError::Owner; #[test] fn initial_state_of_params() { diff --git a/contracts/params/tests/tests/test_update_config.rs b/contracts/params/src/tests/update_config.rs similarity index 96% rename from contracts/params/tests/tests/test_update_config.rs rename to contracts/params/src/tests/update_config.rs index e93f0b3ea..ea9342d4d 100644 --- a/contracts/params/tests/tests/test_update_config.rs +++ b/contracts/params/src/tests/update_config.rs @@ -1,8 +1,8 @@ use cosmwasm_std::Addr; use mars_owner::OwnerError; -use mars_params::error::ContractError::Owner; use super::helpers::{assert_err, MockEnv}; +use crate::error::ContractError::Owner; #[test] fn address_provider_set_on_init() { diff --git a/contracts/params/tests/tests/test_vault_validation.rs b/contracts/params/src/tests/vault_validation.rs similarity index 99% rename from contracts/params/tests/tests/test_vault_validation.rs rename to contracts/params/src/tests/vault_validation.rs index 167f0fafc..a06b2db07 100644 --- a/contracts/params/tests/tests/test_vault_validation.rs +++ b/contracts/params/src/tests/vault_validation.rs @@ -1,7 +1,6 @@ use std::str::FromStr; use cosmwasm_std::{Decimal, StdError::GenericErr}; -use mars_params::error::ContractError; use mars_types::{ error::MarsError::{Std, Validation}, params::{HlsParamsUnchecked, VaultConfigUpdate}, @@ -9,6 +8,7 @@ use mars_types::{ use mars_utils::error::ValidationError::InvalidParam; use super::helpers::{assert_err, default_vault_config, MockEnv}; +use crate::error::ContractError; #[test] fn vault_addr_must_be_valid() { diff --git a/contracts/params/tests/tests/test_vaults.rs b/contracts/params/src/tests/vaults.rs similarity index 99% rename from contracts/params/tests/tests/test_vaults.rs rename to contracts/params/src/tests/vaults.rs index 3d65704b4..70d93f04b 100644 --- a/contracts/params/tests/tests/test_vaults.rs +++ b/contracts/params/src/tests/vaults.rs @@ -2,10 +2,10 @@ use std::str::FromStr; use cosmwasm_std::{Addr, Decimal}; use mars_owner::OwnerError; -use mars_params::error::ContractError::Owner; use mars_types::params::{VaultConfigUnchecked, VaultConfigUpdate}; use super::helpers::{assert_contents_equal, assert_err, default_vault_config, MockEnv}; +use crate::error::ContractError::Owner; #[test] fn initial_state_of_vault_configs() { diff --git a/contracts/params/tests/all_tests.rs b/contracts/params/tests/all_tests.rs deleted file mode 100644 index 14f00389d..000000000 --- a/contracts/params/tests/all_tests.rs +++ /dev/null @@ -1 +0,0 @@ -mod tests; diff --git a/contracts/params/tests/tests/mod.rs b/contracts/params/tests/tests/mod.rs deleted file mode 100644 index 4465a43bd..000000000 --- a/contracts/params/tests/tests/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -mod helpers; - -mod test_asset_validation; -mod test_deposit_cap; -mod test_emergency_powers; -mod test_owner; -mod test_target_health_factor; -mod test_update_asset_params; -mod test_update_config; -mod test_vault_validation; -mod test_vaults; diff --git a/contracts/rewards-collector/osmosis/src/lib.rs b/contracts/rewards-collector/osmosis/src/lib.rs index 93f9b1560..17886afdb 100644 --- a/contracts/rewards-collector/osmosis/src/lib.rs +++ b/contracts/rewards-collector/osmosis/src/lib.rs @@ -1,4 +1,6 @@ pub mod migrations; +#[cfg(test)] +mod tests; #[cfg(not(feature = "library"))] pub mod entry { diff --git a/contracts/rewards-collector/osmosis/tests/tests/test_admin.rs b/contracts/rewards-collector/osmosis/src/tests/admin.rs similarity index 98% rename from contracts/rewards-collector/osmosis/tests/tests/test_admin.rs rename to contracts/rewards-collector/osmosis/src/tests/admin.rs index 4c08242f8..ae8e647e8 100644 --- a/contracts/rewards-collector/osmosis/tests/tests/test_admin.rs +++ b/contracts/rewards-collector/osmosis/src/tests/admin.rs @@ -1,7 +1,6 @@ use cosmwasm_std::{testing::mock_env, Decimal}; use mars_owner::OwnerError::NotOwner; use mars_rewards_collector_base::ContractError; -use mars_rewards_collector_osmosis::entry::{execute, instantiate}; use mars_testing::mock_info; use mars_types::rewards_collector::{ConfigResponse, ExecuteMsg, QueryMsg, UpdateConfig}; use mars_utils::error::ValidationError; @@ -10,6 +9,7 @@ use super::{ helpers, helpers::{mock_config, mock_instantiate_msg}, }; +use crate::entry::{execute, instantiate}; #[test] fn instantiating() { diff --git a/contracts/rewards-collector/osmosis/tests/tests/test_distribute_rewards.rs b/contracts/rewards-collector/osmosis/src/tests/distribute_rewards.rs similarity index 97% rename from contracts/rewards-collector/osmosis/tests/tests/test_distribute_rewards.rs rename to contracts/rewards-collector/osmosis/src/tests/distribute_rewards.rs index b5f52d9a3..6624e8043 100644 --- a/contracts/rewards-collector/osmosis/tests/tests/test_distribute_rewards.rs +++ b/contracts/rewards-collector/osmosis/src/tests/distribute_rewards.rs @@ -2,11 +2,11 @@ use cosmwasm_std::{ coin, testing::mock_env, CosmosMsg, IbcMsg, IbcTimeout, SubMsg, Timestamp, Uint128, }; use mars_rewards_collector_base::ContractError; -use mars_rewards_collector_osmosis::entry::execute; use mars_testing::{mock_env as mock_env_at_height_and_time, mock_info, MockEnvParams}; use mars_types::rewards_collector::ExecuteMsg; use super::helpers; +use crate::entry::execute; #[test] fn distributing_rewards() { diff --git a/contracts/rewards-collector/osmosis/tests/tests/helpers/mod.rs b/contracts/rewards-collector/osmosis/src/tests/helpers.rs similarity index 98% rename from contracts/rewards-collector/osmosis/tests/tests/helpers/mod.rs rename to contracts/rewards-collector/osmosis/src/tests/helpers.rs index 1a42ae2ae..17289d38e 100644 --- a/contracts/rewards-collector/osmosis/tests/tests/helpers/mod.rs +++ b/contracts/rewards-collector/osmosis/src/tests/helpers.rs @@ -6,11 +6,12 @@ use cosmwasm_std::{ Coin, Decimal, Deps, OwnedDeps, }; use mars_osmosis::BalancerPool; -use mars_rewards_collector_osmosis::entry; use mars_testing::{mock_info, MarsMockQuerier}; use mars_types::rewards_collector::{Config, InstantiateMsg, QueryMsg}; use osmosis_std::types::osmosis::{gamm::v1beta1::PoolAsset, poolmanager::v1beta1::PoolResponse}; +use crate::entry; + pub fn mock_instantiate_msg() -> InstantiateMsg { InstantiateMsg { owner: "owner".to_string(), diff --git a/contracts/rewards-collector/osmosis/tests/tests/test_migration_v2.rs b/contracts/rewards-collector/osmosis/src/tests/migration_v2.rs similarity index 99% rename from contracts/rewards-collector/osmosis/tests/tests/test_migration_v2.rs rename to contracts/rewards-collector/osmosis/src/tests/migration_v2.rs index 2a84c5cc6..22a743729 100644 --- a/contracts/rewards-collector/osmosis/tests/tests/test_migration_v2.rs +++ b/contracts/rewards-collector/osmosis/src/tests/migration_v2.rs @@ -1,11 +1,12 @@ use cosmwasm_std::{attr, testing::mock_env, Addr, Decimal, Empty, Event}; use cw2::{ContractVersion, VersionError}; use mars_rewards_collector_base::ContractError; -use mars_rewards_collector_osmosis::{ +use mars_testing::mock_dependencies; + +use crate::{ entry::{migrate, OsmosisCollector}, migrations::v2_0_0::v1_state::{self, OwnerSetNoneProposed}, }; -use mars_testing::mock_dependencies; #[test] fn wrong_contract_name() { diff --git a/contracts/rewards-collector/osmosis/src/tests/mod.rs b/contracts/rewards-collector/osmosis/src/tests/mod.rs new file mode 100644 index 000000000..fb6700011 --- /dev/null +++ b/contracts/rewards-collector/osmosis/src/tests/mod.rs @@ -0,0 +1,7 @@ +mod admin; +mod distribute_rewards; +mod helpers; +mod migration_v2; +mod swap; +mod update_owner; +mod withdraw; diff --git a/contracts/rewards-collector/osmosis/tests/tests/test_swap.rs b/contracts/rewards-collector/osmosis/src/tests/swap.rs similarity index 99% rename from contracts/rewards-collector/osmosis/tests/tests/test_swap.rs rename to contracts/rewards-collector/osmosis/src/tests/swap.rs index 56ccb5b92..a6b10fcf8 100644 --- a/contracts/rewards-collector/osmosis/tests/tests/test_swap.rs +++ b/contracts/rewards-collector/osmosis/src/tests/swap.rs @@ -1,7 +1,6 @@ use cosmwasm_std::{ coin, testing::mock_env, to_binary, CosmosMsg, Decimal, Empty, SubMsg, Uint128, WasmMsg, }; -use mars_rewards_collector_osmosis::entry::execute; use mars_testing::mock_info; use mars_types::{ rewards_collector::{ConfigResponse, ExecuteMsg, QueryMsg}, @@ -10,6 +9,7 @@ use mars_types::{ use osmosis_std::types::osmosis::twap::v1beta1::ArithmeticTwapToNowResponse; use super::{helpers, helpers::mock_instantiate_msg}; +use crate::entry::execute; #[test] fn swapping_asset() { diff --git a/contracts/rewards-collector/osmosis/tests/tests/test_update_owner.rs b/contracts/rewards-collector/osmosis/src/tests/update_owner.rs similarity index 97% rename from contracts/rewards-collector/osmosis/tests/tests/test_update_owner.rs rename to contracts/rewards-collector/osmosis/src/tests/update_owner.rs index f04ce4a1b..a9840d428 100644 --- a/contracts/rewards-collector/osmosis/tests/tests/test_update_owner.rs +++ b/contracts/rewards-collector/osmosis/src/tests/update_owner.rs @@ -1,10 +1,10 @@ use cosmwasm_std::testing::{mock_env, mock_info}; use mars_owner::{OwnerError::NotOwner, OwnerUpdate}; use mars_rewards_collector_base::ContractError; -use mars_rewards_collector_osmosis::entry::execute; use mars_types::rewards_collector::{ConfigResponse, ExecuteMsg, QueryMsg}; use super::helpers::{query, setup_test}; +use crate::entry::execute; #[test] fn initialized_state() { diff --git a/contracts/rewards-collector/osmosis/tests/tests/test_withdraw.rs b/contracts/rewards-collector/osmosis/src/tests/withdraw.rs similarity index 98% rename from contracts/rewards-collector/osmosis/tests/tests/test_withdraw.rs rename to contracts/rewards-collector/osmosis/src/tests/withdraw.rs index d25baa6cf..4446f4ae6 100644 --- a/contracts/rewards-collector/osmosis/tests/tests/test_withdraw.rs +++ b/contracts/rewards-collector/osmosis/src/tests/withdraw.rs @@ -1,6 +1,5 @@ use cosmwasm_std::{testing::mock_env, to_binary, CosmosMsg, Decimal, SubMsg, Uint128, WasmMsg}; use mars_rewards_collector_base::ContractError; -use mars_rewards_collector_osmosis::entry::execute; use mars_testing::mock_info; use mars_types::{ credit_manager::{self, Action, ActionAmount, ActionCoin}, @@ -8,6 +7,7 @@ use mars_types::{ }; use super::helpers; +use crate::entry::execute; #[test] fn withdrawing_from_red_bank() { diff --git a/contracts/rewards-collector/osmosis/tests/all_tests.rs b/contracts/rewards-collector/osmosis/tests/all_tests.rs deleted file mode 100644 index 14f00389d..000000000 --- a/contracts/rewards-collector/osmosis/tests/all_tests.rs +++ /dev/null @@ -1 +0,0 @@ -mod tests; diff --git a/contracts/rewards-collector/osmosis/tests/tests/mod.rs b/contracts/rewards-collector/osmosis/tests/tests/mod.rs deleted file mode 100644 index da32dc68a..000000000 --- a/contracts/rewards-collector/osmosis/tests/tests/mod.rs +++ /dev/null @@ -1,8 +0,0 @@ -mod helpers; - -mod test_admin; -mod test_distribute_rewards; -mod test_migration_v2; -mod test_swap; -mod test_update_owner; -mod test_withdraw; diff --git a/contracts/v2-zapper/osmosis/src/lib.rs b/contracts/v2-zapper/osmosis/src/lib.rs index e6ab3aff8..e12ac5a88 100644 --- a/contracts/v2-zapper/osmosis/src/lib.rs +++ b/contracts/v2-zapper/osmosis/src/lib.rs @@ -1,3 +1,5 @@ pub mod contract; pub mod lp_pool; pub mod migrations; +#[cfg(test)] +mod tests; diff --git a/contracts/v2-zapper/osmosis/tests/test_callback.rs b/contracts/v2-zapper/osmosis/src/tests/callback.rs similarity index 92% rename from contracts/v2-zapper/osmosis/tests/test_callback.rs rename to contracts/v2-zapper/osmosis/src/tests/callback.rs index f16df5295..4ea56da11 100644 --- a/contracts/v2-zapper/osmosis/tests/test_callback.rs +++ b/contracts/v2-zapper/osmosis/src/tests/callback.rs @@ -3,9 +3,7 @@ use mars_types::zapper::{CallbackMsg, ExecuteMsg}; use mars_zapper_base::ContractError; use osmosis_test_tube::{Account, Module, OsmosisTestApp, Wasm}; -use crate::helpers::{assert_err, instantiate_contract}; - -pub mod helpers; +use super::helpers::{assert_err, instantiate_contract}; #[test] fn only_contract_itself_can_callback() { diff --git a/contracts/v2-zapper/osmosis/tests/helpers/utils.rs b/contracts/v2-zapper/osmosis/src/tests/helpers.rs similarity index 100% rename from contracts/v2-zapper/osmosis/tests/helpers/utils.rs rename to contracts/v2-zapper/osmosis/src/tests/helpers.rs diff --git a/contracts/v2-zapper/osmosis/tests/test_migration.rs b/contracts/v2-zapper/osmosis/src/tests/migration.rs similarity index 97% rename from contracts/v2-zapper/osmosis/tests/test_migration.rs rename to contracts/v2-zapper/osmosis/src/tests/migration.rs index bd094d251..92d692138 100644 --- a/contracts/v2-zapper/osmosis/tests/test_migration.rs +++ b/contracts/v2-zapper/osmosis/src/tests/migration.rs @@ -5,9 +5,8 @@ use cosmwasm_std::{ }; use cw2::{get_contract_version, set_contract_version, ContractVersion, VersionError}; use mars_zapper_base::ContractError; -use mars_zapper_osmosis::contract::migrate; -pub mod helpers; +use crate::contract::migrate; #[test] fn invalid_contract_name() { diff --git a/contracts/v2-zapper/osmosis/src/tests/mod.rs b/contracts/v2-zapper/osmosis/src/tests/mod.rs new file mode 100644 index 000000000..d176da75e --- /dev/null +++ b/contracts/v2-zapper/osmosis/src/tests/mod.rs @@ -0,0 +1,6 @@ +mod callback; +mod helpers; +mod migration; +mod provide_liquidity; +mod queries; +mod withdraw_liquidity; diff --git a/contracts/v2-zapper/osmosis/tests/test_provide_liquidity.rs b/contracts/v2-zapper/osmosis/src/tests/provide_liquidity.rs similarity index 99% rename from contracts/v2-zapper/osmosis/tests/test_provide_liquidity.rs rename to contracts/v2-zapper/osmosis/src/tests/provide_liquidity.rs index a767d2bcb..a9fcc1126 100644 --- a/contracts/v2-zapper/osmosis/tests/test_provide_liquidity.rs +++ b/contracts/v2-zapper/osmosis/src/tests/provide_liquidity.rs @@ -3,9 +3,7 @@ use cw_dex::CwDexError; use mars_types::zapper::{ExecuteMsg, QueryMsg}; use osmosis_test_tube::{Account, Bank, FeeSetting, Gamm, Module, OsmosisTestApp, Wasm}; -use crate::helpers::{assert_err, instantiate_contract, query_balance}; - -pub mod helpers; +use super::helpers::{assert_err, instantiate_contract, query_balance}; #[test] fn provide_liquidity_with_invalid_lp_token() { diff --git a/contracts/v2-zapper/osmosis/tests/test_queries.rs b/contracts/v2-zapper/osmosis/src/tests/queries.rs similarity index 98% rename from contracts/v2-zapper/osmosis/tests/test_queries.rs rename to contracts/v2-zapper/osmosis/src/tests/queries.rs index 62676dc49..f13cd26c2 100644 --- a/contracts/v2-zapper/osmosis/tests/test_queries.rs +++ b/contracts/v2-zapper/osmosis/src/tests/queries.rs @@ -5,9 +5,7 @@ use cw_dex::CwDexError; use mars_types::zapper::QueryMsg; use osmosis_test_tube::{Gamm, Module, OsmosisTestApp, Wasm}; -use crate::helpers::{assert_err, instantiate_contract}; - -pub mod helpers; +use super::helpers::{assert_err, instantiate_contract}; #[test] fn estimate_provide_liquidity_with_invalid_lp_token() { diff --git a/contracts/v2-zapper/osmosis/tests/test_withdraw_liquidity.rs b/contracts/v2-zapper/osmosis/src/tests/withdraw_liquidity.rs similarity index 99% rename from contracts/v2-zapper/osmosis/tests/test_withdraw_liquidity.rs rename to contracts/v2-zapper/osmosis/src/tests/withdraw_liquidity.rs index 901ea01ef..0108e7972 100644 --- a/contracts/v2-zapper/osmosis/tests/test_withdraw_liquidity.rs +++ b/contracts/v2-zapper/osmosis/src/tests/withdraw_liquidity.rs @@ -5,9 +5,7 @@ use mars_types::zapper::{ExecuteMsg, QueryMsg}; use mars_zapper_base::ContractError; use osmosis_test_tube::{Account, Bank, Gamm, Module, OsmosisTestApp, Wasm}; -use crate::helpers::{assert_err, instantiate_contract, query_balance}; - -pub mod helpers; +use super::helpers::{assert_err, instantiate_contract, query_balance}; #[test] fn withdraw_liquidity_without_funds() { diff --git a/contracts/v2-zapper/osmosis/tests/helpers/mod.rs b/contracts/v2-zapper/osmosis/tests/helpers/mod.rs deleted file mode 100644 index 4141203e2..000000000 --- a/contracts/v2-zapper/osmosis/tests/helpers/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub use self::utils::*; - -mod utils; diff --git a/integration-tests/tests/files/Red Bank interest rates.xlsx b/integration-tests/files/Red Bank interest rates.xlsx similarity index 100% rename from integration-tests/tests/files/Red Bank interest rates.xlsx rename to integration-tests/files/Red Bank interest rates.xlsx diff --git a/integration-tests/tests/files/stride-artifacts/151_stride_redemption_rate.wasm b/integration-tests/files/stride-artifacts/151_stride_redemption_rate.wasm similarity index 100% rename from integration-tests/tests/files/stride-artifacts/151_stride_redemption_rate.wasm rename to integration-tests/files/stride-artifacts/151_stride_redemption_rate.wasm diff --git a/integration-tests/tests/files/stride-artifacts/version.md b/integration-tests/files/stride-artifacts/version.md similarity index 100% rename from integration-tests/tests/files/stride-artifacts/version.md rename to integration-tests/files/stride-artifacts/version.md diff --git a/integration-tests/tests/cosmos_bank.rs b/integration-tests/src/cosmos_bank.rs similarity index 100% rename from integration-tests/tests/cosmos_bank.rs rename to integration-tests/src/cosmos_bank.rs diff --git a/integration-tests/tests/helpers.rs b/integration-tests/src/helpers.rs similarity index 98% rename from integration-tests/tests/helpers.rs rename to integration-tests/src/helpers.rs index bad1484c5..a7a32185b 100644 --- a/integration-tests/tests/helpers.rs +++ b/integration-tests/src/helpers.rs @@ -161,9 +161,7 @@ pub mod osmosis { where M: ?Sized + Serialize, { - let path = - "../integration-tests/tests/files/stride-artifacts/151_stride_redemption_rate.wasm" - .to_string(); + let path = "./files/stride-artifacts/151_stride_redemption_rate.wasm".to_string(); println!("Trying to read wasm file: {}", path); let wasm_byte_code = std::fs::read(path).unwrap(); let code_id = wasm.store_code(&wasm_byte_code, None, owner).unwrap().data.code_id; diff --git a/integration-tests/tests/test_incentives.rs b/integration-tests/src/incentives.rs similarity index 99% rename from integration-tests/tests/test_incentives.rs rename to integration-tests/src/incentives.rs index ee0a30985..bb5130001 100644 --- a/integration-tests/tests/test_incentives.rs +++ b/integration-tests/src/incentives.rs @@ -3,8 +3,6 @@ use mars_testing::integration::mock_env::MockEnvBuilder; use crate::helpers::default_asset_params; -mod helpers; - const ONE_WEEK_IN_SEC: u64 = 604800; // Note: The incentives rewards for an individual is calculated as follows: diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs index 8b1378917..aecacc0ff 100644 --- a/integration-tests/src/lib.rs +++ b/integration-tests/src/lib.rs @@ -1 +1,14 @@ - +#[cfg(test)] +mod cosmos_bank; +#[cfg(test)] +mod helpers; +#[cfg(test)] +mod incentives; +#[cfg(test)] +mod oracles; +#[cfg(test)] +mod rewards_collector; +#[cfg(test)] +mod rover_flow; +#[cfg(test)] +mod user_flow; diff --git a/integration-tests/tests/test_oracles.rs b/integration-tests/src/oracles.rs similarity index 99% rename from integration-tests/tests/test_oracles.rs rename to integration-tests/src/oracles.rs index 8a10e1b9e..eb3a73123 100644 --- a/integration-tests/tests/test_oracles.rs +++ b/integration-tests/src/oracles.rs @@ -1,7 +1,6 @@ use std::{str::FromStr, time::SystemTime}; use cosmwasm_std::{coin, to_binary, Coin, Decimal, Empty, Isqrt, Uint128}; -use helpers::osmosis::instantiate_stride_contract; use mars_oracle_base::ContractError; use mars_oracle_osmosis::{ msg::PriceSourceResponse, DowntimeDetector, GeometricTwap, OsmosisPriceSourceChecked, @@ -32,12 +31,10 @@ use osmosis_test_tube::{ use crate::helpers::{ default_asset_params, - osmosis::{assert_err, instantiate_contract}, + osmosis::{assert_err, instantiate_contract, instantiate_stride_contract}, swap, swap_to_create_twap_records, }; -mod helpers; - const OSMOSIS_ORACLE_CONTRACT_NAME: &str = "mars-oracle-osmosis"; const OSMOSIS_RED_BANK_CONTRACT_NAME: &str = "mars-red-bank"; const OSMOSIS_ADDR_PROVIDER_CONTRACT_NAME: &str = "mars-address-provider"; diff --git a/integration-tests/tests/test_rewards_collector.rs b/integration-tests/src/rewards_collector.rs similarity index 99% rename from integration-tests/tests/test_rewards_collector.rs rename to integration-tests/src/rewards_collector.rs index 664a0c581..55302b4f3 100644 --- a/integration-tests/tests/test_rewards_collector.rs +++ b/integration-tests/src/rewards_collector.rs @@ -16,9 +16,6 @@ use crate::{ }, }; -mod cosmos_bank; -mod helpers; - const OSMOSIS_ADDR_PROVIDER_CONTRACT_NAME: &str = "mars-address-provider"; const OSMOSIS_REWARDS_CONTRACT_NAME: &str = "mars-rewards-collector-osmosis"; const OSMOSIS_SWAPPER_CONTRACT_NAME: &str = "mars-swapper-osmosis"; diff --git a/integration-tests/tests/test_rover_flow.rs b/integration-tests/src/rover_flow.rs similarity index 99% rename from integration-tests/tests/test_rover_flow.rs rename to integration-tests/src/rover_flow.rs index 4935e2874..c971c87e2 100644 --- a/integration-tests/tests/test_rover_flow.rs +++ b/integration-tests/src/rover_flow.rs @@ -5,8 +5,6 @@ use mars_types::red_bank::UserHealthStatus; use crate::helpers::{assert_red_bank_err, default_asset_params}; -mod helpers; - #[test] fn rover_flow() { let owner = Addr::unchecked("owner"); diff --git a/integration-tests/tests/test_user_flow.rs b/integration-tests/src/user_flow.rs similarity index 99% rename from integration-tests/tests/test_user_flow.rs rename to integration-tests/src/user_flow.rs index 97d6ea55a..8bbfa7033 100644 --- a/integration-tests/tests/test_user_flow.rs +++ b/integration-tests/src/user_flow.rs @@ -7,8 +7,6 @@ use mars_types::params::LiquidationBonus; use crate::helpers::{assert_red_bank_err, default_asset_params, default_asset_params_with}; -mod helpers; - #[test] fn user_flow() { let owner = Addr::unchecked("owner"); diff --git a/packages/health-computer/src/lib.rs b/packages/health-computer/src/lib.rs index 3fae0b93e..4cdbad1b5 100644 --- a/packages/health-computer/src/lib.rs +++ b/packages/health-computer/src/lib.rs @@ -1,8 +1,10 @@ mod data_types; mod health_computer; -pub use self::{data_types::*, health_computer::*}; - #[cfg(feature = "javascript")] mod javascript; +#[cfg(test)] +mod tests; + #[cfg(feature = "javascript")] pub use self::javascript::*; +pub use self::{data_types::*, health_computer::*}; diff --git a/packages/health-computer/tests/test_health_scenarios.rs b/packages/health-computer/src/tests/health_scenarios.rs similarity index 99% rename from packages/health-computer/tests/test_health_scenarios.rs rename to packages/health-computer/src/tests/health_scenarios.rs index 473620223..20d81ad1b 100644 --- a/packages/health-computer/tests/test_health_scenarios.rs +++ b/packages/health-computer/src/tests/health_scenarios.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, ops::Add, str::FromStr}; use cosmwasm_std::{coin, Addr, Coin, Decimal, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ adapters::vault::{ CoinValue, LockingVaultAmount, UnlockingPositions, Vault, VaultAmount, VaultPosition, @@ -12,9 +11,8 @@ use mars_types::{ params::VaultConfig, }; -use crate::helpers::{udai_info, ujuno_info, uluna_info, umars_info, ustars_info}; - -pub mod helpers; +use super::helpers::{udai_info, ujuno_info, uluna_info, umars_info, ustars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; /// Action: User deposits 300 mars (1 price) /// Health: assets_value: 300 diff --git a/packages/health-computer/tests/helpers/mock_coin_info.rs b/packages/health-computer/src/tests/helpers/mock_coin_info.rs similarity index 100% rename from packages/health-computer/tests/helpers/mock_coin_info.rs rename to packages/health-computer/src/tests/helpers/mock_coin_info.rs diff --git a/packages/health-computer/tests/helpers/mock_vault_config.rs b/packages/health-computer/src/tests/helpers/mock_vault_config.rs similarity index 100% rename from packages/health-computer/tests/helpers/mock_vault_config.rs rename to packages/health-computer/src/tests/helpers/mock_vault_config.rs diff --git a/packages/health-computer/tests/helpers/mod.rs b/packages/health-computer/src/tests/helpers/mod.rs similarity index 100% rename from packages/health-computer/tests/helpers/mod.rs rename to packages/health-computer/src/tests/helpers/mod.rs index 8f0c6fc98..d6d7756b8 100644 --- a/packages/health-computer/tests/helpers/mod.rs +++ b/packages/health-computer/src/tests/helpers/mod.rs @@ -1,10 +1,10 @@ -pub use self::{ - mock_coin_info::*, mock_vault_config::*, prop_test_runner_borrow::*, prop_test_runner_swap::*, - prop_test_strategies::*, -}; - mod mock_coin_info; mod mock_vault_config; mod prop_test_runner_borrow; mod prop_test_runner_swap; mod prop_test_strategies; + +pub use self::{ + mock_coin_info::*, mock_vault_config::*, prop_test_runner_borrow::*, prop_test_runner_swap::*, + prop_test_strategies::*, +}; diff --git a/packages/health-computer/tests/helpers/prop_test_runner_borrow.rs b/packages/health-computer/src/tests/helpers/prop_test_runner_borrow.rs similarity index 98% rename from packages/health-computer/tests/helpers/prop_test_runner_borrow.rs rename to packages/health-computer/src/tests/helpers/prop_test_runner_borrow.rs index 57e539451..00526a59f 100644 --- a/packages/health-computer/tests/helpers/prop_test_runner_borrow.rs +++ b/packages/health-computer/src/tests/helpers/prop_test_runner_borrow.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{Coin, StdResult, Uint128}; -use mars_rover_health_computer::HealthComputer; use mars_types::{ adapters::vault::{CoinValue, VaultPositionValue}, credit_manager::DebtAmount, @@ -11,6 +10,7 @@ use proptest::{ }; use super::random_health_computer; +use crate::HealthComputer; pub fn max_borrow_prop_test_runner(cases: u32, target: &BorrowTarget) { let config = Config::with_cases(cases); diff --git a/packages/health-computer/tests/helpers/prop_test_runner_swap.rs b/packages/health-computer/src/tests/helpers/prop_test_runner_swap.rs similarity index 98% rename from packages/health-computer/tests/helpers/prop_test_runner_swap.rs rename to packages/health-computer/src/tests/helpers/prop_test_runner_swap.rs index 6ad6eaa4c..eefa8d6a7 100644 --- a/packages/health-computer/tests/helpers/prop_test_runner_swap.rs +++ b/packages/health-computer/src/tests/helpers/prop_test_runner_swap.rs @@ -1,5 +1,4 @@ use cosmwasm_std::{Coin, StdResult, Uint128}; -use mars_rover_health_computer::HealthComputer; use mars_types::{credit_manager::DebtAmount, health::SwapKind}; use proptest::{ strategy::Strategy, @@ -7,6 +6,7 @@ use proptest::{ }; use super::random_health_computer; +use crate::HealthComputer; pub fn max_swap_prop_test_runner(cases: u32, kind: &SwapKind) { let config = Config::with_cases(cases); diff --git a/packages/health-computer/tests/helpers/prop_test_strategies.rs b/packages/health-computer/src/tests/helpers/prop_test_strategies.rs similarity index 99% rename from packages/health-computer/tests/helpers/prop_test_strategies.rs rename to packages/health-computer/src/tests/helpers/prop_test_strategies.rs index bf504b333..22b1bc9bf 100644 --- a/packages/health-computer/tests/helpers/prop_test_strategies.rs +++ b/packages/health-computer/src/tests/helpers/prop_test_strategies.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use cosmwasm_std::{Addr, Coin, Decimal, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ adapters::vault::{ CoinValue, LockingVaultAmount, UnlockingPositions, Vault, VaultAmount, VaultPosition, @@ -17,6 +16,8 @@ use proptest::{ prop_oneof, }; +use crate::{DenomsData, HealthComputer, VaultsData}; + fn random_account_kind() -> impl Strategy { prop_oneof![Just(AccountKind::Default), Just(AccountKind::HighLeveredStrategy)] } diff --git a/packages/health-computer/tests/test_hls.rs b/packages/health-computer/src/tests/hls.rs similarity index 98% rename from packages/health-computer/tests/test_hls.rs rename to packages/health-computer/src/tests/hls.rs index ea9c78afb..573aa7b43 100644 --- a/packages/health-computer/tests/test_hls.rs +++ b/packages/health-computer/src/tests/hls.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, str::FromStr}; use cosmwasm_std::{coin, Addr, Coin, Decimal, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ adapters::vault::{ CoinValue, Vault, VaultAmount, VaultPosition, VaultPositionAmount, VaultPositionValue, @@ -11,9 +10,8 @@ use mars_types::{ params::{HlsParams, VaultConfig}, }; -use crate::helpers::{udai_info, ustars_info}; - -pub mod helpers; +use super::helpers::{udai_info, ustars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn hls_deposit() { diff --git a/packages/health-computer/tests/test_input_validation.rs b/packages/health-computer/src/tests/input_validation.rs similarity index 98% rename from packages/health-computer/tests/test_input_validation.rs rename to packages/health-computer/src/tests/input_validation.rs index d98166a9d..981a458dc 100644 --- a/packages/health-computer/tests/test_input_validation.rs +++ b/packages/health-computer/src/tests/input_validation.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use cosmwasm_std::{coin, Addr, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ adapters::vault::{ CoinValue, Vault, VaultAmount, VaultPosition, VaultPositionAmount, VaultPositionValue, @@ -11,9 +10,8 @@ use mars_types::{ params::VaultConfig, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn missing_price_data() { diff --git a/packages/health-computer/tests/test_max_borrow_deposit.rs b/packages/health-computer/src/tests/max_borrow_deposit.rs similarity index 93% rename from packages/health-computer/tests/test_max_borrow_deposit.rs rename to packages/health-computer/src/tests/max_borrow_deposit.rs index 963edbfe4..708fdcec6 100644 --- a/packages/health-computer/tests/test_max_borrow_deposit.rs +++ b/packages/health-computer/src/tests/max_borrow_deposit.rs @@ -1,15 +1,13 @@ use std::collections::HashMap; use cosmwasm_std::{coin, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ credit_manager::Positions, health::{AccountKind, BorrowTarget}, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn max_borrow_deposit_offset_good() { diff --git a/packages/health-computer/tests/test_max_borrow_prop.rs b/packages/health-computer/src/tests/max_borrow_prop.rs similarity index 89% rename from packages/health-computer/tests/test_max_borrow_prop.rs rename to packages/health-computer/src/tests/max_borrow_prop.rs index 7b402064a..375e40f5f 100644 --- a/packages/health-computer/tests/test_max_borrow_prop.rs +++ b/packages/health-computer/src/tests/max_borrow_prop.rs @@ -1,8 +1,7 @@ use cosmwasm_std::Addr; -use helpers::max_borrow_prop_test_runner; use mars_types::health::BorrowTarget; -pub mod helpers; +use super::helpers::max_borrow_prop_test_runner; #[test] fn max_borrow_amount_deposit_renders_healthy_max_ltv() { diff --git a/packages/health-computer/tests/test_max_borrow_validation.rs b/packages/health-computer/src/tests/max_borrow_validation.rs similarity index 98% rename from packages/health-computer/tests/test_max_borrow_validation.rs rename to packages/health-computer/src/tests/max_borrow_validation.rs index 10fed7925..412f3511e 100644 --- a/packages/health-computer/tests/test_max_borrow_validation.rs +++ b/packages/health-computer/src/tests/max_borrow_validation.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, str::FromStr}; use cosmwasm_std::{coin, Addr, Decimal, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ adapters::vault::{ CoinValue, Vault, VaultAmount, VaultPosition, VaultPositionAmount, VaultPositionValue, @@ -11,9 +10,8 @@ use mars_types::{ params::{HlsParams, VaultConfig}, }; -use crate::helpers::{udai_info, umars_info, ustars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info, ustars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn missing_borrow_denom_price_data() { diff --git a/packages/health-computer/tests/test_max_borrow_vault.rs b/packages/health-computer/src/tests/max_borrow_vault.rs similarity index 94% rename from packages/health-computer/tests/test_max_borrow_vault.rs rename to packages/health-computer/src/tests/max_borrow_vault.rs index f4c5a33e6..9fe1c9754 100644 --- a/packages/health-computer/tests/test_max_borrow_vault.rs +++ b/packages/health-computer/src/tests/max_borrow_vault.rs @@ -1,15 +1,13 @@ use std::collections::HashMap; use cosmwasm_std::{coin, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ credit_manager::Positions, health::{AccountKind, BorrowTarget}, }; -use crate::helpers::{osmo_atom_1_config, udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{osmo_atom_1_config, udai_info, umars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn max_borrow_vault_offset_good() { diff --git a/packages/health-computer/tests/test_max_borrow_wallet.rs b/packages/health-computer/src/tests/max_borrow_wallet.rs similarity index 93% rename from packages/health-computer/tests/test_max_borrow_wallet.rs rename to packages/health-computer/src/tests/max_borrow_wallet.rs index ab617f6db..c5111fe0f 100644 --- a/packages/health-computer/tests/test_max_borrow_wallet.rs +++ b/packages/health-computer/src/tests/max_borrow_wallet.rs @@ -1,15 +1,13 @@ use std::collections::HashMap; use cosmwasm_std::{coin, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ credit_manager::Positions, health::{AccountKind, BorrowTarget}, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn max_borrow_wallet_offset_good() { diff --git a/packages/health-computer/tests/test_max_swap.rs b/packages/health-computer/src/tests/max_swap.rs similarity index 94% rename from packages/health-computer/tests/test_max_swap.rs rename to packages/health-computer/src/tests/max_swap.rs index 4d3904719..93fc27b36 100644 --- a/packages/health-computer/tests/test_max_swap.rs +++ b/packages/health-computer/src/tests/max_swap.rs @@ -1,15 +1,13 @@ use std::collections::HashMap; use cosmwasm_std::{coin, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ credit_manager::Positions, health::{AccountKind, SwapKind}, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn max_swap_default() { diff --git a/packages/health-computer/tests/test_max_swap_prop.rs b/packages/health-computer/src/tests/max_swap_prop.rs similarity index 83% rename from packages/health-computer/tests/test_max_swap_prop.rs rename to packages/health-computer/src/tests/max_swap_prop.rs index 543312d1a..de0661677 100644 --- a/packages/health-computer/tests/test_max_swap_prop.rs +++ b/packages/health-computer/src/tests/max_swap_prop.rs @@ -1,7 +1,6 @@ -use helpers::max_swap_prop_test_runner; use mars_types::health::SwapKind; -pub mod helpers; +use super::helpers::max_swap_prop_test_runner; #[test] fn max_swap_amount_default_renders_healthy_max_ltv() { diff --git a/packages/health-computer/tests/test_max_swap_validation.rs b/packages/health-computer/src/tests/max_swap_validation.rs similarity index 98% rename from packages/health-computer/tests/test_max_swap_validation.rs rename to packages/health-computer/src/tests/max_swap_validation.rs index 56b10cd38..0f3a095c6 100644 --- a/packages/health-computer/tests/test_max_swap_validation.rs +++ b/packages/health-computer/src/tests/max_swap_validation.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, str::FromStr}; use cosmwasm_std::{coin, Addr, Decimal, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ adapters::vault::{ CoinValue, Vault, VaultAmount, VaultPosition, VaultPositionAmount, VaultPositionValue, @@ -11,9 +10,8 @@ use mars_types::{ params::{HlsParams, VaultConfig}, }; -use crate::helpers::{uatom_info, udai_info, umars_info, ustars_info}; - -pub mod helpers; +use super::helpers::{uatom_info, udai_info, umars_info, ustars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn missing_price_data() { diff --git a/packages/health-computer/tests/test_max_withdraw.rs b/packages/health-computer/src/tests/max_withdraw.rs similarity index 98% rename from packages/health-computer/tests/test_max_withdraw.rs rename to packages/health-computer/src/tests/max_withdraw.rs index 755278392..083873be5 100644 --- a/packages/health-computer/tests/test_max_withdraw.rs +++ b/packages/health-computer/src/tests/max_withdraw.rs @@ -1,7 +1,6 @@ use std::{collections::HashMap, str::FromStr}; use cosmwasm_std::{coin, Addr, Decimal, Uint128}; -use mars_rover_health_computer::{DenomsData, HealthComputer, VaultsData}; use mars_types::{ adapters::vault::{ CoinValue, Vault, VaultAmount, VaultPosition, VaultPositionAmount, VaultPositionValue, @@ -11,9 +10,8 @@ use mars_types::{ params::{HlsParams, VaultConfig}, }; -use crate::helpers::{udai_info, umars_info, ustars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info, ustars_info}; +use crate::{DenomsData, HealthComputer, VaultsData}; #[test] fn missing_price_data() { diff --git a/packages/health-computer/tests/test_max_withdraw_prop_test.rs b/packages/health-computer/src/tests/max_withdraw_prop_test.rs similarity index 95% rename from packages/health-computer/tests/test_max_withdraw_prop_test.rs rename to packages/health-computer/src/tests/max_withdraw_prop_test.rs index 50817b546..1ccee3d6e 100644 --- a/packages/health-computer/tests/test_max_withdraw_prop_test.rs +++ b/packages/health-computer/src/tests/max_withdraw_prop_test.rs @@ -1,10 +1,8 @@ use cosmwasm_std::{StdResult, Uint128}; -use mars_rover_health_computer::HealthComputer; use proptest::{prelude::ProptestConfig, prop_assume, test_runner::TestRunner}; -use crate::helpers::random_health_computer; - -pub mod helpers; +use super::helpers::random_health_computer; +use crate::HealthComputer; #[test] fn withdraw_amount_renders_healthy_max_ltv() { diff --git a/packages/health-computer/src/tests/mod.rs b/packages/health-computer/src/tests/mod.rs new file mode 100644 index 000000000..1fac270a4 --- /dev/null +++ b/packages/health-computer/src/tests/mod.rs @@ -0,0 +1,14 @@ +mod health_scenarios; +mod helpers; +mod hls; +mod input_validation; +mod max_borrow_deposit; +mod max_borrow_prop; +mod max_borrow_validation; +mod max_borrow_vault; +mod max_borrow_wallet; +mod max_swap; +mod max_swap_prop; +mod max_swap_validation; +mod max_withdraw; +mod max_withdraw_prop_test; diff --git a/packages/health/src/lib.rs b/packages/health/src/lib.rs index 1c3900a92..54c6f39fe 100644 --- a/packages/health/src/lib.rs +++ b/packages/health/src/lib.rs @@ -1,3 +1,5 @@ pub mod error; pub mod health; pub mod query; +#[cfg(test)] +mod tests; diff --git a/packages/health/tests/test_from_coins_to_positions.rs b/packages/health/src/tests/from_coins_to_positions.rs similarity index 99% rename from packages/health/tests/test_from_coins_to_positions.rs rename to packages/health/src/tests/from_coins_to_positions.rs index a28b556a1..bbce9c4cc 100644 --- a/packages/health/tests/test_from_coins_to_positions.rs +++ b/packages/health/src/tests/from_coins_to_positions.rs @@ -3,16 +3,17 @@ use std::collections::HashMap; use cosmwasm_std::{ coin, coins, testing::MockQuerier, Addr, Decimal, QuerierWrapper, StdError, Uint128, }; -use mars_health::{ - health::{Health, Position}, - query::MarsQuerier, -}; use mars_testing::MarsMockQuerier; use mars_types::{ params::{AssetParams, CmSettings, LiquidationBonus, RedBankSettings}, red_bank::Market, }; +use crate::{ + health::{Health, Position}, + query::MarsQuerier, +}; + // Test converting a collection of coins (collateral and debts) to a map of `Position` #[test] fn from_coins_to_positions() { diff --git a/packages/health/tests/test_health.rs b/packages/health/src/tests/health.rs similarity index 99% rename from packages/health/tests/test_health.rs rename to packages/health/src/tests/health.rs index 93866bb75..2b7fc966d 100644 --- a/packages/health/tests/test_health.rs +++ b/packages/health/src/tests/health.rs @@ -1,7 +1,8 @@ use std::vec; use cosmwasm_std::{CheckedFromRatioError, CheckedMultiplyRatioError, Decimal, Uint128}; -use mars_health::{ + +use crate::{ error::HealthError, health::{Health, Position}, }; diff --git a/packages/health/tests/test_health_from_coins.rs b/packages/health/src/tests/health_from_coins.rs similarity index 99% rename from packages/health/tests/test_health_from_coins.rs rename to packages/health/src/tests/health_from_coins.rs index 6174d6220..8b223c35e 100644 --- a/packages/health/tests/test_health_from_coins.rs +++ b/packages/health/src/tests/health_from_coins.rs @@ -4,13 +4,14 @@ use cosmwasm_std::{ coin, coins, testing::MockQuerier, Addr, CheckedMultiplyRatioError, Decimal, QuerierWrapper, Uint128, }; -use mars_health::{error::HealthError, health::Health}; use mars_testing::MarsMockQuerier; use mars_types::{ params::{AssetParams, CmSettings, LiquidationBonus, RedBankSettings}, red_bank::Market, }; +use crate::{error::HealthError, health::Health}; + #[test] fn health_success_from_coins() { let mut mock_querier = MarsMockQuerier::new(MockQuerier::new(&[])); diff --git a/packages/health/src/tests/mod.rs b/packages/health/src/tests/mod.rs new file mode 100644 index 000000000..331b5cb44 --- /dev/null +++ b/packages/health/src/tests/mod.rs @@ -0,0 +1,3 @@ +mod from_coins_to_positions; +mod health; +mod health_from_coins; diff --git a/packages/utils/src/helpers.rs b/packages/utils/src/helpers.rs index 14d5ee863..1a6dff04e 100644 --- a/packages/utils/src/helpers.rs +++ b/packages/utils/src/helpers.rs @@ -92,3 +92,65 @@ pub fn validate_native_denom(denom: &str) -> Result<(), ValidationError> { Ok(()) } + +#[cfg(test)] +mod tests { + use crate::{error::ValidationError::InvalidDenom, helpers::validate_native_denom}; + + #[test] + fn length_below_three() { + let res = validate_native_denom("su"); + assert_eq!( + res, + Err(InvalidDenom { + reason: "Invalid denom length".to_string() + }), + ) + } + + #[test] + fn length_above_128() { + let res = + validate_native_denom("fadjkvnrufbaalkefoi2934095sfonalf89o234u2sadsafsdbvsdrgweqraefsdgagqawfaf104hqflkqehf98348qfhdsfave3r23152wergfaefegqsacasfasfadvcadfsdsADsfaf324523"); + assert_eq!( + res, + Err(InvalidDenom { + reason: "Invalid denom length".to_string() + }), + ) + } + + #[test] + fn first_char_not_alphabetical() { + let res = validate_native_denom("7asdkjnfe7"); + assert_eq!( + res, + Err(InvalidDenom { + reason: "First character is not ASCII alphabetic".to_string() + }), + ) + } + + #[test] + fn invalid_character() { + let res = validate_native_denom("fakjfh&asd!#"); + assert_eq!( + res, + Err(InvalidDenom { + reason: "Not all characters are ASCII alphanumeric or one of: / : . _ -" + .to_string() + }), + ) + } + + #[test] + fn correct_denom() { + let res = validate_native_denom("umars"); + assert_eq!(res, Ok(())); + + let res = validate_native_denom( + "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2", + ); + assert_eq!(res, Ok(())); + } +} diff --git a/packages/utils/tests/test_denom_validator.rs b/packages/utils/tests/test_denom_validator.rs deleted file mode 100644 index 9cb8367b0..000000000 --- a/packages/utils/tests/test_denom_validator.rs +++ /dev/null @@ -1,58 +0,0 @@ -use mars_utils::{error::ValidationError::InvalidDenom, helpers::validate_native_denom}; - -#[test] -fn length_below_three() { - let res = validate_native_denom("su"); - assert_eq!( - res, - Err(InvalidDenom { - reason: "Invalid denom length".to_string() - }), - ) -} - -#[test] -fn length_above_128() { - let res = - validate_native_denom("fadjkvnrufbaalkefoi2934095sfonalf89o234u2sadsafsdbvsdrgweqraefsdgagqawfaf104hqflkqehf98348qfhdsfave3r23152wergfaefegqsacasfasfadvcadfsdsADsfaf324523"); - assert_eq!( - res, - Err(InvalidDenom { - reason: "Invalid denom length".to_string() - }), - ) -} - -#[test] -fn first_char_not_alphabetical() { - let res = validate_native_denom("7asdkjnfe7"); - assert_eq!( - res, - Err(InvalidDenom { - reason: "First character is not ASCII alphabetic".to_string() - }), - ) -} - -#[test] -fn invalid_character() { - let res = validate_native_denom("fakjfh&asd!#"); - assert_eq!( - res, - Err(InvalidDenom { - reason: "Not all characters are ASCII alphanumeric or one of: / : . _ -" - .to_string() - }), - ) -} - -#[test] -fn correct_denom() { - let res = validate_native_denom("umars"); - assert_eq!(res, Ok(())); - - let res = validate_native_denom( - "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2", - ); - assert_eq!(res, Ok(())); -}