use swap::core for TokenAmount and TokenType

securesecrets · Nov 24, 2023 · c933a1c · c933a1c
1 parent 7288510
commit c933a1c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 334 deletions.
diff --git a/contracts/liquidity_book/lb_pair/src/contract.rs b/contracts/liquidity_book/lb_pair/src/contract.rs
@@ -1551,7 +1551,7 @@ fn query_pair_info(deps: Deps) -> Result<Binary> {
 fn query_swap_simulation(
     deps: Deps,
     env: Env,
-    offer: shade_protocol::lb_libraries::tokens::TokenAmount,
+    offer: shade_protocol::swap::core::TokenAmount,
     exclude_fee: Option<bool>,
 ) -> Result<Binary> {
     let state = CONFIG.load(deps.storage)?;

diff --git a/packages/shade_protocol/src/contract_interfaces/liquidity_book/lb_pair.rs b/packages/shade_protocol/src/contract_interfaces/liquidity_book/lb_pair.rs
@@ -2,13 +2,10 @@ use crate::{
     c_std::{Addr, ContractInfo, Decimal256, Uint128, Uint256},
     cosmwasm_schema::{cw_serde, QueryResponses},
     snip20::Snip20ReceiveMsg,
-    swap::core::TokenType,
+    swap::core::{TokenType, TokenAmount},
     utils::{
         asset::RawContract,
-        liquidity_book::{
-            tokens::{SwapTokenAmount, TokenAmount},
-            types::{Bytes32, ContractInstantiationInfo, StaticFeeParameters},
-        },
+        liquidity_book::types::{Bytes32, ContractInstantiationInfo, StaticFeeParameters},
         ExecuteCallback,
         InstantiateCallback,
         Query,
@@ -38,7 +35,7 @@ impl InstantiateCallback for InstantiateMsg {
 #[cw_serde]
 pub enum ExecuteMsg {
     SwapTokens {
-        offer: SwapTokenAmount,
+        offer: TokenAmount,
         expected_return: Option<Uint128>,
         to: Option<String>,
         padding: Option<String>,

diff --git a/packages/shade_protocol/src/utils/liquidity_book/mod.rs b/packages/shade_protocol/src/utils/liquidity_book/mod.rs
@@ -9,7 +9,6 @@ pub mod math;
 pub mod oracle_helper;
 pub mod pair_parameter_helper;
 pub mod price_helper;
-pub mod tokens;
 pub mod transfer;
 pub mod types;
 pub mod viewing_keys;
diff --git a/packages/shade_protocol/src/utils/liquidity_book/tokens.rs b/packages/shade_protocol/src/utils/liquidity_book/tokens.rs