Merge pull request #26 from apollodao/dev/remove-sender-arg

fix: Remove sender arg in simulate swap
apollodao · Aug 14, 2023 · 924c494 · 924c494
2 parents f0c572a + 556dcff
commit 924c494
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 62 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/contract.rs b/src/contract.rs
@@ -332,22 +332,14 @@ pub fn query(deps: Deps, _env: Env, msg: QueryMsg) -> StdResult<Binary> {
         QueryMsg::SimulateSwapOperations {
             offer_amount,
             operations,
-            sender,
-        } => to_binary(&simulate_swap_operations(
-            deps,
-            offer_amount,
-            operations,
-            sender,
-        )?),
+        } => to_binary(&simulate_swap_operations(deps, offer_amount, operations)?),
         QueryMsg::SimulateBasketLiquidate {
             offer_assets,
             receive_asset,
-            sender,
         } => to_binary(&simulate_basket_liquidate(
             deps,
             offer_assets,
             receive_asset,
-            sender,
         )?),
         QueryMsg::PathForPair {
             offer_asset,
@@ -370,7 +362,6 @@ pub fn simulate_swap_operations(
     deps: Deps,
     mut offer_amount: Uint128,
     operations: SwapOperationsListUnchecked,
-    sender: Option<String>,
 ) -> Result<Uint128, ContractError> {
     let operations = operations.check(deps)?;
 
@@ -391,7 +382,6 @@ pub fn simulate_basket_liquidate(
     deps: Deps,
     offer_assets: AssetListUnchecked,
     receive_asset: AssetInfoUnchecked,
-    sender: Option<String>,
 ) -> Result<Uint128, ContractError> {
     let offer_assets = offer_assets.check(deps.api)?;
     let receive_asset = receive_asset.check(deps.api)?;
@@ -411,8 +401,7 @@ pub fn simulate_basket_liquidate(
 
     // Loop over paths and simulate swap operations
     for (asset, path) in paths {
-        receive_amount +=
-            simulate_swap_operations(deps, asset.amount, path.into(), sender.clone())?;
+        receive_amount += simulate_swap_operations(deps, asset.amount, path.into())?;
     }
 
     Ok(receive_amount)

diff --git a/src/helpers.rs b/src/helpers.rs
@@ -166,14 +166,12 @@ impl CwDexRouter {
         querier: &QuerierWrapper,
         offer_amount: Uint128,
         operations: &SwapOperationsList,
-        sender: Option<String>,
     ) -> StdResult<Uint128> {
         querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.0.to_string(),
             msg: to_binary(&QueryMsg::SimulateSwapOperations {
                 offer_amount,
                 operations: operations.into(),
-                sender,
             })?,
         }))
     }
@@ -183,14 +181,12 @@ impl CwDexRouter {
         querier: &QuerierWrapper,
         offer_assets: AssetList,
         receive_asset: &AssetInfo,
-        sender: Option<String>,
     ) -> StdResult<Uint128> {
         querier.query(&QueryRequest::Wasm(WasmQuery::Smart {
             contract_addr: self.0.to_string(),
             msg: to_binary(&QueryMsg::SimulateBasketLiquidate {
                 offer_assets: offer_assets.into(),
                 receive_asset: receive_asset.to_owned().into(),
-                sender,
             })?,
         }))
     }

diff --git a/src/msg.rs b/src/msg.rs
@@ -75,16 +75,12 @@ pub enum QueryMsg {
     SimulateSwapOperations {
         offer_amount: Uint128,
         operations: SwapOperationsListUnchecked,
-        // For some reason osmosis requires this to simulate a swap...
-        sender: Option<String>,
     },
 
     #[returns(Uint128)]
     SimulateBasketLiquidate {
         offer_assets: AssetListUnchecked,
         receive_asset: AssetInfoUnchecked,
-        // For some reason osmosis requires this to simulate a swap...
-        sender: Option<String>,
     },
 
     /// Returns all the current path for a given (offer_asset, ask_asset) pair.