Reorganize tests to fix CI "out of disk space" error

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;

contracts/account-nft/tests/test_burn_allowance.rs → 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() {

contracts/account-nft/tests/test_burn_empty_accounts.rs → 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() {

contracts/account-nft/tests/helpers/mock_contracts.rs → 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<dyn Contract<Empty>> {
     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)
 }

contracts/account-nft/tests/helpers/mock_env.rs → 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,

contracts/account-nft/tests/helpers/mock_env_builder.rs → 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,

contracts/account-nft/tests/helpers/mod.rs → 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::*};

contracts/account-nft/tests/test_instantiate.rs → 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() {

contracts/account-nft/tests/test_migration.rs → 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() {

contracts/account-nft/tests/test_mint.rs → 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() {

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;

contracts/account-nft/tests/test_proposed_minter.rs → 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() {

contracts/account-nft/tests/test_update_config.rs → 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() {

contracts/address-provider/src/lib.rs

@@ -4,3 +4,5 @@ mod helpers;
 mod key;
 pub mod migrations;
 pub mod state;
+#[cfg(test)]
+mod tests;

contracts/address-provider/tests/tests/test_addresses.rs → 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() {

contracts/address-provider/tests/tests/helpers/mod.rs → contracts/address-provider/src/tests/helpers.rs

@@ -1,15 +1,14 @@
-#![allow(dead_code)]
-
 use cosmwasm_std::{
     from_binary,
     testing::{
         mock_dependencies_with_balance, mock_env, mock_info, MockApi, MockQuerier, MockStorage,
     },
     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<MockStorage, MockApi, MockQuerier> {
     let mut deps = mock_dependencies_with_balance(&[]);
 

contracts/address-provider/tests/tests/test_instantiate.rs → 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() {

contracts/address-provider/tests/tests/test_migration_v2.rs → 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() {

contracts/address-provider/src/tests/mod.rs

@@ -0,0 +1,5 @@
+mod addresses;
+mod helpers;
+mod instantiate;
+mod migration_v2;
+mod update_owner;

contracts/address-provider/tests/tests/test_update_owner.rs → 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() {

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;

contracts/credit-manager/tests/test_borrow.rs → 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() {

contracts/credit-manager/tests/test_claim_rewards.rs → 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() {

contracts/credit-manager/tests/test_coin_balances.rs → 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() {

contracts/credit-manager/tests/test_create_credit_account.rs → 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() {

contracts/credit-manager/tests/test_deposit.rs → 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() {

contracts/credit-manager/tests/test_deposit_cap.rs → 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(),

contracts/credit-manager/tests/test_dispatch.rs → 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() {

contracts/credit-manager/tests/test_enumerate_accounts.rs → 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 {

contracts/credit-manager/tests/test_enumerate_coin_balances.rs → 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() {