Remove cw20 support #9
Conversation
lubkoll
force-pushed
the
feat/cleanup_contract
branch
from
5c9584c
to
f404c7c
Compare
lubkoll
force-pushed
the
feat/cleanup_contract
branch
from
f404c7c
to
8655370
Compare
lubkoll
force-pushed
the
feat/cleanup_contract
branch
from
c891fba
to
9419ee6
Compare
| #[error("{0}")] | ||
| Overflow(#[from] OverflowError), | ||
|
|
||
| #[error("{0}")] | ||
| AdminError(#[from] AdminError), | ||
|
|
||
| #[error("{0}")] | ||
| Asset(#[from] AssetError), |
There was a problem hiding this comment.
it is used in some asset checks in contract.rs. not sure if we really want these, but kept them for now.
| #[derive(Error, Debug)] | ||
| pub enum ContractError { | ||
| #[error("{0}")] | ||
| Std(#[from] StdError), | ||
|
|
||
| #[error("{0}")] | ||
| CwDexError(#[from] CwDexError), | ||
|
|
||
| #[error("{0}")] | ||
| Overflow(#[from] OverflowError), | ||
|
|
||
| #[error("{0}")] | ||
| AdminError(#[from] AdminError), |
There was a problem hiding this comment.
This is unused. We are using an equivalent from cw-controllers
#[error("Caller is not admin")]
NotAdmin {},
There was a problem hiding this comment.
yes, that was for supporting the AdminError from cw-controllers. Changed it to use the mars-owner instead (same thing, but a bit nicer implementation)
| #[derive(Error, Debug)] | ||
| pub enum ContractError { | ||
| #[error("{0}")] | ||
| Std(#[from] StdError), | ||
|
|
||
| #[error("{0}")] | ||
| CwDexError(#[from] CwDexError), | ||
|
|
||
| #[error("{0}")] | ||
| Overflow(#[from] OverflowError), |
There was a problem hiding this comment.
removed in the PR to the quasar repo
| #[error("{0}")] | ||
| Overflow(#[from] OverflowError), | ||
|
|
||
| #[error("{0}")] | ||
| AdminError(#[from] AdminError), | ||
|
|
||
| #[error("{0}")] | ||
| Asset(#[from] AssetError), | ||
|
|
||
| #[error("Incorrect amount of native token sent. You don't need to pass in offer_amount if using native tokens.")] | ||
| IncorrectNativeAmountSent, |
There was a problem hiding this comment.
Unused, also the below ones to this line
There was a problem hiding this comment.
removed in the PR to the quasar repo
| } | ||
|
|
||
| #[cw_serde] | ||
| pub struct BestPathForPairResponse { | ||
| /// the operations that will be executed to perform the swap | ||
| pub operations: crate::operations::SwapOperationsList, | ||
| pub operations: Vec<SwapAmountInRoute>, | ||
| /// the amount of tokens that are expected to be received after the swap | ||
| pub return_amount: Uint128, | ||
| } | ||
|
|
||
| #[cw_serde] | ||
| #[derive(QueryResponses)] | ||
| pub enum QueryMsg { |
There was a problem hiding this comment.
I see what you are aiming for here. Looks good to me in this PR, we can finish that query list on PR #8
There was a problem hiding this comment.
yes, we might still want to introduce an alias or our own type (as the SwapAmountInRoute is a bit weird). Just kept it simple for now
There was a problem hiding this comment.
we might want to replace this with our own type, not sure yet. The SwapAmountInRoute is a bit annoying as it renames the pool id from pool_id to poolID during serialization/deserialization and parses u64 as string..
|
|
||
| /// As an MVP we hardcode paths for each tuple of assets (offer, ask). | ||
| /// In a future version we want to find the path that produces the highest | ||
| /// number of ask assets, but this will take some time to implement. | ||
| /// To support multiple paths between the same asset, we add an id field we increment per asset of the same | ||
| /// path | ||
| pub const PATHS: Map<(AssetInfoKey, AssetInfoKey, u64), SwapOperationsList> = Map::new("paths"); | ||
| pub const PATHS: Map<(String, String, u64), Vec<SwapAmountInRoute>> = Map::new("paths"); |
There was a problem hiding this comment.
This should be changed as we said on PR 8 then, removing the unnecessary u64 as we are not excluding using it on the BestPathsForPair query which has been disabled.
There was a problem hiding this comment.
I changed it to using Vec<Vec<SwapAmountInRoute>> in the other PR. I'd still like to keep the option to have multiple paths, as we need that later and you already wrote almost all of the required code. I only need to find out how to simulate the swap in one query, then I can enable the commented out code again
No description provided.