Merge pull request #10 from oraichain/fix/init_config

fix instantiate logic
oraidex · Oct 23, 2024 · dc94a86 · dc94a86
2 parents d65b165 + b82f084
commit dc94a86
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 23 deletions.
diff --git a/contracts/zapper/src/contract.rs b/contracts/zapper/src/contract.rs
@@ -6,9 +6,7 @@ use crate::msg::{ExecuteMsg, InstantiateMsg, MigrateMsg, QueryMsg};
 use crate::state::CONFIG;
 use crate::{entrypoints::*, Config};
 
-use cosmwasm_std::{
-    to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Reply, Response, StdResult,
-};
+use cosmwasm_std::{to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult};
 use cw2::set_contract_version;
 
 // version info for migration info
@@ -24,12 +22,12 @@ pub const ADD_LIQUIDITY_REPLY_ID: u64 = 3;
 pub fn instantiate(
     deps: DepsMut,
     _env: Env,
-    info: MessageInfo,
+    _info: MessageInfo,
     msg: InstantiateMsg,
 ) -> Result<Response, ContractError> {
     set_contract_version(deps.storage, CONTRACT_NAME, CONTRACT_VERSION)?;
     let config = Config {
-        admin: info.sender,
+        admin: msg.admin,
         dex_v3: msg.dex_v3,
         mixed_router: msg.mixed_router,
     };

diff --git a/contracts/zapper/src/entrypoints/execute.rs b/contracts/zapper/src/entrypoints/execute.rs
@@ -1,6 +1,5 @@
 use cosmwasm_std::{
-    to_json_binary, Addr, CosmosMsg, Decimal, DepsMut, Env, MessageInfo, Response, SubMsg, Uint128,
-    WasmMsg,
+    to_json_binary, Addr, CosmosMsg, Decimal, DepsMut, Env, MessageInfo, Response, Uint128, WasmMsg,
 };
 
 use oraiswap_v3_common::{
@@ -12,14 +11,13 @@ use oraiswap_v3_common::{
 };
 
 use crate::{
-    contract::{ZAP_IN_LIQUIDITY_REPLY_ID, ZAP_OUT_LIQUIDITY_REPLY_ID},
     entrypoints::common::get_pool_v3_asset_info,
     msg::{ExecuteMsg, Route},
     state::{CONFIG, PENDING_POSITION, PROTOCOL_FEE, RECEIVER, SNAP_BALANCES, ZAP_OUT_ROUTES},
     Config, PairBalance, PendingPosition,
 };
 
-use super::{build_swap_msg, internal, validate_fund};
+use super::{build_swap_msg, validate_fund};
 
 pub fn update_config(
     deps: DepsMut,

diff --git a/contracts/zapper/src/entrypoints/internal.rs b/contracts/zapper/src/entrypoints/internal.rs
@@ -1,7 +1,8 @@
 use std::vec;
 
 use cosmwasm_std::{
-    to_json_binary, Coin, CosmosMsg, Decimal, DepsMut, Env, MessageInfo, Order, Response, StdResult, SubMsg, WasmMsg
+    to_json_binary, Coin, CosmosMsg, Decimal, DepsMut, Env, MessageInfo, Order, Response,
+    StdResult, WasmMsg,
 };
 
 use oraiswap_v3_common::{
@@ -17,7 +18,6 @@ use oraiswap_v3_common::{
 };
 
 use crate::{
-    contract::ADD_LIQUIDITY_REPLY_ID,
     msg::ExecuteMsg,
     state::{
         CONFIG, PENDING_POSITION, PROTOCOL_FEE, RECEIVER, SNAP_BALANCE, SNAP_BALANCES,
@@ -28,7 +28,11 @@ use crate::{
 
 use super::build_swap_msg;
 
-pub fn zap_in_liquidity(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Response, ContractError> {
+pub fn zap_in_liquidity(
+    deps: DepsMut,
+    env: Env,
+    info: MessageInfo,
+) -> Result<Response, ContractError> {
     if info.sender != env.contract.address {
         return Err(ContractError::Unauthorized {});
     }
@@ -146,7 +150,11 @@ pub fn zap_in_liquidity(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Re
     Ok(Response::new().add_messages(msgs))
 }
 
-pub fn refund_after_zap_in(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Response, ContractError> {
+pub fn refund_after_zap_in(
+    deps: DepsMut,
+    env: Env,
+    info: MessageInfo,
+) -> Result<Response, ContractError> {
     if info.sender != env.contract.address {
         return Err(ContractError::Unauthorized {});
     }
@@ -201,11 +209,15 @@ pub fn refund_after_zap_in(deps: DepsMut, env: Env, info: MessageInfo) -> Result
     Ok(Response::new().add_messages(msgs))
 }
 
-pub fn zap_out_liquidity(deps: DepsMut, env: Env, info: MessageInfo) -> Result<Response, ContractError> {
+pub fn zap_out_liquidity(
+    deps: DepsMut,
+    env: Env,
+    info: MessageInfo,
+) -> Result<Response, ContractError> {
     if info.sender != env.contract.address {
         return Err(ContractError::Unauthorized {});
     }
-    
+
     let mut msgs: Vec<CosmosMsg> = vec![];
     let receiver = RECEIVER.load(deps.storage)?;
     let zap_out_routes = ZAP_OUT_ROUTES.load(deps.storage)?;

diff --git a/contracts/zapper/src/tests/withdraw.rs b/contracts/zapper/src/tests/withdraw.rs
@@ -1,13 +1,6 @@
 use cosmwasm_std::{coins, Uint128};
-use decimal::*;
-use oraiswap::mixed_router::SwapOperation;
 use oraiswap_v3_common::asset::{Asset, AssetInfo};
-use oraiswap_v3_common::math::percentage::Percentage;
 
-use oraiswap_v3_common::storage::{FeeTier, PoolKey};
-
-use crate::msg::Route;
-use crate::tests::common::init_basic_v3_pool;
 use crate::tests::helper::MockApp;
 use crate::tests::helper::{macros::*, FEE_DENOM};
 
@@ -33,7 +26,8 @@ fn test_withdraw() {
         },
         amount: Uint128::new(1),
     }];
-    let err = app.withdraw(bob, zapper.as_str(), assets.clone(), Some(bob))
+    let err = app
+        .withdraw(bob, zapper.as_str(), assets.clone(), Some(bob))
         .unwrap_err();
     assert!(err.root_cause().to_string().contains("Unauthorized"));
 

diff --git a/contracts/zapper/src/tests/zapout.rs b/contracts/zapper/src/tests/zapout.rs
@@ -60,7 +60,13 @@ fn zap_out_position_not_exist() {
     let err = app
         .zap_out_liquidity(&bob, zapper.as_str(), 1, vec![])
         .unwrap_err();
+    println!("error {:?}", err.root_cause().to_string());
+
+    #[cfg(not(feature="test-tube"))]
     assert!(err.root_cause().to_string().contains("not found"));
+
+    #[cfg(feature="test-tube")]
+    assert!(err.root_cause().to_string().contains("Querier contract error"));
 }
 
 #[test]