diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e876778b7..01f7c6494 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -27,7 +27,9 @@ jobs: # Artifacts used by tests - name: Compile workspace - run: cargo make build + run: | + cargo make build + find target/wasm32-unknown-unknown/release -type f ! -name '*.wasm' -delete - name: Run test coverage run: cargo make coverage-lcov diff --git a/contracts/account-nft/tests/all_tests.rs b/contracts/account-nft/tests/all_tests.rs new file mode 100644 index 000000000..14f00389d --- /dev/null +++ b/contracts/account-nft/tests/all_tests.rs @@ -0,0 +1 @@ +mod tests; diff --git a/contracts/account-nft/tests/helpers/health_responses.rs b/contracts/account-nft/tests/tests/helpers/health_responses.rs similarity index 100% rename from contracts/account-nft/tests/helpers/health_responses.rs rename to contracts/account-nft/tests/tests/helpers/health_responses.rs diff --git a/contracts/account-nft/tests/helpers/mock_contracts.rs b/contracts/account-nft/tests/tests/helpers/mock_contracts.rs similarity index 100% rename from contracts/account-nft/tests/helpers/mock_contracts.rs rename to contracts/account-nft/tests/tests/helpers/mock_contracts.rs diff --git a/contracts/account-nft/tests/helpers/mock_env.rs b/contracts/account-nft/tests/tests/helpers/mock_env.rs similarity index 99% rename from contracts/account-nft/tests/helpers/mock_env.rs rename to contracts/account-nft/tests/tests/helpers/mock_env.rs index 07a596ad9..57554eb44 100644 --- a/contracts/account-nft/tests/helpers/mock_env.rs +++ b/contracts/account-nft/tests/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/tests/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/tests/tests/helpers/mock_env_builder.rs index d77feca29..86aa7752e 100644 --- a/contracts/account-nft/tests/helpers/mock_env_builder.rs +++ b/contracts/account-nft/tests/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/tests/tests/helpers/mod.rs similarity index 100% rename from contracts/account-nft/tests/helpers/mod.rs rename to contracts/account-nft/tests/tests/helpers/mod.rs diff --git a/contracts/account-nft/tests/tests/mod.rs b/contracts/account-nft/tests/tests/mod.rs new file mode 100644 index 000000000..0c72baf37 --- /dev/null +++ b/contracts/account-nft/tests/tests/mod.rs @@ -0,0 +1,9 @@ +mod helpers; + +mod test_burn_allowance; +mod test_burn_empty_accounts; +mod test_instantiate; +mod test_migration; +mod test_mint; +mod test_proposed_minter; +mod test_update_config; diff --git a/contracts/account-nft/tests/test_burn_allowance.rs b/contracts/account-nft/tests/tests/test_burn_allowance.rs similarity index 98% rename from contracts/account-nft/tests/test_burn_allowance.rs rename to contracts/account-nft/tests/tests/test_burn_allowance.rs index 37a955a81..bb0a1aaaf 100644 --- a/contracts/account-nft/tests/test_burn_allowance.rs +++ b/contracts/account-nft/tests/tests/test_burn_allowance.rs @@ -9,9 +9,7 @@ use mars_account_nft::error::{ }; 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; +use super::helpers::{below_max_for_burn, generate_health_response, MockEnv, MAX_VALUE_FOR_BURN}; #[test] fn only_token_owner_can_burn() { diff --git a/contracts/account-nft/tests/test_burn_empty_accounts.rs b/contracts/account-nft/tests/tests/test_burn_empty_accounts.rs similarity index 98% rename from contracts/account-nft/tests/test_burn_empty_accounts.rs rename to contracts/account-nft/tests/tests/test_burn_empty_accounts.rs index c9ce06c87..4b87c8e1b 100644 --- a/contracts/account-nft/tests/test_burn_empty_accounts.rs +++ b/contracts/account-nft/tests/tests/test_burn_empty_accounts.rs @@ -5,9 +5,7 @@ use mars_types::{ health::AccountKind, }; -use crate::helpers::{generate_health_response, MockEnv}; - -pub mod helpers; +use super::helpers::{generate_health_response, MockEnv}; #[test] fn burning_empty_accounts_not_allowed_if_no_health_contract_set() { diff --git a/contracts/account-nft/tests/test_instantiate.rs b/contracts/account-nft/tests/tests/test_instantiate.rs similarity index 93% rename from contracts/account-nft/tests/test_instantiate.rs rename to contracts/account-nft/tests/tests/test_instantiate.rs index b9fb88008..49b0e47a7 100644 --- a/contracts/account-nft/tests/test_instantiate.rs +++ b/contracts/account-nft/tests/tests/test_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/tests/tests/test_migration.rs similarity index 99% rename from contracts/account-nft/tests/test_migration.rs rename to contracts/account-nft/tests/tests/test_migration.rs index 722e24171..005dcb1d2 100644 --- a/contracts/account-nft/tests/test_migration.rs +++ b/contracts/account-nft/tests/tests/test_migration.rs @@ -13,8 +13,6 @@ use mars_account_nft::{ }; use mars_types::account_nft::NftConfig; -pub mod helpers; - #[test] fn invalid_contract_name() { let mut deps = mock_dependencies(); diff --git a/contracts/account-nft/tests/test_mint.rs b/contracts/account-nft/tests/tests/test_mint.rs similarity index 97% rename from contracts/account-nft/tests/test_mint.rs rename to contracts/account-nft/tests/tests/test_mint.rs index dec5b8140..ca068b0c5 100644 --- a/contracts/account-nft/tests/test_mint.rs +++ b/contracts/account-nft/tests/tests/test_mint.rs @@ -8,9 +8,7 @@ use mars_types::{ health::AccountKind, }; -use crate::helpers::{below_max_for_burn, MockEnv}; - -pub mod helpers; +use super::helpers::{below_max_for_burn, MockEnv}; #[test] fn id_incrementer() { diff --git a/contracts/account-nft/tests/test_proposed_minter.rs b/contracts/account-nft/tests/tests/test_proposed_minter.rs similarity index 97% rename from contracts/account-nft/tests/test_proposed_minter.rs rename to contracts/account-nft/tests/tests/test_proposed_minter.rs index 1b0fa0035..a0e1c7d27 100644 --- a/contracts/account-nft/tests/test_proposed_minter.rs +++ b/contracts/account-nft/tests/tests/test_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/tests/tests/test_update_config.rs similarity index 96% rename from contracts/account-nft/tests/test_update_config.rs rename to contracts/account-nft/tests/tests/test_update_config.rs index acafc81b1..0566318aa 100644 --- a/contracts/account-nft/tests/test_update_config.rs +++ b/contracts/account-nft/tests/tests/test_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/credit-manager/tests/all_tests.rs b/contracts/credit-manager/tests/all_tests.rs new file mode 100644 index 000000000..14f00389d --- /dev/null +++ b/contracts/credit-manager/tests/all_tests.rs @@ -0,0 +1 @@ +mod tests; diff --git a/contracts/credit-manager/tests/files/Rover - Dynamic LB & CF test cases v1.1.xlsx b/contracts/credit-manager/tests/tests/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/tests/tests/files/Rover - Dynamic LB & CF test cases v1.1.xlsx diff --git a/contracts/credit-manager/tests/helpers/assertions.rs b/contracts/credit-manager/tests/tests/helpers/assertions.rs similarity index 100% rename from contracts/credit-manager/tests/helpers/assertions.rs rename to contracts/credit-manager/tests/tests/helpers/assertions.rs diff --git a/contracts/credit-manager/tests/helpers/builders.rs b/contracts/credit-manager/tests/tests/helpers/builders.rs similarity index 96% rename from contracts/credit-manager/tests/helpers/builders.rs rename to contracts/credit-manager/tests/tests/helpers/builders.rs index fac7e2760..a6f753d21 100644 --- a/contracts/credit-manager/tests/helpers/builders.rs +++ b/contracts/credit-manager/tests/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/tests/tests/helpers/contracts.rs similarity index 96% rename from contracts/credit-manager/tests/helpers/contracts.rs rename to contracts/credit-manager/tests/tests/helpers/contracts.rs index bccce77df..dedd765d3 100644 --- a/contracts/credit-manager/tests/helpers/contracts.rs +++ b/contracts/credit-manager/tests/tests/helpers/contracts.rs @@ -1,9 +1,5 @@ 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( diff --git a/contracts/credit-manager/tests/helpers/mock_entity_info.rs b/contracts/credit-manager/tests/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/tests/tests/helpers/mock_entity_info.rs index 237d2c934..1327534c6 100644 --- a/contracts/credit-manager/tests/helpers/mock_entity_info.rs +++ b/contracts/credit-manager/tests/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/tests/tests/helpers/mock_env.rs similarity index 99% rename from contracts/credit-manager/tests/helpers/mock_env.rs rename to contracts/credit-manager/tests/tests/helpers/mock_env.rs index aa23f09b3..aa29e9da9 100644 --- a/contracts/credit-manager/tests/helpers/mock_env.rs +++ b/contracts/credit-manager/tests/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/tests/tests/helpers/mod.rs similarity index 100% rename from contracts/credit-manager/tests/helpers/mod.rs rename to contracts/credit-manager/tests/tests/helpers/mod.rs diff --git a/contracts/credit-manager/tests/helpers/types.rs b/contracts/credit-manager/tests/tests/helpers/types.rs similarity index 100% rename from contracts/credit-manager/tests/helpers/types.rs rename to contracts/credit-manager/tests/tests/helpers/types.rs diff --git a/contracts/credit-manager/tests/helpers/utils.rs b/contracts/credit-manager/tests/tests/helpers/utils.rs similarity index 100% rename from contracts/credit-manager/tests/helpers/utils.rs rename to contracts/credit-manager/tests/tests/helpers/utils.rs diff --git a/contracts/credit-manager/tests/tests/mod.rs b/contracts/credit-manager/tests/tests/mod.rs new file mode 100644 index 000000000..a1bbd508b --- /dev/null +++ b/contracts/credit-manager/tests/tests/mod.rs @@ -0,0 +1,44 @@ +mod helpers; + +mod test_borrow; +mod test_claim_rewards; +mod test_coin_balances; +mod test_create_credit_account; +mod test_deposit; +mod test_deposit_cap; +mod test_dispatch; +mod test_enumerate_accounts; +mod test_enumerate_coin_balances; +mod test_enumerate_debt_shares; +mod test_enumerate_total_debt_shares; +mod test_enumerate_vault_positions; +mod test_health; +mod test_hls_accounts; +mod test_instantiate; +mod test_lend; +mod test_liquidate_deposit; +mod test_liquidate_guard; +mod test_liquidate_lend; +mod test_liquidate_vault; +mod test_liquidation_pricing; +mod test_migration_v2; +mod test_no_health_check; +mod test_reclaim; +mod test_reentrancy_guard; +mod test_refund_balances; +mod test_repay; +mod test_repay_for_recipient; +mod test_repay_from_wallet; +mod test_swap; +mod test_update_admin; +mod test_update_config; +mod test_update_nft_config; +mod test_utilization_query; +mod test_vault_enter; +mod test_vault_exit; +mod test_vault_exit_unlocked; +mod test_vault_query_value; +mod test_vault_request_unlock; +mod test_withdraw; +mod test_zap_provide; +mod test_zap_withdraw; diff --git a/contracts/credit-manager/tests/test_borrow.rs b/contracts/credit-manager/tests/tests/test_borrow.rs similarity index 99% rename from contracts/credit-manager/tests/test_borrow.rs rename to contracts/credit-manager/tests/tests/test_borrow.rs index 0d454eae7..c8a48c1a5 100644 --- a/contracts/credit-manager/tests/test_borrow.rs +++ b/contracts/credit-manager/tests/tests/test_borrow.rs @@ -4,12 +4,10 @@ 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; - #[test] fn only_token_owner_can_borrow() { let coin_info = uosmo_info(); diff --git a/contracts/credit-manager/tests/test_claim_rewards.rs b/contracts/credit-manager/tests/tests/test_claim_rewards.rs similarity index 99% rename from contracts/credit-manager/tests/test_claim_rewards.rs rename to contracts/credit-manager/tests/tests/test_claim_rewards.rs index 3f9577df8..a3a4caad3 100644 --- a/contracts/credit-manager/tests/test_claim_rewards.rs +++ b/contracts/credit-manager/tests/tests/test_claim_rewards.rs @@ -5,12 +5,10 @@ use mars_types::{ 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; - #[test] fn claiming_rewards_when_having_none() { let mut mock = MockEnv::new().build().unwrap(); diff --git a/contracts/credit-manager/tests/test_coin_balances.rs b/contracts/credit-manager/tests/tests/test_coin_balances.rs similarity index 98% rename from contracts/credit-manager/tests/test_coin_balances.rs rename to contracts/credit-manager/tests/tests/test_coin_balances.rs index 0c05e7b6e..2c045dc04 100644 --- a/contracts/credit-manager/tests/test_coin_balances.rs +++ b/contracts/credit-manager/tests/tests/test_coin_balances.rs @@ -3,9 +3,7 @@ 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}; #[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/tests/tests/test_create_credit_account.rs similarity index 96% rename from contracts/credit-manager/tests/test_create_credit_account.rs rename to contracts/credit-manager/tests/tests/test_create_credit_account.rs index 3fa33ba73..a28d65070 100644 --- a/contracts/credit-manager/tests/test_create_credit_account.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_deposit.rs similarity index 99% rename from contracts/credit-manager/tests/test_deposit.rs rename to contracts/credit-manager/tests/tests/test_deposit.rs index 1d41774ca..7fd423a34 100644 --- a/contracts/credit-manager/tests/test_deposit.rs +++ b/contracts/credit-manager/tests/tests/test_deposit.rs @@ -4,13 +4,11 @@ use mars_credit_manager::error::ContractError::{ }; 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; - #[test] fn only_owner_of_token_can_deposit() { let mut mock = MockEnv::new().build().unwrap(); diff --git a/contracts/credit-manager/tests/test_deposit_cap.rs b/contracts/credit-manager/tests/tests/test_deposit_cap.rs similarity index 96% rename from contracts/credit-manager/tests/test_deposit_cap.rs rename to contracts/credit-manager/tests/tests/test_deposit_cap.rs index dd2c815fe..228bf611c 100644 --- a/contracts/credit-manager/tests/test_deposit_cap.rs +++ b/contracts/credit-manager/tests/tests/test_deposit_cap.rs @@ -1,6 +1,3 @@ -// 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}; @@ -11,7 +8,7 @@ use mars_types::{ }; use test_case::test_case; -use crate::helpers::{uatom_info, uosmo_info, AccountToFund, MockEnv}; +use super::helpers::{uatom_info, uosmo_info, AccountToFund, MockEnv}; #[test_case( [].into(), diff --git a/contracts/credit-manager/tests/test_dispatch.rs b/contracts/credit-manager/tests/tests/test_dispatch.rs similarity index 95% rename from contracts/credit-manager/tests/test_dispatch.rs rename to contracts/credit-manager/tests/tests/test_dispatch.rs index 26a8730e7..9504466ce 100644 --- a/contracts/credit-manager/tests/test_dispatch.rs +++ b/contracts/credit-manager/tests/tests/test_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}; #[test] fn dispatch_only_allowed_for_token_owner() { diff --git a/contracts/credit-manager/tests/test_enumerate_accounts.rs b/contracts/credit-manager/tests/tests/test_enumerate_accounts.rs similarity index 97% rename from contracts/credit-manager/tests/test_enumerate_accounts.rs rename to contracts/credit-manager/tests/tests/test_enumerate_accounts.rs index bac6fc157..e255c9e42 100644 --- a/contracts/credit-manager/tests/test_enumerate_accounts.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_enumerate_coin_balances.rs similarity index 98% rename from contracts/credit-manager/tests/test_enumerate_coin_balances.rs rename to contracts/credit-manager/tests/tests/test_enumerate_coin_balances.rs index 37c660c65..a73652247 100644 --- a/contracts/credit-manager/tests/test_enumerate_coin_balances.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_enumerate_debt_shares.rs similarity index 98% rename from contracts/credit-manager/tests/test_enumerate_debt_shares.rs rename to contracts/credit-manager/tests/tests/test_enumerate_debt_shares.rs index fc94d8acd..516827453 100644 --- a/contracts/credit-manager/tests/test_enumerate_debt_shares.rs +++ b/contracts/credit-manager/tests/tests/test_enumerate_debt_shares.rs @@ -2,9 +2,7 @@ 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}; #[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/tests/tests/test_enumerate_total_debt_shares.rs similarity index 98% rename from contracts/credit-manager/tests/test_enumerate_total_debt_shares.rs rename to contracts/credit-manager/tests/tests/test_enumerate_total_debt_shares.rs index 816806f3e..1f2d4a67b 100644 --- a/contracts/credit-manager/tests/test_enumerate_total_debt_shares.rs +++ b/contracts/credit-manager/tests/tests/test_enumerate_total_debt_shares.rs @@ -2,9 +2,7 @@ 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}; #[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/tests/tests/test_enumerate_vault_positions.rs similarity index 98% rename from contracts/credit-manager/tests/test_enumerate_vault_positions.rs rename to contracts/credit-manager/tests/tests/test_enumerate_vault_positions.rs index d4a9c1b89..ab2bf61b4 100644 --- a/contracts/credit-manager/tests/test_enumerate_vault_positions.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_health.rs similarity index 99% rename from contracts/credit-manager/tests/test_health.rs rename to contracts/credit-manager/tests/tests/test_health.rs index faf04482b..3e8546dd2 100644 --- a/contracts/credit-manager/tests/test_health.rs +++ b/contracts/credit-manager/tests/tests/test_health.rs @@ -13,13 +13,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; - // Health scenarios: // https://docs.google.com/spreadsheets/d/1YhydvetAkLywgyFjpzLIdRe-_z-KbjFOigiPuQBh-ac/edit#gid=1394903922 diff --git a/contracts/credit-manager/tests/test_hls_accounts.rs b/contracts/credit-manager/tests/tests/test_hls_accounts.rs similarity index 99% rename from contracts/credit-manager/tests/test_hls_accounts.rs rename to contracts/credit-manager/tests/tests/test_hls_accounts.rs index d209194ce..961ecbdce 100644 --- a/contracts/credit-manager/tests/test_hls_accounts.rs +++ b/contracts/credit-manager/tests/tests/test_hls_accounts.rs @@ -7,12 +7,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; - #[test] fn queries_return_the_expected_kind() { let mut mock = MockEnv::new().build().unwrap(); diff --git a/contracts/credit-manager/tests/test_instantiate.rs b/contracts/credit-manager/tests/tests/test_instantiate.rs similarity index 97% rename from contracts/credit-manager/tests/test_instantiate.rs rename to contracts/credit-manager/tests/tests/test_instantiate.rs index b940423c0..242858a57 100644 --- a/contracts/credit-manager/tests/test_instantiate.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_lend.rs similarity index 99% rename from contracts/credit-manager/tests/test_lend.rs rename to contracts/credit-manager/tests/tests/test_lend.rs index d256e1520..1c6918fe9 100644 --- a/contracts/credit-manager/tests/test_lend.rs +++ b/contracts/credit-manager/tests/tests/test_lend.rs @@ -7,13 +7,11 @@ use mars_types::credit_manager::{ 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; - #[test] fn only_token_owner_can_lend() { let coin_info = uosmo_info(); diff --git a/contracts/credit-manager/tests/test_liquidate_deposit.rs b/contracts/credit-manager/tests/tests/test_liquidate_deposit.rs similarity index 99% rename from contracts/credit-manager/tests/test_liquidate_deposit.rs rename to contracts/credit-manager/tests/tests/test_liquidate_deposit.rs index 3c6901a4a..2cca79563 100644 --- a/contracts/credit-manager/tests/test_liquidate_deposit.rs +++ b/contracts/credit-manager/tests/tests/test_liquidate_deposit.rs @@ -13,13 +13,11 @@ 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; - // 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/tests/tests/test_liquidate_guard.rs similarity index 94% rename from contracts/credit-manager/tests/test_liquidate_guard.rs rename to contracts/credit-manager/tests/tests/test_liquidate_guard.rs index e97f45dd6..af20088ba 100644 --- a/contracts/credit-manager/tests/test_liquidate_guard.rs +++ b/contracts/credit-manager/tests/tests/test_liquidate_guard.rs @@ -5,9 +5,7 @@ use mars_types::credit_manager::{ 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}; #[test] fn cannot_liquidate_own_account() { diff --git a/contracts/credit-manager/tests/test_liquidate_lend.rs b/contracts/credit-manager/tests/tests/test_liquidate_lend.rs similarity index 99% rename from contracts/credit-manager/tests/test_liquidate_lend.rs rename to contracts/credit-manager/tests/tests/test_liquidate_lend.rs index 52bd81c51..cc4d37c29 100644 --- a/contracts/credit-manager/tests/test_liquidate_lend.rs +++ b/contracts/credit-manager/tests/tests/test_liquidate_lend.rs @@ -10,12 +10,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; - // 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/tests/tests/test_liquidate_vault.rs similarity index 99% rename from contracts/credit-manager/tests/test_liquidate_vault.rs rename to contracts/credit-manager/tests/tests/test_liquidate_vault.rs index 0c7bb87bf..93f136fce 100644 --- a/contracts/credit-manager/tests/test_liquidate_vault.rs +++ b/contracts/credit-manager/tests/tests/test_liquidate_vault.rs @@ -13,13 +13,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; - // 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/tests/tests/test_liquidation_pricing.rs similarity index 97% rename from contracts/credit-manager/tests/test_liquidation_pricing.rs rename to contracts/credit-manager/tests/tests/test_liquidation_pricing.rs index 0af800d7e..340893e18 100644 --- a/contracts/credit-manager/tests/test_liquidation_pricing.rs +++ b/contracts/credit-manager/tests/tests/test_liquidation_pricing.rs @@ -9,9 +9,7 @@ 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}; #[test] fn liquidation_uses_correct_price_kind() { diff --git a/contracts/credit-manager/tests/test_migration_v2.rs b/contracts/credit-manager/tests/tests/test_migration_v2.rs similarity index 99% rename from contracts/credit-manager/tests/test_migration_v2.rs rename to contracts/credit-manager/tests/tests/test_migration_v2.rs index c6af64099..21bd22a8b 100644 --- a/contracts/credit-manager/tests/test_migration_v2.rs +++ b/contracts/credit-manager/tests/tests/test_migration_v2.rs @@ -20,8 +20,6 @@ use mars_types::{ credit_manager::{MigrateMsg, V2Updates}, }; -pub mod helpers; - #[test] fn wrong_contract_name() { let mut deps = mock_dependencies(); diff --git a/contracts/credit-manager/tests/test_no_health_check.rs b/contracts/credit-manager/tests/tests/test_no_health_check.rs similarity index 98% rename from contracts/credit-manager/tests/test_no_health_check.rs rename to contracts/credit-manager/tests/tests/test_no_health_check.rs index 90556a213..21c822923 100644 --- a/contracts/credit-manager/tests/test_no_health_check.rs +++ b/contracts/credit-manager/tests/tests/test_no_health_check.rs @@ -8,9 +8,7 @@ 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}; #[test] fn deposit_and_repay_works_without_hf_check() { diff --git a/contracts/credit-manager/tests/test_reclaim.rs b/contracts/credit-manager/tests/tests/test_reclaim.rs similarity index 99% rename from contracts/credit-manager/tests/test_reclaim.rs rename to contracts/credit-manager/tests/tests/test_reclaim.rs index 3cc5e9afa..497ed89bf 100644 --- a/contracts/credit-manager/tests/test_reclaim.rs +++ b/contracts/credit-manager/tests/tests/test_reclaim.rs @@ -2,9 +2,7 @@ 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}; #[test] fn only_token_owner_can_reclaim() { diff --git a/contracts/credit-manager/tests/test_reentrancy_guard.rs b/contracts/credit-manager/tests/tests/test_reentrancy_guard.rs similarity index 95% rename from contracts/credit-manager/tests/test_reentrancy_guard.rs rename to contracts/credit-manager/tests/tests/test_reentrancy_guard.rs index a93fe16b1..251b3d9bd 100644 --- a/contracts/credit-manager/tests/test_reentrancy_guard.rs +++ b/contracts/credit-manager/tests/tests/test_reentrancy_guard.rs @@ -6,9 +6,7 @@ use mars_types::credit_manager::{ }; 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}; #[test] fn reentrancy_guard_protects_against_evil_vault() { diff --git a/contracts/credit-manager/tests/test_refund_balances.rs b/contracts/credit-manager/tests/tests/test_refund_balances.rs similarity index 98% rename from contracts/credit-manager/tests/test_refund_balances.rs rename to contracts/credit-manager/tests/tests/test_refund_balances.rs index 4efd8ffa9..ba199ee4e 100644 --- a/contracts/credit-manager/tests/test_refund_balances.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_repay.rs similarity index 99% rename from contracts/credit-manager/tests/test_repay.rs rename to contracts/credit-manager/tests/tests/test_repay.rs index edc19091f..8461ea8d6 100644 --- a/contracts/credit-manager/tests/test_repay.rs +++ b/contracts/credit-manager/tests/tests/test_repay.rs @@ -7,12 +7,10 @@ use mars_types::{ params::LiquidationBonus, }; -use crate::helpers::{ +use super::helpers::{ assert_err, uosmo_info, AccountToFund, CoinInfo, MockEnv, DEFAULT_RED_BANK_COIN_BALANCE, }; -pub mod helpers; - #[test] fn only_token_owner_can_repay() { let coin_info = uosmo_info(); diff --git a/contracts/credit-manager/tests/test_repay_for_recipient.rs b/contracts/credit-manager/tests/tests/test_repay_for_recipient.rs similarity index 99% rename from contracts/credit-manager/tests/test_repay_for_recipient.rs rename to contracts/credit-manager/tests/tests/test_repay_for_recipient.rs index e5c910a00..eab550b40 100644 --- a/contracts/credit-manager/tests/test_repay_for_recipient.rs +++ b/contracts/credit-manager/tests/tests/test_repay_for_recipient.rs @@ -7,12 +7,10 @@ use mars_types::credit_manager::{ ActionAmount, ActionCoin, CallbackMsg, }; -use crate::helpers::{ +use super::helpers::{ assert_err, uosmo_info, AccountToFund, MockEnv, DEFAULT_RED_BANK_COIN_BALANCE, }; -pub mod helpers; - #[test] fn only_rover_can_call_repay_for_recipient_callback() { let user = Addr::unchecked("user"); diff --git a/contracts/credit-manager/tests/test_repay_from_wallet.rs b/contracts/credit-manager/tests/tests/test_repay_from_wallet.rs similarity index 98% rename from contracts/credit-manager/tests/test_repay_from_wallet.rs rename to contracts/credit-manager/tests/tests/test_repay_from_wallet.rs index 262bd3502..4e70d5e1b 100644 --- a/contracts/credit-manager/tests/test_repay_from_wallet.rs +++ b/contracts/credit-manager/tests/tests/test_repay_from_wallet.rs @@ -6,9 +6,7 @@ use mars_types::{ params::AssetParamsUpdate::AddOrUpdate, }; -use crate::helpers::{assert_err, uosmo_info, AccountToFund, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, uosmo_info, AccountToFund, MockEnv}; #[test] fn raises_when_sending_incorrect_funds() { diff --git a/contracts/credit-manager/tests/test_swap.rs b/contracts/credit-manager/tests/tests/test_swap.rs similarity index 99% rename from contracts/credit-manager/tests/test_swap.rs rename to contracts/credit-manager/tests/tests/test_swap.rs index 5e867a1e9..824233f75 100644 --- a/contracts/credit-manager/tests/test_swap.rs +++ b/contracts/credit-manager/tests/tests/test_swap.rs @@ -8,12 +8,10 @@ use mars_types::credit_manager::{ ActionAmount, ActionCoin, }; -use crate::helpers::{ +use super::helpers::{ assert_err, blacklisted_coin, uatom_info, uosmo_info, AccountToFund, MockEnv, }; -pub mod helpers; - #[test] fn only_token_owner_can_swap_for_account() { let user = Addr::unchecked("user"); diff --git a/contracts/credit-manager/tests/test_update_admin.rs b/contracts/credit-manager/tests/tests/test_update_admin.rs similarity index 98% rename from contracts/credit-manager/tests/test_update_admin.rs rename to contracts/credit-manager/tests/tests/test_update_admin.rs index 17d201939..d49198a05 100644 --- a/contracts/credit-manager/tests/test_update_admin.rs +++ b/contracts/credit-manager/tests/tests/test_update_admin.rs @@ -5,9 +5,7 @@ use mars_owner::{ OwnerUpdate, }; -use crate::helpers::{assert_err, MockEnv}; - -pub mod helpers; +use super::helpers::{assert_err, MockEnv}; #[test] fn initialized_state() { diff --git a/contracts/credit-manager/tests/test_update_config.rs b/contracts/credit-manager/tests/tests/test_update_config.rs similarity index 98% rename from contracts/credit-manager/tests/test_update_config.rs rename to contracts/credit-manager/tests/tests/test_update_config.rs index 5a10b401b..515cf82ef 100644 --- a/contracts/credit-manager/tests/test_update_config.rs +++ b/contracts/credit-manager/tests/tests/test_update_config.rs @@ -1,6 +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::{ @@ -14,9 +13,7 @@ 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}; #[test] fn only_owner_can_update_config() { diff --git a/contracts/credit-manager/tests/test_update_nft_config.rs b/contracts/credit-manager/tests/tests/test_update_nft_config.rs similarity index 98% rename from contracts/credit-manager/tests/test_update_nft_config.rs rename to contracts/credit-manager/tests/tests/test_update_nft_config.rs index dabd883f2..207dfe674 100644 --- a/contracts/credit-manager/tests/test_update_nft_config.rs +++ b/contracts/credit-manager/tests/tests/test_update_nft_config.rs @@ -6,9 +6,7 @@ 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}; #[test] fn only_owner_can_update_nft_config() { diff --git a/contracts/credit-manager/tests/test_utilization_query.rs b/contracts/credit-manager/tests/tests/test_utilization_query.rs similarity index 99% rename from contracts/credit-manager/tests/test_utilization_query.rs rename to contracts/credit-manager/tests/tests/test_utilization_query.rs index 47fa483fa..a103ff55b 100644 --- a/contracts/credit-manager/tests/test_utilization_query.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_vault_enter.rs similarity index 99% rename from contracts/credit-manager/tests/test_vault_enter.rs rename to contracts/credit-manager/tests/tests/test_vault_enter.rs index da8ed44ec..e09201318 100644 --- a/contracts/credit-manager/tests/test_vault_enter.rs +++ b/contracts/credit-manager/tests/tests/test_vault_enter.rs @@ -11,13 +11,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; - #[test] fn only_account_owner_can_take_action() { let user = Addr::unchecked("user"); diff --git a/contracts/credit-manager/tests/test_vault_exit.rs b/contracts/credit-manager/tests/tests/test_vault_exit.rs similarity index 99% rename from contracts/credit-manager/tests/test_vault_exit.rs rename to contracts/credit-manager/tests/tests/test_vault_exit.rs index 0473ba324..d608d1d0f 100644 --- a/contracts/credit-manager/tests/test_vault_exit.rs +++ b/contracts/credit-manager/tests/tests/test_vault_exit.rs @@ -7,13 +7,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; - #[test] fn only_owner_of_token_can_withdraw_from_vault() { let user = Addr::unchecked("user"); diff --git a/contracts/credit-manager/tests/test_vault_exit_unlocked.rs b/contracts/credit-manager/tests/tests/test_vault_exit_unlocked.rs similarity index 99% rename from contracts/credit-manager/tests/test_vault_exit_unlocked.rs rename to contracts/credit-manager/tests/tests/test_vault_exit_unlocked.rs index 885203591..330d2af0d 100644 --- a/contracts/credit-manager/tests/test_vault_exit_unlocked.rs +++ b/contracts/credit-manager/tests/tests/test_vault_exit_unlocked.rs @@ -11,13 +11,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; - #[test] fn only_owner_can_withdraw_unlocked_for_account() { let leverage_vault = locked_vault_info(); diff --git a/contracts/credit-manager/tests/test_vault_query_value.rs b/contracts/credit-manager/tests/tests/test_vault_query_value.rs similarity index 98% rename from contracts/credit-manager/tests/test_vault_query_value.rs rename to contracts/credit-manager/tests/tests/test_vault_query_value.rs index 90795850b..65b33c957 100644 --- a/contracts/credit-manager/tests/test_vault_query_value.rs +++ b/contracts/credit-manager/tests/tests/test_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/tests/tests/test_vault_request_unlock.rs similarity index 99% rename from contracts/credit-manager/tests/test_vault_request_unlock.rs rename to contracts/credit-manager/tests/tests/test_vault_request_unlock.rs index 64b596825..e9a00d781 100644 --- a/contracts/credit-manager/tests/test_vault_request_unlock.rs +++ b/contracts/credit-manager/tests/tests/test_vault_request_unlock.rs @@ -8,12 +8,10 @@ use mars_types::{ 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; - #[test] fn only_owner_can_request_unlocked() { let leverage_vault = locked_vault_info(); diff --git a/contracts/credit-manager/tests/test_withdraw.rs b/contracts/credit-manager/tests/tests/test_withdraw.rs similarity index 99% rename from contracts/credit-manager/tests/test_withdraw.rs rename to contracts/credit-manager/tests/tests/test_withdraw.rs index c3c2c3f06..6da4cacc2 100644 --- a/contracts/credit-manager/tests/test_withdraw.rs +++ b/contracts/credit-manager/tests/tests/test_withdraw.rs @@ -2,9 +2,7 @@ use cosmwasm_std::{coin, coins, Addr, Coin, OverflowError, OverflowOperation::Su 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}; #[test] fn only_owner_of_token_can_withdraw() { diff --git a/contracts/credit-manager/tests/test_zap_provide.rs b/contracts/credit-manager/tests/tests/test_zap_provide.rs similarity index 99% rename from contracts/credit-manager/tests/test_zap_provide.rs rename to contracts/credit-manager/tests/tests/test_zap_provide.rs index c783aa728..f21f0e269 100644 --- a/contracts/credit-manager/tests/test_zap_provide.rs +++ b/contracts/credit-manager/tests/tests/test_zap_provide.rs @@ -8,12 +8,10 @@ use mars_types::credit_manager::{ }; 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; - #[test] fn only_token_owner_can_zap_for_account() { let user = Addr::unchecked("user"); diff --git a/contracts/credit-manager/tests/test_zap_withdraw.rs b/contracts/credit-manager/tests/tests/test_zap_withdraw.rs similarity index 99% rename from contracts/credit-manager/tests/test_zap_withdraw.rs rename to contracts/credit-manager/tests/tests/test_zap_withdraw.rs index 554b71d8f..b6ace417d 100644 --- a/contracts/credit-manager/tests/test_zap_withdraw.rs +++ b/contracts/credit-manager/tests/tests/test_zap_withdraw.rs @@ -6,12 +6,10 @@ use mars_types::credit_manager::{ }; 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; - #[test] fn only_token_owner_can_unzap_for_account() { let user = Addr::unchecked("user"); diff --git a/contracts/health/tests/all_tests.rs b/contracts/health/tests/all_tests.rs new file mode 100644 index 000000000..14f00389d --- /dev/null +++ b/contracts/health/tests/all_tests.rs @@ -0,0 +1 @@ +mod tests; diff --git a/contracts/health/tests/helpers/defaults.rs b/contracts/health/tests/tests/helpers/defaults.rs similarity index 100% rename from contracts/health/tests/helpers/defaults.rs rename to contracts/health/tests/tests/helpers/defaults.rs diff --git a/contracts/health/tests/helpers/mock_contracts.rs b/contracts/health/tests/tests/helpers/mock_contracts.rs similarity index 100% rename from contracts/health/tests/helpers/mock_contracts.rs rename to contracts/health/tests/tests/helpers/mock_contracts.rs diff --git a/contracts/health/tests/helpers/mock_env.rs b/contracts/health/tests/tests/helpers/mock_env.rs similarity index 99% rename from contracts/health/tests/helpers/mock_env.rs rename to contracts/health/tests/tests/helpers/mock_env.rs index 3b1613a75..6d55aca69 100644 --- a/contracts/health/tests/helpers/mock_env.rs +++ b/contracts/health/tests/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/tests/tests/helpers/mock_env_builder.rs similarity index 99% rename from contracts/health/tests/helpers/mock_env_builder.rs rename to contracts/health/tests/tests/helpers/mock_env_builder.rs index 2ac69f474..3a0cac15c 100644 --- a/contracts/health/tests/helpers/mock_env_builder.rs +++ b/contracts/health/tests/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/tests/tests/helpers/mod.rs similarity index 100% rename from contracts/health/tests/helpers/mod.rs rename to contracts/health/tests/tests/helpers/mod.rs diff --git a/contracts/health/tests/tests/mod.rs b/contracts/health/tests/tests/mod.rs new file mode 100644 index 000000000..76b4263be --- /dev/null +++ b/contracts/health/tests/tests/mod.rs @@ -0,0 +1,8 @@ +mod helpers; + +mod test_health_state; +mod test_health_values; +mod test_hls; +mod test_instantiate; +mod test_liquidation_pricing; +mod test_update_config; diff --git a/contracts/health/tests/test_health_state.rs b/contracts/health/tests/tests/test_health_state.rs similarity index 97% rename from contracts/health/tests/test_health_state.rs rename to contracts/health/tests/tests/test_health_state.rs index 78c5e7294..9ab789545 100644 --- a/contracts/health/tests/test_health_state.rs +++ b/contracts/health/tests/tests/test_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/tests/tests/test_health_values.rs similarity index 99% rename from contracts/health/tests/test_health_values.rs rename to contracts/health/tests/tests/test_health_values.rs index 44159cdaf..c2b60529c 100644 --- a/contracts/health/tests/test_health_values.rs +++ b/contracts/health/tests/tests/test_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/test_hls.rs b/contracts/health/tests/tests/test_hls.rs similarity index 97% rename from contracts/health/tests/test_hls.rs rename to contracts/health/tests/tests/test_hls.rs index 159103dd0..b76f31235 100644 --- a/contracts/health/tests/test_hls.rs +++ b/contracts/health/tests/tests/test_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/tests/tests/test_instantiate.rs similarity index 98% rename from contracts/health/tests/test_instantiate.rs rename to contracts/health/tests/tests/test_instantiate.rs index adad1e1ae..e8962f635 100644 --- a/contracts/health/tests/test_instantiate.rs +++ b/contracts/health/tests/tests/test_instantiate.rs @@ -5,8 +5,6 @@ use mars_rover_health::{ }; use mars_types::health::InstantiateMsg; -pub mod helpers; - #[test] fn instantiate_without_credit_manager() { let mut deps = mock_dependencies(); diff --git a/contracts/health/tests/test_liquidation_pricing.rs b/contracts/health/tests/tests/test_liquidation_pricing.rs similarity index 98% rename from contracts/health/tests/test_liquidation_pricing.rs rename to contracts/health/tests/tests/test_liquidation_pricing.rs index 1da92e102..12d51fbf2 100644 --- a/contracts/health/tests/test_liquidation_pricing.rs +++ b/contracts/health/tests/tests/test_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/tests/test_update_config.rs b/contracts/health/tests/tests/test_update_config.rs similarity index 96% rename from contracts/health/tests/test_update_config.rs rename to contracts/health/tests/tests/test_update_config.rs index 2b2ead9d8..eab0c2dcb 100644 --- a/contracts/health/tests/test_update_config.rs +++ b/contracts/health/tests/tests/test_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/v2-zapper/osmosis/tests/all_tests.rs b/contracts/v2-zapper/osmosis/tests/all_tests.rs new file mode 100644 index 000000000..14f00389d --- /dev/null +++ b/contracts/v2-zapper/osmosis/tests/all_tests.rs @@ -0,0 +1 @@ +mod tests; diff --git a/contracts/v2-zapper/osmosis/tests/helpers/mod.rs b/contracts/v2-zapper/osmosis/tests/tests/helpers/mod.rs similarity index 100% rename from contracts/v2-zapper/osmosis/tests/helpers/mod.rs rename to contracts/v2-zapper/osmosis/tests/tests/helpers/mod.rs diff --git a/contracts/v2-zapper/osmosis/tests/helpers/utils.rs b/contracts/v2-zapper/osmosis/tests/tests/helpers/utils.rs similarity index 100% rename from contracts/v2-zapper/osmosis/tests/helpers/utils.rs rename to contracts/v2-zapper/osmosis/tests/tests/helpers/utils.rs diff --git a/contracts/v2-zapper/osmosis/tests/tests/mod.rs b/contracts/v2-zapper/osmosis/tests/tests/mod.rs new file mode 100644 index 000000000..763f11550 --- /dev/null +++ b/contracts/v2-zapper/osmosis/tests/tests/mod.rs @@ -0,0 +1,7 @@ +mod helpers; + +mod test_callback; +mod test_migration; +mod test_provide_liquidity; +mod test_queries; +mod test_withdraw_liquidity; diff --git a/contracts/v2-zapper/osmosis/tests/test_callback.rs b/contracts/v2-zapper/osmosis/tests/tests/test_callback.rs similarity index 92% rename from contracts/v2-zapper/osmosis/tests/test_callback.rs rename to contracts/v2-zapper/osmosis/tests/tests/test_callback.rs index f16df5295..4ea56da11 100644 --- a/contracts/v2-zapper/osmosis/tests/test_callback.rs +++ b/contracts/v2-zapper/osmosis/tests/tests/test_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/test_migration.rs b/contracts/v2-zapper/osmosis/tests/tests/test_migration.rs similarity index 99% rename from contracts/v2-zapper/osmosis/tests/test_migration.rs rename to contracts/v2-zapper/osmosis/tests/tests/test_migration.rs index bd094d251..a4ff41481 100644 --- a/contracts/v2-zapper/osmosis/tests/test_migration.rs +++ b/contracts/v2-zapper/osmosis/tests/tests/test_migration.rs @@ -7,8 +7,6 @@ use cw2::{get_contract_version, set_contract_version, ContractVersion, VersionEr use mars_zapper_base::ContractError; use mars_zapper_osmosis::contract::migrate; -pub mod helpers; - #[test] fn invalid_contract_name() { let mut deps = mock_dependencies(); diff --git a/contracts/v2-zapper/osmosis/tests/test_provide_liquidity.rs b/contracts/v2-zapper/osmosis/tests/tests/test_provide_liquidity.rs similarity index 99% rename from contracts/v2-zapper/osmosis/tests/test_provide_liquidity.rs rename to contracts/v2-zapper/osmosis/tests/tests/test_provide_liquidity.rs index a767d2bcb..a9fcc1126 100644 --- a/contracts/v2-zapper/osmosis/tests/test_provide_liquidity.rs +++ b/contracts/v2-zapper/osmosis/tests/tests/test_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/tests/tests/test_queries.rs similarity index 98% rename from contracts/v2-zapper/osmosis/tests/test_queries.rs rename to contracts/v2-zapper/osmosis/tests/tests/test_queries.rs index 62676dc49..f13cd26c2 100644 --- a/contracts/v2-zapper/osmosis/tests/test_queries.rs +++ b/contracts/v2-zapper/osmosis/tests/tests/test_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/tests/tests/test_withdraw_liquidity.rs similarity index 99% rename from contracts/v2-zapper/osmosis/tests/test_withdraw_liquidity.rs rename to contracts/v2-zapper/osmosis/tests/tests/test_withdraw_liquidity.rs index 901ea01ef..0108e7972 100644 --- a/contracts/v2-zapper/osmosis/tests/test_withdraw_liquidity.rs +++ b/contracts/v2-zapper/osmosis/tests/tests/test_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/coverage_grcov.Makefile.toml b/coverage_grcov.Makefile.toml index 133f5ec1c..883872a13 100644 --- a/coverage_grcov.Makefile.toml +++ b/coverage_grcov.Makefile.toml @@ -1,9 +1,9 @@ # https://crates.io/crates/grcov [env] -COVERAGE_TARGET_DIRECTORY = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target/coverage" -COVERAGE_BINARIES = "${COVERAGE_TARGET_DIRECTORY}/debug/deps" -COVERAGE_PROF_OUTPUT = "${COVERAGE_TARGET_DIRECTORY}/profraw" +COVERAGE_WORKING_DIRECTORY = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target/coverage" +COVERAGE_BINARIES = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target/debug" +COVERAGE_PROF_OUTPUT = "${COVERAGE_WORKING_DIRECTORY}/profraw" [tasks.coverage-grcov-prepare-outdir] private = true @@ -21,7 +21,6 @@ private = true run_task = "test" [tasks.coverage-grcov-run-test.env] -CARGO_BUILD_TARGET_DIR = "${COVERAGE_TARGET_DIRECTORY}" CARGO_INCREMENTAL = "0" RUSTFLAGS = "-Cinstrument-coverage" LLVM_PROFILE_FILE = "${COVERAGE_PROF_OUTPUT}/coverage-%p-%m.profraw" @@ -47,9 +46,9 @@ grcov ${COVERAGE_PROF_OUTPUT} \ dependencies = ["install-grcov", "coverage-grcov-prepare-outdir", "coverage-grcov-run-test"] [tasks.coverage-grcov-html] -env = { GRCOV_OUTPUT_TYPE = "html", GRCOV_OUTPUT_PATH = "${COVERAGE_TARGET_DIRECTORY}/html", TEST_RUNNER = "multi-test" } +env = { GRCOV_OUTPUT_TYPE = "html", GRCOV_OUTPUT_PATH = "${COVERAGE_WORKING_DIRECTORY}/html", TEST_RUNNER = "multi-test" } run_task = "coverage-grcov" [tasks.coverage-grcov-lcov] -env = { GRCOV_OUTPUT_TYPE = "lcov", GRCOV_OUTPUT_PATH = "${COVERAGE_TARGET_DIRECTORY}/lcov.info", TEST_RUNNER = "multi-test" } +env = { GRCOV_OUTPUT_TYPE = "lcov", GRCOV_OUTPUT_PATH = "${COVERAGE_WORKING_DIRECTORY}/lcov.info", TEST_RUNNER = "multi-test" } run_task = "coverage-grcov" diff --git a/packages/health-computer/tests/all_tests.rs b/packages/health-computer/tests/all_tests.rs new file mode 100644 index 000000000..14f00389d --- /dev/null +++ b/packages/health-computer/tests/all_tests.rs @@ -0,0 +1 @@ +mod tests; diff --git a/packages/health-computer/tests/helpers/mock_coin_info.rs b/packages/health-computer/tests/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/tests/tests/helpers/mock_coin_info.rs diff --git a/packages/health-computer/tests/helpers/mock_vault_config.rs b/packages/health-computer/tests/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/tests/tests/helpers/mock_vault_config.rs diff --git a/packages/health-computer/tests/helpers/mod.rs b/packages/health-computer/tests/tests/helpers/mod.rs similarity index 100% rename from packages/health-computer/tests/helpers/mod.rs rename to packages/health-computer/tests/tests/helpers/mod.rs diff --git a/packages/health-computer/tests/helpers/prop_test_runner_borrow.rs b/packages/health-computer/tests/tests/helpers/prop_test_runner_borrow.rs similarity index 100% rename from packages/health-computer/tests/helpers/prop_test_runner_borrow.rs rename to packages/health-computer/tests/tests/helpers/prop_test_runner_borrow.rs diff --git a/packages/health-computer/tests/helpers/prop_test_runner_swap.rs b/packages/health-computer/tests/tests/helpers/prop_test_runner_swap.rs similarity index 100% rename from packages/health-computer/tests/helpers/prop_test_runner_swap.rs rename to packages/health-computer/tests/tests/helpers/prop_test_runner_swap.rs diff --git a/packages/health-computer/tests/helpers/prop_test_strategies.rs b/packages/health-computer/tests/tests/helpers/prop_test_strategies.rs similarity index 100% rename from packages/health-computer/tests/helpers/prop_test_strategies.rs rename to packages/health-computer/tests/tests/helpers/prop_test_strategies.rs diff --git a/packages/health-computer/tests/tests/mod.rs b/packages/health-computer/tests/tests/mod.rs new file mode 100644 index 000000000..f4db56d5e --- /dev/null +++ b/packages/health-computer/tests/tests/mod.rs @@ -0,0 +1,15 @@ +mod helpers; + +mod test_health_scenarios; +mod test_hls; +mod test_input_validation; +mod test_max_borrow_deposit; +mod test_max_borrow_prop; +mod test_max_borrow_validation; +mod test_max_borrow_vault; +mod test_max_borrow_wallet; +mod test_max_swap; +mod test_max_swap_prop; +mod test_max_swap_validation; +mod test_max_withdraw; +mod test_max_withdraw_prop_test; diff --git a/packages/health-computer/tests/test_health_scenarios.rs b/packages/health-computer/tests/tests/test_health_scenarios.rs similarity index 99% rename from packages/health-computer/tests/test_health_scenarios.rs rename to packages/health-computer/tests/tests/test_health_scenarios.rs index 473620223..a221dcf9a 100644 --- a/packages/health-computer/tests/test_health_scenarios.rs +++ b/packages/health-computer/tests/tests/test_health_scenarios.rs @@ -12,9 +12,7 @@ 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}; /// Action: User deposits 300 mars (1 price) /// Health: assets_value: 300 diff --git a/packages/health-computer/tests/test_hls.rs b/packages/health-computer/tests/tests/test_hls.rs similarity index 99% rename from packages/health-computer/tests/test_hls.rs rename to packages/health-computer/tests/tests/test_hls.rs index ea9c78afb..8b8432d58 100644 --- a/packages/health-computer/tests/test_hls.rs +++ b/packages/health-computer/tests/tests/test_hls.rs @@ -11,9 +11,7 @@ use mars_types::{ params::{HlsParams, VaultConfig}, }; -use crate::helpers::{udai_info, ustars_info}; - -pub mod helpers; +use super::helpers::{udai_info, ustars_info}; #[test] fn hls_deposit() { diff --git a/packages/health-computer/tests/test_input_validation.rs b/packages/health-computer/tests/tests/test_input_validation.rs similarity index 99% rename from packages/health-computer/tests/test_input_validation.rs rename to packages/health-computer/tests/tests/test_input_validation.rs index d98166a9d..0d693cd0b 100644 --- a/packages/health-computer/tests/test_input_validation.rs +++ b/packages/health-computer/tests/tests/test_input_validation.rs @@ -11,9 +11,7 @@ use mars_types::{ params::VaultConfig, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; #[test] fn missing_price_data() { diff --git a/packages/health-computer/tests/test_max_borrow_deposit.rs b/packages/health-computer/tests/tests/test_max_borrow_deposit.rs similarity index 97% rename from packages/health-computer/tests/test_max_borrow_deposit.rs rename to packages/health-computer/tests/tests/test_max_borrow_deposit.rs index 963edbfe4..ef121dcf1 100644 --- a/packages/health-computer/tests/test_max_borrow_deposit.rs +++ b/packages/health-computer/tests/tests/test_max_borrow_deposit.rs @@ -7,9 +7,7 @@ use mars_types::{ health::{AccountKind, BorrowTarget}, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; #[test] fn max_borrow_deposit_offset_good() { diff --git a/packages/health-computer/tests/test_max_borrow_prop.rs b/packages/health-computer/tests/tests/test_max_borrow_prop.rs similarity index 89% rename from packages/health-computer/tests/test_max_borrow_prop.rs rename to packages/health-computer/tests/tests/test_max_borrow_prop.rs index 7b402064a..375e40f5f 100644 --- a/packages/health-computer/tests/test_max_borrow_prop.rs +++ b/packages/health-computer/tests/tests/test_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/tests/tests/test_max_borrow_validation.rs similarity index 99% rename from packages/health-computer/tests/test_max_borrow_validation.rs rename to packages/health-computer/tests/tests/test_max_borrow_validation.rs index 10fed7925..08e5dc760 100644 --- a/packages/health-computer/tests/test_max_borrow_validation.rs +++ b/packages/health-computer/tests/tests/test_max_borrow_validation.rs @@ -11,9 +11,7 @@ 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}; #[test] fn missing_borrow_denom_price_data() { diff --git a/packages/health-computer/tests/test_max_borrow_vault.rs b/packages/health-computer/tests/tests/test_max_borrow_vault.rs similarity index 96% rename from packages/health-computer/tests/test_max_borrow_vault.rs rename to packages/health-computer/tests/tests/test_max_borrow_vault.rs index f4c5a33e6..4bfe9d898 100644 --- a/packages/health-computer/tests/test_max_borrow_vault.rs +++ b/packages/health-computer/tests/tests/test_max_borrow_vault.rs @@ -7,9 +7,7 @@ use mars_types::{ 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}; #[test] fn max_borrow_vault_offset_good() { diff --git a/packages/health-computer/tests/test_max_borrow_wallet.rs b/packages/health-computer/tests/tests/test_max_borrow_wallet.rs similarity index 97% rename from packages/health-computer/tests/test_max_borrow_wallet.rs rename to packages/health-computer/tests/tests/test_max_borrow_wallet.rs index ab617f6db..88d8403a1 100644 --- a/packages/health-computer/tests/test_max_borrow_wallet.rs +++ b/packages/health-computer/tests/tests/test_max_borrow_wallet.rs @@ -7,9 +7,7 @@ use mars_types::{ health::{AccountKind, BorrowTarget}, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; #[test] fn max_borrow_wallet_offset_good() { diff --git a/packages/health-computer/tests/test_max_swap.rs b/packages/health-computer/tests/tests/test_max_swap.rs similarity index 97% rename from packages/health-computer/tests/test_max_swap.rs rename to packages/health-computer/tests/tests/test_max_swap.rs index 4d3904719..e51354281 100644 --- a/packages/health-computer/tests/test_max_swap.rs +++ b/packages/health-computer/tests/tests/test_max_swap.rs @@ -7,9 +7,7 @@ use mars_types::{ health::{AccountKind, SwapKind}, }; -use crate::helpers::{udai_info, umars_info}; - -pub mod helpers; +use super::helpers::{udai_info, umars_info}; #[test] fn max_swap_default() { diff --git a/packages/health-computer/tests/test_max_swap_prop.rs b/packages/health-computer/tests/tests/test_max_swap_prop.rs similarity index 83% rename from packages/health-computer/tests/test_max_swap_prop.rs rename to packages/health-computer/tests/tests/test_max_swap_prop.rs index 543312d1a..de0661677 100644 --- a/packages/health-computer/tests/test_max_swap_prop.rs +++ b/packages/health-computer/tests/tests/test_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/tests/tests/test_max_swap_validation.rs similarity index 99% rename from packages/health-computer/tests/test_max_swap_validation.rs rename to packages/health-computer/tests/tests/test_max_swap_validation.rs index 56b10cd38..9da576239 100644 --- a/packages/health-computer/tests/test_max_swap_validation.rs +++ b/packages/health-computer/tests/tests/test_max_swap_validation.rs @@ -11,9 +11,7 @@ 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}; #[test] fn missing_price_data() { diff --git a/packages/health-computer/tests/test_max_withdraw.rs b/packages/health-computer/tests/tests/test_max_withdraw.rs similarity index 99% rename from packages/health-computer/tests/test_max_withdraw.rs rename to packages/health-computer/tests/tests/test_max_withdraw.rs index 755278392..8b22595cf 100644 --- a/packages/health-computer/tests/test_max_withdraw.rs +++ b/packages/health-computer/tests/tests/test_max_withdraw.rs @@ -11,9 +11,7 @@ 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}; #[test] fn missing_price_data() { diff --git a/packages/health-computer/tests/test_max_withdraw_prop_test.rs b/packages/health-computer/tests/tests/test_max_withdraw_prop_test.rs similarity index 97% rename from packages/health-computer/tests/test_max_withdraw_prop_test.rs rename to packages/health-computer/tests/tests/test_max_withdraw_prop_test.rs index 50817b546..c87ff1859 100644 --- a/packages/health-computer/tests/test_max_withdraw_prop_test.rs +++ b/packages/health-computer/tests/tests/test_max_withdraw_prop_test.rs @@ -2,9 +2,7 @@ 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; #[test] fn withdraw_amount_renders_healthy_max_ltv() { diff --git a/packages/health/tests/all_tests.rs b/packages/health/tests/all_tests.rs new file mode 100644 index 000000000..14f00389d --- /dev/null +++ b/packages/health/tests/all_tests.rs @@ -0,0 +1 @@ +mod tests; diff --git a/packages/health/tests/tests/mod.rs b/packages/health/tests/tests/mod.rs new file mode 100644 index 000000000..0cf34fa4c --- /dev/null +++ b/packages/health/tests/tests/mod.rs @@ -0,0 +1,3 @@ +mod test_from_coins_to_positions; +mod test_health; +mod test_health_from_coins; diff --git a/packages/health/tests/test_from_coins_to_positions.rs b/packages/health/tests/tests/test_from_coins_to_positions.rs similarity index 100% rename from packages/health/tests/test_from_coins_to_positions.rs rename to packages/health/tests/tests/test_from_coins_to_positions.rs diff --git a/packages/health/tests/test_health.rs b/packages/health/tests/tests/test_health.rs similarity index 100% rename from packages/health/tests/test_health.rs rename to packages/health/tests/tests/test_health.rs diff --git a/packages/health/tests/test_health_from_coins.rs b/packages/health/tests/tests/test_health_from_coins.rs similarity index 100% rename from packages/health/tests/test_health_from_coins.rs rename to packages/health/tests/tests/test_health_from_coins.rs