Clean up

White-Whale-Defi-Platform · May 11, 2022 · 252ca11 · 252ca11
1 parent b829d0d
commit 252ca11
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 1,040 deletions.
diff --git a/contracts/luna-vault/src/flashloan.rs b/contracts/luna-vault/src/flashloan.rs
@@ -135,6 +135,7 @@ pub fn before_trade(deps: DepsMut, env: Env) -> Result<Vec<(&str, String)>, Luna
 }
 
 /// Checks if balance increased after the trade
+#[allow(unreachable_code)]
 pub fn after_trade(
     deps: DepsMut,
     env: Env,

diff --git a/contracts/luna-vault/src/tests/anchor_mock.rs b/contracts/luna-vault/src/tests/anchor_mock.rs
@@ -58,6 +58,7 @@ pub enum Cw20HookMsg {
     RedeemStable {},
 }
 
+#[allow(dead_code)]
 pub fn contract_anchor_mock() -> Box<dyn Contract<Empty>> {
     let contract = ContractWrapper::new(
         |deps, _, info, msg: MockExecuteMsg| -> VaultResult<Response> {

diff --git a/contracts/luna-vault/src/tests/callback.rs b/contracts/luna-vault/src/tests/callback.rs
@@ -1,6 +1,5 @@
-use cosmwasm_std::testing::{mock_env, mock_info, MOCK_CONTRACT_ADDR};
-use cosmwasm_std::{coin, Uint128};
-use white_whale::denom::LUNA_DENOM;
+use cosmwasm_std::testing::{mock_env, mock_info};
+use cosmwasm_std::Uint128;
 
 use white_whale::luna_vault::msg::{CallbackMsg, ExecuteMsg};
 
@@ -25,34 +24,3 @@ fn unsuccessful_handle_callback_not_same_contract() {
         _ => panic!("Must return StableVaultError::NotCallback"),
     }
 }
-
-#[test]
-fn successful_handle_callback_without_anchor_deposit() {
-    let mut deps = mock_dependencies(&[coin(100u128, LUNA_DENOM)]);
-    mock_instantiate(deps.as_mut());
-
-    let msg = ExecuteMsg::Callback(CallbackMsg::AfterTrade {
-        loan_fee: Uint128::zero(),
-    });
-    let info = mock_info(MOCK_CONTRACT_ADDR, &[]);
-
-    let res = execute(deps.as_mut(), mock_env(), info, msg).unwrap();
-    // 1 msg (commission)
-    assert_eq!(4, res.messages.len());
-}
-// TODO: TEST is Broken with error
-// called `Result::unwrap()` on an `Err` value: Std(ParseErr { target_type: "astroport::pair::SimulationResponse", msg: "missing field `return_amount`" })
-// #[test]
-fn successful_handle_callback_with_anchor_deposit() {
-    let mut deps = mock_dependencies(&[coin(15000000000000001u128, LUNA_DENOM)]);
-    mock_instantiate(deps.as_mut());
-
-    let msg = ExecuteMsg::Callback(CallbackMsg::AfterTrade {
-        loan_fee: Uint128::zero(),
-    });
-    let info = mock_info(MOCK_CONTRACT_ADDR, &[]);
-
-    let res = execute(deps.as_mut(), mock_env(), info, msg).unwrap();
-    // 2msgs, anchor and commission
-    assert_eq!(2, res.messages.len());
-}
diff --git a/contracts/luna-vault/src/tests/common_integration.rs b/contracts/luna-vault/src/tests/common_integration.rs
@@ -1,6 +1,6 @@
 use crate::contract::{execute, instantiate, query, reply};
 use cosmwasm_std::testing::{mock_env, MockApi, MockQuerier, MockStorage, MOCK_CONTRACT_ADDR};
-use cosmwasm_std::{Decimal, Empty, Uint128};
+use cosmwasm_std::{Decimal, Empty};
 use terra_mocks::TerraMockQuerier;
 use terra_multi_test::{App, BankKeeper, Contract, ContractWrapper};
 use terraswap::asset::AssetInfo;

diff --git a/contracts/luna-vault/src/tests/deposit.rs b/contracts/luna-vault/src/tests/deposit.rs
@@ -8,7 +8,6 @@ use cw20::MinterResponse;
 use terraswap::asset::AssetInfo;
 use white_whale::luna_vault::msg::InstantiateMsg as VaultInstantiateMsg;
 
-use crate::tests::common_integration::instantiate_msg as vault_msg;
 use terraswap::token::InstantiateMsg as TokenInstantiateMsg;
 use white_whale::fee::*;
 use white_whale::luna_vault::msg::VaultQueryMsg as QueryMsg;