From 51f5de8acb72859ec3e065a88a321afd9780578e Mon Sep 17 00:00:00 2001 From: Tasio Victoria Date: Thu, 23 Mar 2023 14:47:54 -0400 Subject: [PATCH] Global rename --- .circleci/config.yml | 10 +-- .github/workflows/e2e.yml | 4 +- Cargo.lock | 6 +- Cargo.toml | 4 +- LICENSE | 18 ++-- README.md | 10 +-- .../Cargo.toml | 2 +- .../examples/schema.rs | 2 +- .../schema/config_response.json | 0 .../schema/execute_msg.json | 0 .../schema/instantiate_msg.json | 0 .../schema/nft_swap.json | 0 .../schema/pool_nft_swap.json | 0 .../schema/pool_quote_response.json | 0 .../schema/pools_by_id_response.json | 0 .../schema/pools_response.json | 0 .../schema/query_msg.json | 0 ...ons_for__tuple_of__uint128_and_uint64.json | 0 .../schema/query_options_for_uint64.json | 0 .../schema/swap_params.json | 0 .../schema/swap_response.json | 0 .../src/error.rs | 0 .../src/execute.rs | 0 .../src/helpers.rs | 0 .../src/instantiate.rs | 2 +- .../src/lib.rs | 0 .../src/msg.rs | 0 .../src/pool.rs | 0 .../src/query.rs | 0 .../src/state.rs | 0 .../src/swap_processor.rs | 0 test/e2e/Cargo.toml | 2 +- test/e2e/src/helpers/chain.rs | 4 +- test/e2e/src/helpers/constants.rs | 2 +- test/e2e/src/helpers/fixtures.rs | 4 +- test/e2e/src/helpers/instantiate.rs | 10 +-- test/e2e/src/helpers/pool.rs | 20 ++--- test/e2e/src/tests/create_pool.rs | 16 ++-- .../src/tests/direct_swap_nfts_for_tokens.rs | 8 +- .../direct_swap_tokens_for_specific_nfts.rs | 4 +- test/e2e/src/tests/large_nfts_for_tokens.rs | 24 +++--- test/e2e/src/tests/large_tokens_for_nfts.rs | 24 +++--- test/e2e/src/tests/swap_nfts_for_tokens.rs | 8 +- .../e2e/src/tests/swap_tokens_for_any_nfts.rs | 4 +- .../tests/swap_tokens_for_specific_nfts.rs | 6 +- test/unit/Cargo.toml | 2 +- test/unit/src/helpers/fixtures.rs | 22 ++--- test/unit/src/helpers/pool_functions.rs | 38 ++++----- test/unit/src/helpers/swap_functions.rs | 22 ++--- test/unit/src/helpers/utils.rs | 2 +- test/unit/src/setup/setup_contracts.rs | 8 +- test/unit/src/setup/setup_infinity_swap.rs | 14 ++-- test/unit/src/tests/multitest.rs | 4 +- .../src/tests/pool_tests/nft_pool_tests.rs | 34 ++++---- .../src/tests/pool_tests/token_pool_tests.rs | 78 ++++++++--------- .../src/tests/pool_tests/trade_pool_tests.rs | 38 ++++----- test/unit/src/tests/query_tests.rs | 48 +++++------ test/unit/src/tests/sim_tests/get_messages.rs | 18 ++-- test/unit/src/tests/sim_tests/helpers.rs | 64 +++++++------- .../sim_direct_swap_nfts_for_tokens.rs | 82 +++++++++--------- ...im_direct_swap_tokens_for_specific_nfts.rs | 82 +++++++++--------- .../sim_tests/sim_swap_nfts_for_tokens.rs | 72 ++++++++-------- .../sim_tests/sim_swap_tokens_for_any_nfts.rs | 70 ++++++++-------- .../sim_swap_tokens_for_specific_nfts.rs | 84 +++++++++---------- .../swap_tests/direct_swap_nfts_for_tokens.rs | 16 ++-- .../direct_swap_tokens_for_specific_nfts.rs | 16 ++-- .../tests/swap_tests/swap_nfts_for_tokens.rs | 16 ++-- .../swap_tests/swap_tokens_for_any_nfts.rs | 14 ++-- .../swap_tokens_for_specific_nfts.rs | 18 ++-- ts/codegen.ts | 26 +++--- ts/package.json | 4 +- 71 files changed, 543 insertions(+), 543 deletions(-) rename contracts/{infinity-pool => infinity-swap}/Cargo.toml (98%) rename contracts/{infinity-pool => infinity-swap}/examples/schema.rs (97%) rename contracts/{infinity-pool => infinity-swap}/schema/config_response.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/execute_msg.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/instantiate_msg.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/nft_swap.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/pool_nft_swap.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/pool_quote_response.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/pools_by_id_response.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/pools_response.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/query_msg.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/query_options_for__tuple_of__uint128_and_uint64.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/query_options_for_uint64.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/swap_params.json (100%) rename contracts/{infinity-pool => infinity-swap}/schema/swap_response.json (100%) rename contracts/{infinity-pool => infinity-swap}/src/error.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/execute.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/helpers.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/instantiate.rs (95%) rename contracts/{infinity-pool => infinity-swap}/src/lib.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/msg.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/pool.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/query.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/state.rs (100%) rename contracts/{infinity-pool => infinity-swap}/src/swap_processor.rs (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c9f8a3..59e7178 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ workflows: version: 2 test: jobs: - - contract_infinity_pool + - contract_infinity_swap - lint - wasm-build deploy: @@ -16,10 +16,10 @@ workflows: ignore: /.*/ jobs: - contract_infinity_pool: + contract_infinity_swap: docker: - image: rust:1.66.1 - working_directory: ~/project/contracts/infinity-pool + working_directory: ~/project/contracts/infinity-swap steps: - checkout: path: ~/project @@ -28,7 +28,7 @@ jobs: command: rustc --version; cargo --version; rustup --version - restore_cache: keys: - - cargocache-infinity-pool-rust:1.66.1-{{ checksum "~/project/Cargo.lock" }} + - cargocache-infinity-swap-rust:1.66.1-{{ checksum "~/project/Cargo.lock" }} - run: name: Unit Tests environment: @@ -50,7 +50,7 @@ jobs: paths: - /usr/local/cargo/registry - target - key: cargocache-infinity-pool-rust:1.66.1-{{ checksum "~/project/Cargo.lock" }} + key: cargocache-infinity-swap-rust:1.66.1-{{ checksum "~/project/Cargo.lock" }} lint: docker: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 4b1aa1c..fd0153b 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -71,7 +71,7 @@ jobs: if: ${{ github.ref == 'refs/heads/main' }} uses: actions/upload-artifact@v3 with: - name: infinity-pool-gas-report-${{ env.GIT_BRANCH }} + name: infinity-swap-gas-report-${{ env.GIT_BRANCH }} path: test/e2e/gas_report.json retention-days: 90 @@ -88,7 +88,7 @@ jobs: with: branch: main workflow: e2e.yml - name: infinity-pool-gas-report-refs-heads-main + name: infinity-swap-gas-report-refs-heads-main - name: Post gas diff to PR if: ${{ github.ref != 'refs/heads/main' && steps.download_gas.outputs.found_artifact == 'true' }} diff --git a/Cargo.lock b/Cargo.lock index 2597284..b0d4d8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -851,7 +851,7 @@ dependencies = [ "cw721", "cw721-base", "env_logger", - "infinity-pool", + "infinity-swap", "itertools", "once_cell", "rand", @@ -1389,7 +1389,7 @@ dependencies = [ ] [[package]] -name = "infinity-pool" +name = "infinity-swap" version = "0.1.0" dependencies = [ "anyhow", @@ -3131,7 +3131,7 @@ dependencies = [ "cw2 0.16.0", "cw721", "cw721-base", - "infinity-pool", + "infinity-swap", "itertools", "sg-marketplace", "sg-multi-test", diff --git a/Cargo.toml b/Cargo.toml index 4eabebe..f39fe6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["contracts/*", "test/*"] [workspace.package] version = "0.1.0" edition = "2021" -repository = "https://github.com/tasiov/infinity-pool" +repository = "https://github.com/tasiov/infinity-swap" description = "An NFT AMM protocol written for CosmWasm" license = "BUSL-1.1" @@ -26,7 +26,7 @@ sg-marketplace = { git = "https://github.com/public-awesome/marketplace", featur thiserror = { version = "1.0.31" } anyhow = "1.0.51" -[profile.release.package.infinity-pool] +[profile.release.package.infinity-swap] codegen-units = 1 incremental = false diff --git a/LICENSE b/LICENSE index 2a2168d..c292311 100644 --- a/LICENSE +++ b/LICENSE @@ -3,22 +3,22 @@ Business Source License 1.1 License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. "Business Source License" is a trademark of MariaDB Corporation Ab. ------------------------------------------------------------------------------ +--- Parameters -Licensor: Public Awesome +Licensor: Public Awesome -Licensed Work: Infinity Pool V1 +Licensed Work: Infinity Swap V1 Additional Use Grant: Any uses listed and defined at - https://github.com/tasiov/infinity-pool/README.md +https://github.com/tasiov/infinity-swap/README.md -Change Date: 2026-01-01 +Change Date: 2026-01-01 -Change License: GNU General Public License v2.0 or later +Change License: GNU General Public License v2.0 or later ------------------------------------------------------------------------------ +--- Terms @@ -66,7 +66,7 @@ MariaDB hereby grants you permission to use this License’s text to license your works, and to refer to it using the trademark "Business Source License", as long as you comply with the Covenants of Licensor below. ------------------------------------------------------------------------------ +--- Covenants of Licensor @@ -89,7 +89,7 @@ other recipients of the licensed work to be provided by Licensor: 4. Not to modify this License in any other way. ------------------------------------------------------------------------------ +--- Notice diff --git a/README.md b/README.md index 7786f0f..acb3efc 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ Screenshot 2023-01-31 at 10 48 07 AM -# Infinity Pool - NFT AMM +# Infinity Swap -[![CircleCI](https://circleci.com/gh/tasiov/infinity-pool/tree/main.svg?style=svg)](https://circleci.com/gh/tasiov/infinity-pool/tree/main) +[![CircleCI](https://circleci.com/gh/tasiov/infinity-swap/tree/main.svg?style=svg)](https://circleci.com/gh/tasiov/infinity-swap/tree/main) ## WARNING: NOT FOR COMMERCIAL USE @@ -10,15 +10,15 @@ This repo is under a business source license simliar to Uniswap V3. This means i ## DISCLAIMER -INFINITY POOL IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND. No developer or entity involved in creating or instantiating Infinity Pool smart contracts will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of Infinity Pool, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value. +INFINITY SWAP IS PROVIDED “AS IS”, AT YOUR OWN RISK, AND WITHOUT WARRANTIES OF ANY KIND. No developer or entity involved in creating or instantiating Infinity Swap smart contracts will be liable for any claims or damages whatsoever associated with your use, inability to use, or your interaction with other users of Infinity Swap, including any direct, indirect, incidental, special, exemplary, punitive or consequential damages, or loss of profits, cryptocurrencies, tokens, or anything else of value. --- ## Overview -Infinity Pool is an automated market maker (AMM) protocol that allows for the buying and selling of NFT assets with a specified fungible token. The buy and sell price of the NFT assets are determined by the parameters of the pool, the bonding curve, and the assets custodied by the pool. +Infinity Swap is an automated market maker (AMM) protocol that allows for the buying and selling of NFT assets with a specified fungible token. The buy and sell price of the NFT assets are determined by the parameters of the pool, the bonding curve, and the assets custodied by the pool. -Infinity Pool makes use of an NFT AMM design, but is written for [CosmWasm](https://github.com/CosmWasm/cosmwasm) so that it may be used on Cosmos SDK based chains. +Infinity Swap makes use of an NFT AMM design, but is written for [CosmWasm](https://github.com/CosmWasm/cosmwasm) so that it may be used on Cosmos SDK based chains. ## Features diff --git a/contracts/infinity-pool/Cargo.toml b/contracts/infinity-swap/Cargo.toml similarity index 98% rename from contracts/infinity-pool/Cargo.toml rename to contracts/infinity-swap/Cargo.toml index 2297815..c325d63 100644 --- a/contracts/infinity-pool/Cargo.toml +++ b/contracts/infinity-swap/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "infinity-pool" +name = "infinity-swap" version = { workspace = true } edition = { workspace = true } repository = { workspace = true } diff --git a/contracts/infinity-pool/examples/schema.rs b/contracts/infinity-swap/examples/schema.rs similarity index 97% rename from contracts/infinity-pool/examples/schema.rs rename to contracts/infinity-swap/examples/schema.rs index c5256b1..a4ea1ef 100644 --- a/contracts/infinity-pool/examples/schema.rs +++ b/contracts/infinity-swap/examples/schema.rs @@ -1,6 +1,6 @@ use cosmwasm_schema::{export_schema, remove_schemas, schema_for}; use cosmwasm_std::Uint128; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ConfigResponse, ExecuteMsg, InstantiateMsg, NftSwap, PoolNftSwap, PoolQuoteResponse, PoolsByIdResponse, PoolsResponse, QueryMsg, QueryOptions, SwapParams, SwapResponse, }; diff --git a/contracts/infinity-pool/schema/config_response.json b/contracts/infinity-swap/schema/config_response.json similarity index 100% rename from contracts/infinity-pool/schema/config_response.json rename to contracts/infinity-swap/schema/config_response.json diff --git a/contracts/infinity-pool/schema/execute_msg.json b/contracts/infinity-swap/schema/execute_msg.json similarity index 100% rename from contracts/infinity-pool/schema/execute_msg.json rename to contracts/infinity-swap/schema/execute_msg.json diff --git a/contracts/infinity-pool/schema/instantiate_msg.json b/contracts/infinity-swap/schema/instantiate_msg.json similarity index 100% rename from contracts/infinity-pool/schema/instantiate_msg.json rename to contracts/infinity-swap/schema/instantiate_msg.json diff --git a/contracts/infinity-pool/schema/nft_swap.json b/contracts/infinity-swap/schema/nft_swap.json similarity index 100% rename from contracts/infinity-pool/schema/nft_swap.json rename to contracts/infinity-swap/schema/nft_swap.json diff --git a/contracts/infinity-pool/schema/pool_nft_swap.json b/contracts/infinity-swap/schema/pool_nft_swap.json similarity index 100% rename from contracts/infinity-pool/schema/pool_nft_swap.json rename to contracts/infinity-swap/schema/pool_nft_swap.json diff --git a/contracts/infinity-pool/schema/pool_quote_response.json b/contracts/infinity-swap/schema/pool_quote_response.json similarity index 100% rename from contracts/infinity-pool/schema/pool_quote_response.json rename to contracts/infinity-swap/schema/pool_quote_response.json diff --git a/contracts/infinity-pool/schema/pools_by_id_response.json b/contracts/infinity-swap/schema/pools_by_id_response.json similarity index 100% rename from contracts/infinity-pool/schema/pools_by_id_response.json rename to contracts/infinity-swap/schema/pools_by_id_response.json diff --git a/contracts/infinity-pool/schema/pools_response.json b/contracts/infinity-swap/schema/pools_response.json similarity index 100% rename from contracts/infinity-pool/schema/pools_response.json rename to contracts/infinity-swap/schema/pools_response.json diff --git a/contracts/infinity-pool/schema/query_msg.json b/contracts/infinity-swap/schema/query_msg.json similarity index 100% rename from contracts/infinity-pool/schema/query_msg.json rename to contracts/infinity-swap/schema/query_msg.json diff --git a/contracts/infinity-pool/schema/query_options_for__tuple_of__uint128_and_uint64.json b/contracts/infinity-swap/schema/query_options_for__tuple_of__uint128_and_uint64.json similarity index 100% rename from contracts/infinity-pool/schema/query_options_for__tuple_of__uint128_and_uint64.json rename to contracts/infinity-swap/schema/query_options_for__tuple_of__uint128_and_uint64.json diff --git a/contracts/infinity-pool/schema/query_options_for_uint64.json b/contracts/infinity-swap/schema/query_options_for_uint64.json similarity index 100% rename from contracts/infinity-pool/schema/query_options_for_uint64.json rename to contracts/infinity-swap/schema/query_options_for_uint64.json diff --git a/contracts/infinity-pool/schema/swap_params.json b/contracts/infinity-swap/schema/swap_params.json similarity index 100% rename from contracts/infinity-pool/schema/swap_params.json rename to contracts/infinity-swap/schema/swap_params.json diff --git a/contracts/infinity-pool/schema/swap_response.json b/contracts/infinity-swap/schema/swap_response.json similarity index 100% rename from contracts/infinity-pool/schema/swap_response.json rename to contracts/infinity-swap/schema/swap_response.json diff --git a/contracts/infinity-pool/src/error.rs b/contracts/infinity-swap/src/error.rs similarity index 100% rename from contracts/infinity-pool/src/error.rs rename to contracts/infinity-swap/src/error.rs diff --git a/contracts/infinity-pool/src/execute.rs b/contracts/infinity-swap/src/execute.rs similarity index 100% rename from contracts/infinity-pool/src/execute.rs rename to contracts/infinity-swap/src/execute.rs diff --git a/contracts/infinity-pool/src/helpers.rs b/contracts/infinity-swap/src/helpers.rs similarity index 100% rename from contracts/infinity-pool/src/helpers.rs rename to contracts/infinity-swap/src/helpers.rs diff --git a/contracts/infinity-pool/src/instantiate.rs b/contracts/infinity-swap/src/instantiate.rs similarity index 95% rename from contracts/infinity-pool/src/instantiate.rs rename to contracts/infinity-swap/src/instantiate.rs index 0394bba..0d0e563 100644 --- a/contracts/infinity-pool/src/instantiate.rs +++ b/contracts/infinity-swap/src/instantiate.rs @@ -9,7 +9,7 @@ use cw2::set_contract_version; use cw_utils::maybe_addr; use sg_std::Response; -pub const CONTRACT_NAME: &str = "crates.io:infinity-pool"; +pub const CONTRACT_NAME: &str = "crates.io:infinity-swap"; pub const CONTRACT_VERSION: &str = env!("CARGO_PKG_VERSION"); #[cfg_attr(not(feature = "library"), entry_point)] diff --git a/contracts/infinity-pool/src/lib.rs b/contracts/infinity-swap/src/lib.rs similarity index 100% rename from contracts/infinity-pool/src/lib.rs rename to contracts/infinity-swap/src/lib.rs diff --git a/contracts/infinity-pool/src/msg.rs b/contracts/infinity-swap/src/msg.rs similarity index 100% rename from contracts/infinity-pool/src/msg.rs rename to contracts/infinity-swap/src/msg.rs diff --git a/contracts/infinity-pool/src/pool.rs b/contracts/infinity-swap/src/pool.rs similarity index 100% rename from contracts/infinity-pool/src/pool.rs rename to contracts/infinity-swap/src/pool.rs diff --git a/contracts/infinity-pool/src/query.rs b/contracts/infinity-swap/src/query.rs similarity index 100% rename from contracts/infinity-pool/src/query.rs rename to contracts/infinity-swap/src/query.rs diff --git a/contracts/infinity-pool/src/state.rs b/contracts/infinity-swap/src/state.rs similarity index 100% rename from contracts/infinity-pool/src/state.rs rename to contracts/infinity-swap/src/state.rs diff --git a/contracts/infinity-pool/src/swap_processor.rs b/contracts/infinity-swap/src/swap_processor.rs similarity index 100% rename from contracts/infinity-pool/src/swap_processor.rs rename to contracts/infinity-swap/src/swap_processor.rs diff --git a/test/e2e/Cargo.toml b/test/e2e/Cargo.toml index 6ddba7c..491034a 100644 --- a/test/e2e/Cargo.toml +++ b/test/e2e/Cargo.toml @@ -6,7 +6,7 @@ repository = { workspace = true } license = { workspace = true } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -infinity-pool = { path = "../../contracts/infinity-pool" } +infinity-swap = { path = "../../contracts/infinity-swap" } sg-marketplace = { git = "https://github.com/public-awesome/marketplace", features = ["library"] } cosmwasm-std = { workspace = true } cw-utils = { workspace = true } diff --git a/test/e2e/src/helpers/chain.rs b/test/e2e/src/helpers/chain.rs index 03a0173..b22b5f7 100644 --- a/test/e2e/src/helpers/chain.rs +++ b/test/e2e/src/helpers/chain.rs @@ -11,7 +11,7 @@ use std::time::Duration; use test_context::TestContext; use super::instantiate::{ - instantiate_base_factory, instantiate_infinity_pools, instantiate_marketplace, + instantiate_base_factory, instantiate_infinity_swap, instantiate_marketplace, }; static CONFIG: OnceCell = OnceCell::new(); @@ -135,5 +135,5 @@ fn save_gas_report(orc: &CosmOrc, gas_report_dir: &str) { fn prep_base_contracts(orc: &mut CosmOrc, creator: &SigningAccount, denom: &str) { instantiate_base_factory(orc, creator, denom).unwrap(); instantiate_marketplace(orc, creator).unwrap(); - instantiate_infinity_pools(orc, denom, creator).unwrap(); + instantiate_infinity_swap(orc, denom, creator).unwrap(); } diff --git a/test/e2e/src/helpers/constants.rs b/test/e2e/src/helpers/constants.rs index 8f05e4d..68dcda9 100644 --- a/test/e2e/src/helpers/constants.rs +++ b/test/e2e/src/helpers/constants.rs @@ -4,7 +4,7 @@ pub const BASE_FACTORY_NAME: &str = "base_factory"; pub const VENDING_MINTER_NAME: &str = "vending_minter"; pub const VENDING_FACTORY_NAME: &str = "vending_factory"; pub const MARKETPLACE_NAME: &str = "sg_marketplace"; -pub const INFINITY_POOL_NAME: &str = "infinity_pool"; +pub const INFINITY_SWAP_NAME: &str = "infinity_swap"; pub const MAX_TOKENS: u32 = 10_000; pub const CREATION_FEE: u128 = 1_200_000; diff --git a/test/e2e/src/helpers/fixtures.rs b/test/e2e/src/helpers/fixtures.rs index 64ba222..ae2c48d 100644 --- a/test/e2e/src/helpers/fixtures.rs +++ b/test/e2e/src/helpers/fixtures.rs @@ -1,6 +1,6 @@ use cosmwasm_std::Uint128; -use infinity_pool::msg::ExecuteMsg; -use infinity_pool::state::BondingCurve; +use infinity_swap::msg::ExecuteMsg; +use infinity_swap::state::BondingCurve; pub fn get_pool_fixtures( collection: &str, diff --git a/test/e2e/src/helpers/instantiate.rs b/test/e2e/src/helpers/instantiate.rs index b703e2a..61a48e3 100644 --- a/test/e2e/src/helpers/instantiate.rs +++ b/test/e2e/src/helpers/instantiate.rs @@ -1,6 +1,6 @@ use super::chain::SigningAccount; use super::constants::{ - BASE_FACTORY_NAME, BASE_MINTER_NAME, CREATION_FEE, INFINITY_POOL_NAME, LISTING_FEE, + BASE_FACTORY_NAME, BASE_MINTER_NAME, CREATION_FEE, INFINITY_SWAP_NAME, LISTING_FEE, MARKETPLACE_NAME, MINT_PRICE, SG721_NAME, }; use base_factory::msg::ExecuteMsg as BaseFactoryExecuteMsg; @@ -13,7 +13,7 @@ use cosm_orc::orchestrator::{ }; use cosmwasm_std::{Coin, Empty, Uint128}; use cw_utils::Duration; -use infinity_pool::msg::InstantiateMsg as PoolInstantiateMsg; +use infinity_swap::msg::InstantiateMsg as PoolInstantiateMsg; use sg2::msg::{CollectionParams, CreateMinterMsg}; use sg721::CollectionInfo; use sg_marketplace::msg::InstantiateMsg as MarketplaceInstantiateMsg; @@ -143,14 +143,14 @@ pub fn instantiate_marketplace( ) } -pub fn instantiate_infinity_pools( +pub fn instantiate_infinity_swap( orc: &mut CosmOrc, denom: &str, user: &SigningAccount, ) -> Result { orc.instantiate( - INFINITY_POOL_NAME, - &format!("{}_inst", INFINITY_POOL_NAME), + INFINITY_SWAP_NAME, + &format!("{}_inst", INFINITY_SWAP_NAME), &PoolInstantiateMsg { denom: denom.to_string(), marketplace_addr: orc.contract_map.address(MARKETPLACE_NAME)?, diff --git a/test/e2e/src/helpers/pool.rs b/test/e2e/src/helpers/pool.rs index edaeee2..10e659b 100644 --- a/test/e2e/src/helpers/pool.rs +++ b/test/e2e/src/helpers/pool.rs @@ -1,14 +1,14 @@ use super::chain::Chain; -use super::constants::{INFINITY_POOL_NAME, LISTING_FEE, SG721_NAME}; +use super::constants::{INFINITY_SWAP_NAME, LISTING_FEE, SG721_NAME}; use super::fixtures::get_pool_fixtures; use crate::helpers::nft::{approve_all_nfts, mint_nfts}; use cosm_orc::orchestrator::Coin as OrcCoin; use cosm_orc::orchestrator::ExecResponse; use cosm_orc::orchestrator::{ExecReq, SigningKey}; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, PoolsByIdResponse, QueryMsg as InfinityPoolQueryMsg, }; -use infinity_pool::state::Pool; +use infinity_swap::state::Pool; use serde::Deserialize; pub fn pool_execute_message( @@ -19,7 +19,7 @@ pub fn pool_execute_message( user: &SigningKey, ) -> ExecResponse { let reqs = vec![ExecReq { - contract_name: INFINITY_POOL_NAME.to_string(), + contract_name: INFINITY_SWAP_NAME.to_string(), msg: Box::new(execute_msg), funds, }]; @@ -33,7 +33,7 @@ pub fn pool_query_message Deserialize<'a>>( ) -> T { chain .orc - .query(INFINITY_POOL_NAME, &query_msg) + .query(INFINITY_SWAP_NAME, &query_msg) .unwrap() .data() .unwrap() @@ -53,14 +53,14 @@ pub fn create_active_pool( approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), user, ); let resp = pool_execute_message( chain, create_pool_msg, - "infinity-pool-create-pool", + "infinity-swap-create-pool", vec![OrcCoin { amount: LISTING_FEE, denom: denom.parse().unwrap(), @@ -88,7 +88,7 @@ pub fn create_active_pool( collection, nft_token_ids: token_ids, }, - "infinity-pool-deposit-nfts", + "infinity-swap-deposit-nfts", vec![], user, ); @@ -98,7 +98,7 @@ pub fn create_active_pool( pool_execute_message( chain, InfinityPoolExecuteMsg::DepositTokens { pool_id }, - "infinity-pool-deposit-tokens", + "infinity-swap-deposit-tokens", vec![OrcCoin { amount: pool_deposit_amount, denom: denom.parse().unwrap(), @@ -113,7 +113,7 @@ pub fn create_active_pool( is_active: true, pool_id, }, - "infinity-pool-activate", + "infinity-swap-activate", vec![], user, ); diff --git a/test/e2e/src/tests/create_pool.rs b/test/e2e/src/tests/create_pool.rs index 653050e..c8b519a 100644 --- a/test/e2e/src/tests/create_pool.rs +++ b/test/e2e/src/tests/create_pool.rs @@ -1,6 +1,6 @@ use crate::helpers::{ chain::Chain, - constants::{INFINITY_POOL_NAME, LISTING_FEE, MINT_PRICE, SG721_NAME}, + constants::{INFINITY_SWAP_NAME, LISTING_FEE, MINT_PRICE, SG721_NAME}, fixtures::get_pool_fixtures, helper::gen_users, instantiate::instantiate_minter, @@ -9,10 +9,10 @@ use crate::helpers::{ }; use cosm_orc::orchestrator::Coin as OrcCoin; use cosmwasm_std::{Addr, Decimal, Uint128}; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, PoolsByIdResponse, QueryMsg as InfinityPoolQueryMsg, }; -use infinity_pool::state::{BondingCurve, Pool, PoolType}; +use infinity_swap::state::{BondingCurve, Pool, PoolType}; use test_context::test_context; #[test_context(Chain)] @@ -54,7 +54,7 @@ fn test_small_pool_creation(chain: &mut Chain) { approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), &user, ); @@ -71,7 +71,7 @@ fn test_small_pool_creation(chain: &mut Chain) { reinvest_tokens: true, reinvest_nfts: true, }, - "infinity-pool-create-pool", + "infinity-swap-create-pool", vec![OrcCoin { amount: LISTING_FEE, denom: denom.parse().unwrap(), @@ -92,7 +92,7 @@ fn test_small_pool_creation(chain: &mut Chain) { collection: collection.clone(), nft_token_ids: token_ids.clone(), }, - "infinity-pool-deposit-nfts", + "infinity-swap-deposit-nfts", vec![], &user, ); @@ -100,7 +100,7 @@ fn test_small_pool_creation(chain: &mut Chain) { pool_execute_message( chain, InfinityPoolExecuteMsg::DepositTokens { pool_id }, - "infinity-pool-deposit-tokens", + "infinity-swap-deposit-tokens", vec![OrcCoin { amount: pool_deposit_amount, denom: denom.parse().unwrap(), @@ -114,7 +114,7 @@ fn test_small_pool_creation(chain: &mut Chain) { is_active: true, pool_id, }, - "infinity-pool-activate", + "infinity-swap-activate", vec![], &user, ); diff --git a/test/e2e/src/tests/direct_swap_nfts_for_tokens.rs b/test/e2e/src/tests/direct_swap_nfts_for_tokens.rs index 8324b80..c457d96 100644 --- a/test/e2e/src/tests/direct_swap_nfts_for_tokens.rs +++ b/test/e2e/src/tests/direct_swap_nfts_for_tokens.rs @@ -1,13 +1,13 @@ use crate::helpers::{ chain::Chain, - constants::INFINITY_POOL_NAME, + constants::INFINITY_SWAP_NAME, helper::{gen_users, latest_block_time}, instantiate::instantiate_minter, nft::{approve_all_nfts, mint_and_transfer_nfts}, pool::{create_pools_from_fixtures, pool_execute_message, pool_query_message}, }; use cosmwasm_std::Uint128; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, NftSwap, QueryMsg as InfinityPoolQueryMsg, SwapParams, SwapResponse, }; @@ -55,7 +55,7 @@ fn swap_small(chain: &mut Chain) { let mut bidder_token_ids = mint_and_transfer_nfts(chain, 50, &maker, taker_addr.as_ref()); approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), &taker, ); @@ -100,7 +100,7 @@ fn swap_small(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-direct-swap-nfts-for-tokens", + "infinity-swap-direct-swap-nfts-for-tokens", vec![], &taker, ); diff --git a/test/e2e/src/tests/direct_swap_tokens_for_specific_nfts.rs b/test/e2e/src/tests/direct_swap_tokens_for_specific_nfts.rs index 292f77a..4090380 100644 --- a/test/e2e/src/tests/direct_swap_tokens_for_specific_nfts.rs +++ b/test/e2e/src/tests/direct_swap_tokens_for_specific_nfts.rs @@ -6,7 +6,7 @@ use crate::helpers::{ }; use cosm_orc::orchestrator::Coin as OrcCoin; use cosmwasm_std::Uint128; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, NftSwap, NftTokenIdsResponse, QueryMsg as InfinityPoolQueryMsg, QueryOptions, SwapParams, SwapResponse, }; @@ -111,7 +111,7 @@ fn swap_small(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-direct-swap-tokens-for-specific-nfts", + "infinity-swap-direct-swap-tokens-for-specific-nfts", vec![OrcCoin { amount: total_amount.u128(), denom: denom.parse().unwrap(), diff --git a/test/e2e/src/tests/large_nfts_for_tokens.rs b/test/e2e/src/tests/large_nfts_for_tokens.rs index a4ba670..57c19bf 100644 --- a/test/e2e/src/tests/large_nfts_for_tokens.rs +++ b/test/e2e/src/tests/large_nfts_for_tokens.rs @@ -1,6 +1,6 @@ use crate::helpers::{ chain::Chain, - constants::{INFINITY_POOL_NAME, LISTING_FEE, SG721_NAME}, + constants::{INFINITY_SWAP_NAME, LISTING_FEE, SG721_NAME}, helper::{gen_users, latest_block_time}, instantiate::instantiate_minter, nft::{approve_all_nfts, mint_nfts}, @@ -8,12 +8,12 @@ use crate::helpers::{ }; use cosm_orc::orchestrator::Coin as OrcCoin; use cosmwasm_std::{Addr, Decimal, Uint128}; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, NftSwap, PoolsByIdResponse, QueryMsg as InfinityPoolQueryMsg, SwapParams, }; -use infinity_pool::state::Pool; -use infinity_pool::state::{BondingCurve, PoolType}; +use infinity_swap::state::Pool; +use infinity_swap::state::{BondingCurve, PoolType}; use std::env; use test_context::test_context; @@ -54,7 +54,7 @@ fn large_single_pool_nft_for_token_swap(chain: &mut Chain) { approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), &user, ); @@ -71,7 +71,7 @@ fn large_single_pool_nft_for_token_swap(chain: &mut Chain) { reinvest_tokens: true, reinvest_nfts: true, }, - "infinity-pool-create-pool", + "infinity-swap-create-pool", vec![OrcCoin { amount: LISTING_FEE, denom: denom.parse().unwrap(), @@ -92,7 +92,7 @@ fn large_single_pool_nft_for_token_swap(chain: &mut Chain) { collection: collection.clone(), nft_token_ids: token_ids.clone(), }, - "infinity-pool-deposit-nfts", + "infinity-swap-deposit-nfts", vec![], &user, ); @@ -100,7 +100,7 @@ fn large_single_pool_nft_for_token_swap(chain: &mut Chain) { pool_execute_message( chain, InfinityPoolExecuteMsg::DepositTokens { pool_id }, - "infinity-pool-deposit-tokens", + "infinity-swap-deposit-tokens", vec![OrcCoin { amount: pool_deposit_amount, denom: denom.parse().unwrap(), @@ -114,7 +114,7 @@ fn large_single_pool_nft_for_token_swap(chain: &mut Chain) { is_active: true, pool_id, }, - "infinity-pool-activate", + "infinity-swap-activate", vec![], &user, ); @@ -169,7 +169,7 @@ fn large_single_pool_nft_for_token_swap(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-swap-nfts-for-tokens", + "infinity-swap-swap-nfts-for-tokens", vec![], &user, ); @@ -239,7 +239,7 @@ fn large_many_pool_nft_for_token_swap(chain: &mut Chain) { approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), &taker, ); @@ -255,7 +255,7 @@ fn large_many_pool_nft_for_token_swap(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-swap-nfts-for-tokens", + "infinity-swap-swap-nfts-for-tokens", vec![], &taker, ); diff --git a/test/e2e/src/tests/large_tokens_for_nfts.rs b/test/e2e/src/tests/large_tokens_for_nfts.rs index 0d1d8d0..a9da6a5 100644 --- a/test/e2e/src/tests/large_tokens_for_nfts.rs +++ b/test/e2e/src/tests/large_tokens_for_nfts.rs @@ -1,6 +1,6 @@ use crate::helpers::{ chain::Chain, - constants::{INFINITY_POOL_NAME, LISTING_FEE, SG721_NAME}, + constants::{INFINITY_SWAP_NAME, LISTING_FEE, SG721_NAME}, helper::{gen_users, latest_block_time}, instantiate::instantiate_minter, nft::{approve_all_nfts, mint_nfts}, @@ -8,12 +8,12 @@ use crate::helpers::{ }; use cosm_orc::orchestrator::Coin as OrcCoin; use cosmwasm_std::{Addr, Decimal, Uint128}; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, PoolsByIdResponse, QueryMsg as InfinityPoolQueryMsg, SwapParams, }; -use infinity_pool::state::Pool; -use infinity_pool::state::{BondingCurve, PoolType}; +use infinity_swap::state::Pool; +use infinity_swap::state::{BondingCurve, PoolType}; use std::env; use test_context::test_context; @@ -54,7 +54,7 @@ fn large_single_pool_token_for_nft_swap(chain: &mut Chain) { approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), &user, ); @@ -71,7 +71,7 @@ fn large_single_pool_token_for_nft_swap(chain: &mut Chain) { reinvest_tokens: true, reinvest_nfts: true, }, - "infinity-pool-create-pool", + "infinity-swap-create-pool", vec![OrcCoin { amount: LISTING_FEE, denom: denom.parse().unwrap(), @@ -92,7 +92,7 @@ fn large_single_pool_token_for_nft_swap(chain: &mut Chain) { collection: collection.clone(), nft_token_ids: token_ids.clone(), }, - "infinity-pool-deposit-nfts", + "infinity-swap-deposit-nfts", vec![], &user, ); @@ -100,7 +100,7 @@ fn large_single_pool_token_for_nft_swap(chain: &mut Chain) { pool_execute_message( chain, InfinityPoolExecuteMsg::DepositTokens { pool_id }, - "infinity-pool-deposit-tokens", + "infinity-swap-deposit-tokens", vec![OrcCoin { amount: pool_deposit_amount, denom: denom.parse().unwrap(), @@ -114,7 +114,7 @@ fn large_single_pool_token_for_nft_swap(chain: &mut Chain) { is_active: true, pool_id, }, - "infinity-pool-activate", + "infinity-swap-activate", vec![], &user, ); @@ -162,7 +162,7 @@ fn large_single_pool_token_for_nft_swap(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-swap-tokens-for-any-nfts", + "infinity-swap-swap-tokens-for-any-nfts", vec![OrcCoin { amount: send_amount.u128(), denom: denom.parse().unwrap(), @@ -205,7 +205,7 @@ fn large_many_pool_token_for_nft_swap(chain: &mut Chain) { approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), &user, ); @@ -241,7 +241,7 @@ fn large_many_pool_token_for_nft_swap(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-swap-tokens-for-any-nfts", + "infinity-swap-swap-tokens-for-any-nfts", vec![OrcCoin { amount: send_amount.u128(), denom: denom.parse().unwrap(), diff --git a/test/e2e/src/tests/swap_nfts_for_tokens.rs b/test/e2e/src/tests/swap_nfts_for_tokens.rs index dbdc6b0..f784132 100644 --- a/test/e2e/src/tests/swap_nfts_for_tokens.rs +++ b/test/e2e/src/tests/swap_nfts_for_tokens.rs @@ -1,13 +1,13 @@ use crate::helpers::{ chain::Chain, - constants::{INFINITY_POOL_NAME, SG721_NAME}, + constants::{INFINITY_SWAP_NAME, SG721_NAME}, helper::{gen_users, latest_block_time}, instantiate::instantiate_minter, nft::{approve_all_nfts, mint_and_transfer_nfts}, pool::{create_pools_from_fixtures, pool_execute_message, pool_query_message}, }; use cosmwasm_std::Uint128; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, NftSwap, QueryMsg as InfinityPoolQueryMsg, SwapParams, SwapResponse, }; @@ -56,7 +56,7 @@ fn swap_small(chain: &mut Chain) { let bidder_token_ids = mint_and_transfer_nfts(chain, 10, &maker, taker_addr.as_ref()); approve_all_nfts( chain, - chain.orc.contract_map.address(INFINITY_POOL_NAME).unwrap(), + chain.orc.contract_map.address(INFINITY_SWAP_NAME).unwrap(), &taker, ); @@ -99,7 +99,7 @@ fn swap_small(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-swap-nfts-for-tokens", + "infinity-swap-swap-nfts-for-tokens", vec![], &taker, ); diff --git a/test/e2e/src/tests/swap_tokens_for_any_nfts.rs b/test/e2e/src/tests/swap_tokens_for_any_nfts.rs index e8ddf06..d9960ca 100644 --- a/test/e2e/src/tests/swap_tokens_for_any_nfts.rs +++ b/test/e2e/src/tests/swap_tokens_for_any_nfts.rs @@ -7,7 +7,7 @@ use crate::helpers::{ }; use cosm_orc::orchestrator::Coin as OrcCoin; use cosmwasm_std::Uint128; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, QueryMsg as InfinityPoolQueryMsg, SwapParams, SwapResponse, }; @@ -87,7 +87,7 @@ fn swap_small(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-swap-nfts-for-tokens", + "infinity-swap-swap-nfts-for-tokens", vec![OrcCoin { amount: total_amount.u128(), denom: denom.parse().unwrap(), diff --git a/test/e2e/src/tests/swap_tokens_for_specific_nfts.rs b/test/e2e/src/tests/swap_tokens_for_specific_nfts.rs index c7c509d..bdd59e5 100644 --- a/test/e2e/src/tests/swap_tokens_for_specific_nfts.rs +++ b/test/e2e/src/tests/swap_tokens_for_specific_nfts.rs @@ -7,11 +7,11 @@ use crate::helpers::{ }; use cosm_orc::orchestrator::Coin as OrcCoin; use cosmwasm_std::Uint128; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg as InfinityPoolExecuteMsg, NftSwap, NftTokenIdsResponse, PoolNftSwap, QueryMsg as InfinityPoolQueryMsg, QueryOptions, SwapParams, SwapResponse, }; -use infinity_pool::state::Pool; +use infinity_swap::state::Pool; use itertools::Itertools; use test_context::test_context; @@ -127,7 +127,7 @@ fn swap_small(chain: &mut Chain) { finder: None, }, }, - "infinity-pool-swap-tokens-for-specific-nfts", + "infinity-swap-swap-tokens-for-specific-nfts", vec![OrcCoin { amount: sender_amount.u128(), denom: denom.parse().unwrap(), diff --git a/test/unit/Cargo.toml b/test/unit/Cargo.toml index 67fd9d1..e1fcfdd 100644 --- a/test/unit/Cargo.toml +++ b/test/unit/Cargo.toml @@ -6,7 +6,7 @@ repository = { workspace = true } license = { workspace = true } [dependencies] -infinity-pool = { path = "../../contracts/infinity-pool" } +infinity-swap = { path = "../../contracts/infinity-swap" } cosmwasm-std = { workspace = true } cosmwasm-schema = { workspace = true } cosmwasm-storage = { workspace = true } diff --git a/test/unit/src/helpers/fixtures.rs b/test/unit/src/helpers/fixtures.rs index 7fb4e40..b01c323 100644 --- a/test/unit/src/helpers/fixtures.rs +++ b/test/unit/src/helpers/fixtures.rs @@ -1,8 +1,8 @@ use crate::helpers::nft_functions::{approve, mint}; use crate::helpers::pool_functions::create_pool; use cosmwasm_std::{Addr, Uint128}; -use infinity_pool::msg::ExecuteMsg; -use infinity_pool::state::{BondingCurve, Pool}; +use infinity_swap::msg::ExecuteMsg; +use infinity_swap::state::{BondingCurve, Pool}; use sg_multi_test::StargazeApp; use super::pool_functions::{activate, deposit_nfts, deposit_tokens}; @@ -149,7 +149,7 @@ pub fn get_pool_fixtures( pub fn create_pool_fixtures( router: &mut StargazeApp, - infinity_pool: Addr, + infinity_swap: Addr, collection: Addr, creator: Addr, user: Addr, @@ -170,14 +170,14 @@ pub fn create_pool_fixtures( } else { user.clone() }; - pools.push(create_pool(router, infinity_pool.clone(), sender.clone(), msg).unwrap()); + pools.push(create_pool(router, infinity_swap.clone(), sender.clone(), msg).unwrap()); } pools } pub fn create_and_activate_pool_fixtures( router: &mut StargazeApp, - infinity_pool: Addr, + infinity_swap: Addr, minter: Addr, collection: Addr, creator: Addr, @@ -193,7 +193,7 @@ pub fn create_and_activate_pool_fixtures( ); let mut pools = vec![]; for msg in msgs.into_iter() { - let pool = create_pool(router, infinity_pool.clone(), creator.clone(), msg).unwrap(); + let pool = create_pool(router, infinity_swap.clone(), creator.clone(), msg).unwrap(); if pool.can_buy_nfts() { let deposit_amount = if pool.bonding_curve == BondingCurve::ConstantProduct { Uint128::from(3_000u64) @@ -202,7 +202,7 @@ pub fn create_and_activate_pool_fixtures( }; deposit_tokens( router, - infinity_pool.clone(), + infinity_swap.clone(), pool.owner.clone(), pool.id, deposit_amount, @@ -211,12 +211,12 @@ pub fn create_and_activate_pool_fixtures( } if pool.can_sell_nfts() { let token_id_1 = mint(router, &pool.owner, &minter); - approve(router, &pool.owner, &collection, &infinity_pool, token_id_1); + approve(router, &pool.owner, &collection, &infinity_swap, token_id_1); let token_id_2 = mint(router, &pool.owner, &minter); - approve(router, &pool.owner, &collection, &infinity_pool, token_id_2); + approve(router, &pool.owner, &collection, &infinity_swap, token_id_2); deposit_nfts( router, - infinity_pool.clone(), + infinity_swap.clone(), pool.owner.clone(), pool.id, pool.collection.clone(), @@ -227,7 +227,7 @@ pub fn create_and_activate_pool_fixtures( ) .unwrap(); } - let pool = activate(router, &infinity_pool, &pool.owner, pool.id, true).unwrap(); + let pool = activate(router, &infinity_swap, &pool.owner, pool.id, true).unwrap(); pools.push(pool); } pools diff --git a/test/unit/src/helpers/pool_functions.rs b/test/unit/src/helpers/pool_functions.rs index bf9262b..71a1372 100644 --- a/test/unit/src/helpers/pool_functions.rs +++ b/test/unit/src/helpers/pool_functions.rs @@ -2,8 +2,8 @@ use crate::setup::setup_marketplace::LISTING_FEE; use anyhow::Error; use cosmwasm_std::{coins, Addr, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::{ExecuteMsg as InfinityPoolExecuteMsg, PoolsByIdResponse, QueryMsg}; -use infinity_pool::state::Pool; +use infinity_swap::msg::{ExecuteMsg as InfinityPoolExecuteMsg, PoolsByIdResponse, QueryMsg}; +use infinity_swap::state::Pool; use sg_multi_test::StargazeApp; use sg_std::NATIVE_DENOM; @@ -11,13 +11,13 @@ use super::fixtures::get_pool_fixtures; pub fn create_pool( router: &mut StargazeApp, - infinity_pool: Addr, + infinity_swap: Addr, owner: Addr, msg: InfinityPoolExecuteMsg, ) -> Result { let res = router.execute_contract( owner, - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -32,7 +32,7 @@ pub fn create_pool( }; let res: PoolsByIdResponse = router .wrap() - .query_wasm_smart(infinity_pool, &query_msg) + .query_wasm_smart(infinity_swap, &query_msg) .unwrap(); let pool = res.pools[0].1.clone().unwrap(); @@ -41,7 +41,7 @@ pub fn create_pool( pub fn deposit_tokens( router: &mut StargazeApp, - infinity_pool: Addr, + infinity_swap: Addr, owner: Addr, pool_id: u64, deposit_amount: Uint128, @@ -49,7 +49,7 @@ pub fn deposit_tokens( let msg = InfinityPoolExecuteMsg::DepositTokens { pool_id }; let res = router.execute_contract( owner, - infinity_pool, + infinity_swap, &msg, &coins(deposit_amount.u128(), NATIVE_DENOM), ); @@ -64,7 +64,7 @@ pub fn deposit_tokens( pub fn deposit_nfts( router: &mut StargazeApp, - infinity_pool: Addr, + infinity_swap: Addr, owner: Addr, pool_id: u64, collection: Addr, @@ -75,7 +75,7 @@ pub fn deposit_nfts( collection: collection.to_string(), nft_token_ids, }; - let res = router.execute_contract(owner, infinity_pool, &msg, &[]); + let res = router.execute_contract(owner, infinity_swap, &msg, &[]); assert!(res.is_ok()); let nft_token_ids = res.unwrap().events[1].attributes[2].value.clone(); @@ -84,20 +84,20 @@ pub fn deposit_nfts( pub fn activate( router: &mut StargazeApp, - infinity_pool: &Addr, + infinity_swap: &Addr, owner: &Addr, pool_id: u64, is_active: bool, ) -> Result { let msg = InfinityPoolExecuteMsg::SetActivePool { pool_id, is_active }; - let res = router.execute_contract(owner.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(owner.clone(), infinity_swap.clone(), &msg, &[]); assert!(res.is_ok()); let query_msg = QueryMsg::PoolsById { pool_ids: vec![pool_id], }; let res: PoolsByIdResponse = router .wrap() - .query_wasm_smart(infinity_pool, &query_msg) + .query_wasm_smart(infinity_swap, &query_msg) .unwrap(); let pool = res.pools[0].1.clone().unwrap(); @@ -106,7 +106,7 @@ pub fn activate( pub fn prepare_swap_pool( router: &mut StargazeApp, - infinity_pool: &Addr, + infinity_swap: &Addr, owner: &Addr, num_deposit_tokens: Uint128, nft_token_ids: Vec, @@ -115,7 +115,7 @@ pub fn prepare_swap_pool( ) -> Result { let pool = create_pool( router, - infinity_pool.clone(), + infinity_swap.clone(), owner.clone(), create_pool_msg, )?; @@ -123,7 +123,7 @@ pub fn prepare_swap_pool( if num_deposit_tokens > Uint128::zero() { deposit_tokens( router, - infinity_pool.clone(), + infinity_swap.clone(), owner.clone(), pool.id, num_deposit_tokens, @@ -133,7 +133,7 @@ pub fn prepare_swap_pool( if !nft_token_ids.is_empty() { deposit_nfts( router, - infinity_pool.clone(), + infinity_swap.clone(), owner.clone(), pool.id, pool.collection.clone(), @@ -141,7 +141,7 @@ pub fn prepare_swap_pool( )?; } - let pool = activate(router, infinity_pool, owner, pool.id, is_active)?; + let pool = activate(router, infinity_swap, owner, pool.id, is_active)?; Ok(pool) } @@ -150,7 +150,7 @@ pub fn prepare_pool_variations( router: &mut StargazeApp, num_pools: u8, asset_account: &Option, - infinity_pool: &Addr, + infinity_swap: &Addr, collection: &Addr, owner: &Addr, deposit_tokens_per_pool: Uint128, @@ -184,7 +184,7 @@ pub fn prepare_pool_variations( let pool = prepare_swap_pool( router, - infinity_pool, + infinity_swap, owner, curr_deposit_tokens_per_pool, curr_nft_token_ids.clone(), diff --git a/test/unit/src/helpers/swap_functions.rs b/test/unit/src/helpers/swap_functions.rs index 882c7a8..3605f2e 100644 --- a/test/unit/src/helpers/swap_functions.rs +++ b/test/unit/src/helpers/swap_functions.rs @@ -1,11 +1,11 @@ use crate::helpers::nft_functions::validate_nft_owner; use crate::setup::msg::MarketAccounts; -use crate::setup::setup_infinity_swap::setup_infinity_pool; +use crate::setup::setup_infinity_swap::setup_infinity_swap; use crate::setup::setup_marketplace::setup_marketplace; use crate::setup::templates::standard_minter_template; -use infinity_pool::msg::{PoolsByIdResponse, QueryMsg, TransactionType}; -use infinity_pool::state::{Pool, PoolType}; -use infinity_pool::swap_processor::Swap; +use infinity_swap::msg::{PoolsByIdResponse, QueryMsg, TransactionType}; +use infinity_swap::state::{Pool, PoolType}; +use infinity_swap::swap_processor::Swap; use anyhow::Error; use cosmwasm_std::{Addr, Coin, Decimal, Event, Uint128}; @@ -20,7 +20,7 @@ use test_suite::common_setup::setup_accounts_and_block::setup_block_time; pub struct SwapTestSetup { pub marketplace: Addr, - pub infinity_pool: Addr, + pub infinity_swap: Addr, pub vending_template: VendingTemplateResponse, } @@ -30,7 +30,7 @@ pub fn setup_swap_test(num_tokens: u32) -> Result { let marketplace = setup_marketplace(&mut vt.router, vt.accts.creator.clone()).unwrap(); setup_block_time(&mut vt.router, GENESIS_MINT_START_TIME, None); - let infinity_pool = setup_infinity_pool( + let infinity_swap = setup_infinity_swap( &mut vt.router, vt.accts.creator.clone(), marketplace.clone(), @@ -39,7 +39,7 @@ pub fn setup_swap_test(num_tokens: u32) -> Result { Ok(SwapTestSetup { marketplace, - infinity_pool, + infinity_swap, vending_template: vt, }) } @@ -132,7 +132,7 @@ pub fn validate_swap_outcome( .find(|&e| e.ty == "wasm-swap") .unwrap(); - let infinity_pool_addr = Addr::unchecked(wasm_swap_event.attributes[0].value.clone()); + let infinity_swap_addr = Addr::unchecked(wasm_swap_event.attributes[0].value.clone()); let tx_type = wasm_swap_event .attributes .iter() @@ -185,7 +185,7 @@ pub fn validate_swap_outcome( // Verify pool owner received NFT let pool_owner_account = if pool.pool_type == PoolType::Trade && pool.reinvest_nfts { - infinity_pool_addr.clone() + infinity_swap_addr.clone() } else { pool.get_recipient() }; @@ -197,7 +197,7 @@ pub fn validate_swap_outcome( // Verify pool owner received tokens let pool_owner_account = if pool.pool_type == PoolType::Trade && pool.reinvest_tokens { - infinity_pool_addr.clone() + infinity_swap_addr.clone() } else { pool.get_recipient() }; @@ -251,7 +251,7 @@ pub fn validate_swap_outcome( }; let post_swap_pools: PoolsByIdResponse = router .wrap() - .query_wasm_smart(infinity_pool_addr, &get_pools_msg) + .query_wasm_smart(infinity_swap_addr, &get_pools_msg) .unwrap(); let mut post_swap_pools_map: HashMap = HashMap::new(); for (pool_id, pool) in post_swap_pools.pools { diff --git a/test/unit/src/helpers/utils.rs b/test/unit/src/helpers/utils.rs index 3f0f978..e0b563e 100644 --- a/test/unit/src/helpers/utils.rs +++ b/test/unit/src/helpers/utils.rs @@ -1,7 +1,7 @@ use anyhow::Error; use cosmwasm_std::{Addr, Coin}; use cw_multi_test::AppResponse; -use infinity_pool::ContractError; +use infinity_swap::ContractError; use sg_multi_test::StargazeApp; use sg_std::NATIVE_DENOM; use std::collections::HashMap; diff --git a/test/unit/src/setup/setup_contracts.rs b/test/unit/src/setup/setup_contracts.rs index 56810f0..73b13c4 100644 --- a/test/unit/src/setup/setup_contracts.rs +++ b/test/unit/src/setup/setup_contracts.rs @@ -13,11 +13,11 @@ pub fn contract_marketplace() -> Box> { Box::new(contract) } -pub fn contract_infinity_pool() -> Box> { +pub fn contract_infinity_swap() -> Box> { let contract = ContractWrapper::new( - infinity_pool::execute::execute, - infinity_pool::instantiate::instantiate, - infinity_pool::query::query, + infinity_swap::execute::execute, + infinity_swap::instantiate::instantiate, + infinity_swap::query::query, ); Box::new(contract) } diff --git a/test/unit/src/setup/setup_infinity_swap.rs b/test/unit/src/setup/setup_infinity_swap.rs index 0024861..224453a 100644 --- a/test/unit/src/setup/setup_infinity_swap.rs +++ b/test/unit/src/setup/setup_infinity_swap.rs @@ -1,23 +1,23 @@ -use super::setup_contracts::contract_infinity_pool; +use super::setup_contracts::contract_infinity_swap; use cosmwasm_std::Addr; use cw_multi_test::Executor; use sg_marketplace::ContractError; use sg_multi_test::StargazeApp; use sg_std::NATIVE_DENOM; -pub fn setup_infinity_pool( +pub fn setup_infinity_swap( router: &mut StargazeApp, sender: Addr, marketplace_addr: Addr, ) -> Result { - let infinity_pool_id = router.store_code(contract_infinity_pool()); - let msg = infinity_pool::msg::InstantiateMsg { + let infinity_swap_id = router.store_code(contract_infinity_swap()); + let msg = infinity_swap::msg::InstantiateMsg { denom: NATIVE_DENOM.to_string(), marketplace_addr: marketplace_addr.to_string(), developer: None, }; - let infinity_pool = router - .instantiate_contract(infinity_pool_id, sender, &msg, &[], "Infinity Pool", None) + let infinity_swap = router + .instantiate_contract(infinity_swap_id, sender, &msg, &[], "Infinity Swap", None) .unwrap(); - Ok(infinity_pool) + Ok(infinity_swap) } diff --git a/test/unit/src/tests/multitest.rs b/test/unit/src/tests/multitest.rs index 50b8a82..056466a 100644 --- a/test/unit/src/tests/multitest.rs +++ b/test/unit/src/tests/multitest.rs @@ -2,8 +2,8 @@ use std::vec; use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info}; use cosmwasm_std::{coins, Addr, Attribute}; -use infinity_pool::instantiate::instantiate; -use infinity_pool::msg::InstantiateMsg; +use infinity_swap::instantiate::instantiate; +use infinity_swap::msg::InstantiateMsg; use sg_std::NATIVE_DENOM; const MARKETPLACE: &str = "marketplace"; diff --git a/test/unit/src/tests/pool_tests/nft_pool_tests.rs b/test/unit/src/tests/pool_tests/nft_pool_tests.rs index 454add9..bdbaaa7 100644 --- a/test/unit/src/tests/pool_tests/nft_pool_tests.rs +++ b/test/unit/src/tests/pool_tests/nft_pool_tests.rs @@ -4,14 +4,14 @@ use crate::helpers::nft_functions::{approve, mint}; use crate::helpers::pool_functions::create_pool; use crate::helpers::utils::assert_error; use crate::setup::setup_accounts::setup_addtl_account; -use crate::setup::setup_infinity_swap::setup_infinity_pool; +use crate::setup::setup_infinity_swap::setup_infinity_swap; use crate::setup::setup_marketplace::{setup_marketplace, LISTING_FEE}; use crate::setup::templates::standard_minter_template; use cosmwasm_std::{coins, Addr, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::ExecuteMsg; -use infinity_pool::state::BondingCurve; -use infinity_pool::ContractError; +use infinity_swap::msg::ExecuteMsg; +use infinity_swap::state::BondingCurve; +use infinity_swap::ContractError; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; use test_suite::common_setup::setup_accounts_and_block::setup_block_time; @@ -25,7 +25,7 @@ fn create_nft_pool() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); // Cannot create a ConstantProduct Nft Pool because the pool does not hold both assets let msg = ExecuteMsg::CreateNftPool { @@ -36,7 +36,7 @@ fn create_nft_pool() { delta: Uint128::from(120u64), finders_fee_bps: 0, }; - let res = router.execute_contract(creator.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(creator.clone(), infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::InvalidPool(String::from( @@ -55,7 +55,7 @@ fn create_nft_pool() { }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -72,7 +72,7 @@ fn create_nft_pool() { }; let res = router.execute_contract( creator, - infinity_pool, + infinity_swap, &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -95,11 +95,11 @@ fn deposit_assets_nft_pool() { setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pool = create_pool( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), ExecuteMsg::CreateNftPool { collection: collection.to_string(), @@ -114,15 +114,15 @@ fn deposit_assets_nft_pool() { // Only owner can deposit NFTs into nft pool let token_id_1 = mint(&mut router, &user1, minter); - approve(&mut router, &user1, &collection, &infinity_pool, token_id_1); + approve(&mut router, &user1, &collection, &infinity_swap, token_id_1); let token_id_2 = mint(&mut router, &user1, minter); - approve(&mut router, &user1, &collection, &infinity_pool, token_id_2); + approve(&mut router, &user1, &collection, &infinity_swap, token_id_2); let msg = ExecuteMsg::DepositNfts { pool_id: pool.id, collection: collection.to_string(), nft_token_ids: vec![token_id_1.to_string(), token_id_2.to_string()], }; - let res = router.execute_contract(user1.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(user1.clone(), infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::Unauthorized("sender is not the owner of the pool".to_string()), @@ -134,7 +134,7 @@ fn deposit_assets_nft_pool() { &mut router, &creator, &collection, - &infinity_pool, + &infinity_swap, token_id_1, ); let token_id_2 = mint(&mut router, &creator, minter); @@ -142,7 +142,7 @@ fn deposit_assets_nft_pool() { &mut router, &creator, &collection, - &infinity_pool, + &infinity_swap, token_id_2, ); let msg = ExecuteMsg::DepositNfts { @@ -150,7 +150,7 @@ fn deposit_assets_nft_pool() { collection: collection.to_string(), nft_token_ids: vec![token_id_1.to_string(), token_id_2.to_string()], }; - let res = router.execute_contract(creator.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(creator.clone(), infinity_swap.clone(), &msg, &[]); assert!(res.is_ok()); // Owner cannot deposit tokens into nft pool @@ -158,7 +158,7 @@ fn deposit_assets_nft_pool() { let msg = ExecuteMsg::DepositTokens { pool_id: pool.id }; let res = router.execute_contract( creator, - infinity_pool, + infinity_swap, &msg, &coins(deposit_amount, NATIVE_DENOM), ); diff --git a/test/unit/src/tests/pool_tests/token_pool_tests.rs b/test/unit/src/tests/pool_tests/token_pool_tests.rs index 7406ba3..a823451 100644 --- a/test/unit/src/tests/pool_tests/token_pool_tests.rs +++ b/test/unit/src/tests/pool_tests/token_pool_tests.rs @@ -4,14 +4,14 @@ use crate::helpers::nft_functions::{approve, mint}; use crate::helpers::pool_functions::{create_pool, deposit_tokens}; use crate::helpers::utils::assert_error; use crate::setup::setup_accounts::{setup_addtl_account, INITIAL_BALANCE}; -use crate::setup::setup_infinity_swap::setup_infinity_pool; +use crate::setup::setup_infinity_swap::setup_infinity_swap; use crate::setup::setup_marketplace::{setup_marketplace, LISTING_FEE}; use crate::setup::templates::standard_minter_template; use cosmwasm_std::{coins, Addr, Attribute, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::ExecuteMsg; -use infinity_pool::state::BondingCurve; -use infinity_pool::ContractError; +use infinity_swap::msg::ExecuteMsg; +use infinity_swap::state::BondingCurve; +use infinity_swap::ContractError; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; use test_suite::common_setup::setup_accounts_and_block::setup_block_time; @@ -25,7 +25,7 @@ fn create_token_pool() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); // Cannot create a ConstantProduct Token Pool because the pool does not hold both assets let msg = ExecuteMsg::CreateTokenPool { @@ -38,7 +38,7 @@ fn create_token_pool() { }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -60,7 +60,7 @@ fn create_token_pool() { }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -77,7 +77,7 @@ fn create_token_pool() { }; let res = router.execute_contract( creator, - infinity_pool, + infinity_swap, &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -100,11 +100,11 @@ fn deposit_assets_token_pool() { setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pool = create_pool( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), ExecuteMsg::CreateTokenPool { collection: collection.to_string(), @@ -122,7 +122,7 @@ fn deposit_assets_token_pool() { let msg = ExecuteMsg::DepositTokens { pool_id: pool.id }; let res = router.execute_contract( user1, - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(deposit_amount, NATIVE_DENOM), ); @@ -136,7 +136,7 @@ fn deposit_assets_token_pool() { let msg = ExecuteMsg::DepositTokens { pool_id: pool.id }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(deposit_amount_1, NATIVE_DENOM), ); @@ -146,7 +146,7 @@ fn deposit_assets_token_pool() { let deposit_amount_2 = 3200u128; let total_tokens = deposit_tokens( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), pool.id, Uint128::from(deposit_amount_2), @@ -160,7 +160,7 @@ fn deposit_assets_token_pool() { &mut router, &creator, &collection, - &infinity_pool, + &infinity_swap, token_id_1, ); let token_id_2 = mint(&mut router, &creator, minter); @@ -168,7 +168,7 @@ fn deposit_assets_token_pool() { &mut router, &creator, &collection, - &infinity_pool, + &infinity_swap, token_id_2, ); let msg = ExecuteMsg::DepositNfts { @@ -176,7 +176,7 @@ fn deposit_assets_token_pool() { collection: collection.to_string(), nft_token_ids: vec![token_id_1.to_string(), token_id_2.to_string()], }; - let res = router.execute_contract(creator, infinity_pool, &msg, &[]); + let res = router.execute_contract(creator, infinity_swap, &msg, &[]); assert_error( res, ContractError::InvalidPool("cannot deposit nfts into token pool".to_string()), @@ -198,11 +198,11 @@ fn withdraw_assets_token_pool() { setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pool = create_pool( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), ExecuteMsg::CreateTokenPool { collection: collection.to_string(), @@ -218,7 +218,7 @@ fn withdraw_assets_token_pool() { let deposit_amount = Uint128::from(1000u64); deposit_tokens( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), pool.id, deposit_amount, @@ -231,7 +231,7 @@ fn withdraw_assets_token_pool() { amount: Uint128::from(300u64), asset_recipient: None, }; - let res = router.execute_contract(user1, infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(user1, infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::Unauthorized("sender is not the owner of the pool".to_string()), @@ -244,7 +244,7 @@ fn withdraw_assets_token_pool() { amount: withdraw_amount, asset_recipient: Some(asset_account.to_string()), }; - let res = router.execute_contract(creator.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(creator.clone(), infinity_swap.clone(), &msg, &[]); let total_tokens = res.as_ref().unwrap().events[1].attributes[3] .value .parse::() @@ -262,7 +262,7 @@ fn withdraw_assets_token_pool() { pool_id: pool.id, asset_recipient: None, }; - let res = router.execute_contract(creator.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(creator.clone(), infinity_swap.clone(), &msg, &[]); let total_tokens = res.as_ref().unwrap().events[1].attributes[3] .value .parse::() @@ -281,7 +281,7 @@ fn withdraw_assets_token_pool() { nft_token_ids: vec!["1".to_string()], asset_recipient: None, }; - let res = router.execute_contract(creator.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(creator.clone(), infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::InvalidPool("cannot withdraw nfts from token pool".to_string()), @@ -292,7 +292,7 @@ fn withdraw_assets_token_pool() { pool_id: pool.id, asset_recipient: None, }; - let res = router.execute_contract(creator, infinity_pool, &msg, &[]); + let res = router.execute_contract(creator, infinity_swap, &msg, &[]); assert_error( res, ContractError::InvalidPool("cannot withdraw nfts from token pool".to_string()), @@ -314,11 +314,11 @@ fn update_token_pool() { setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pool = create_pool( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), ExecuteMsg::CreateTokenPool { collection: collection.to_string(), @@ -342,7 +342,7 @@ fn update_token_pool() { reinvest_nfts: Some(false), reinvest_tokens: Some(false), }; - let res = router.execute_contract(user1, infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(user1, infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::Unauthorized("sender is not the owner of the pool".to_string()), @@ -359,7 +359,7 @@ fn update_token_pool() { reinvest_nfts: Some(false), reinvest_tokens: Some(false), }; - let res = router.execute_contract(creator.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(creator.clone(), infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::InvalidPool("swap_fee_percent must be 0 for token pool".to_string()), @@ -378,7 +378,7 @@ fn update_token_pool() { reinvest_nfts: Some(false), reinvest_tokens: Some(false), }; - let res = router.execute_contract(creator, infinity_pool, &msg, &[]); + let res = router.execute_contract(creator, infinity_swap, &msg, &[]); assert!(res.is_ok()); let attrs = &res.as_ref().unwrap().events[1].attributes; assert_eq!( @@ -426,11 +426,11 @@ fn remove_token_pool() { setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pool = create_pool( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), ExecuteMsg::CreateTokenPool { collection: collection.to_string(), @@ -446,7 +446,7 @@ fn remove_token_pool() { let deposit_amount = Uint128::from(1000u64); deposit_tokens( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), pool.id, deposit_amount, @@ -458,7 +458,7 @@ fn remove_token_pool() { pool_id: pool.id, asset_recipient: Some(asset_account.to_string()), }; - let res = router.execute_contract(user1, infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(user1, infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::Unauthorized("sender is not the owner of the pool".to_string()), @@ -469,7 +469,7 @@ fn remove_token_pool() { pool_id: pool.id, asset_recipient: Some(asset_account.to_string()), }; - let res = router.execute_contract(creator, infinity_pool, &msg, &[]); + let res = router.execute_contract(creator, infinity_swap, &msg, &[]); assert!(res.is_ok()); let asset_account_balance = router.wrap().query_all_balances(asset_account).unwrap(); assert_eq!(deposit_amount, asset_account_balance[0].amount); @@ -490,11 +490,11 @@ fn activate_token_pool() { setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pool = create_pool( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), ExecuteMsg::CreateTokenPool { collection: collection.to_string(), @@ -510,7 +510,7 @@ fn activate_token_pool() { let deposit_amount = Uint128::from(1000u64); deposit_tokens( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), pool.id, deposit_amount, @@ -522,7 +522,7 @@ fn activate_token_pool() { is_active: true, pool_id: pool.id, }; - let res = router.execute_contract(user1, infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(user1, infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::Unauthorized("sender is not the owner of the pool".to_string()), @@ -533,7 +533,7 @@ fn activate_token_pool() { is_active: true, pool_id: pool.id, }; - let res = router.execute_contract(creator, infinity_pool, &msg, &[]); + let res = router.execute_contract(creator, infinity_swap, &msg, &[]); let is_active = &res.as_ref().unwrap().events[1].attributes[2].value; assert_eq!(is_active, &"true"); } diff --git a/test/unit/src/tests/pool_tests/trade_pool_tests.rs b/test/unit/src/tests/pool_tests/trade_pool_tests.rs index 3e3a897..3cccdc6 100644 --- a/test/unit/src/tests/pool_tests/trade_pool_tests.rs +++ b/test/unit/src/tests/pool_tests/trade_pool_tests.rs @@ -3,14 +3,14 @@ use std::vec; use crate::helpers::nft_functions::{approve, mint}; use crate::helpers::pool_functions::create_pool; use crate::helpers::utils::assert_error; -use crate::setup::setup_infinity_swap::setup_infinity_pool; +use crate::setup::setup_infinity_swap::setup_infinity_swap; use crate::setup::setup_marketplace::{setup_marketplace, LISTING_FEE}; use crate::setup::templates::standard_minter_template; use cosmwasm_std::{coins, Addr, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::ExecuteMsg; -use infinity_pool::state::BondingCurve; -use infinity_pool::ContractError; +use infinity_swap::msg::ExecuteMsg; +use infinity_swap::state::BondingCurve; +use infinity_swap::ContractError; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; use test_suite::common_setup::setup_accounts_and_block::setup_block_time; @@ -24,7 +24,7 @@ fn create_trade_pool() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); // Cannot create a Trade Pool with a fee > 9000; let msg = ExecuteMsg::CreateTradePool { @@ -40,7 +40,7 @@ fn create_trade_pool() { }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -63,7 +63,7 @@ fn create_trade_pool() { }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -83,7 +83,7 @@ fn create_trade_pool() { }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -103,7 +103,7 @@ fn create_trade_pool() { }; let res = router.execute_contract( creator, - infinity_pool, + infinity_swap, &msg, &coins(LISTING_FEE, NATIVE_DENOM), ); @@ -125,11 +125,11 @@ fn deposit_assets_trade_pool() { setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pool = create_pool( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), ExecuteMsg::CreateTradePool { collection: collection.to_string(), @@ -150,7 +150,7 @@ fn deposit_assets_trade_pool() { let msg = ExecuteMsg::DepositTokens { pool_id: pool.id }; let res = router.execute_contract( user1.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(deposit_amount, NATIVE_DENOM), ); @@ -164,7 +164,7 @@ fn deposit_assets_trade_pool() { let msg = ExecuteMsg::DepositTokens { pool_id: pool.id }; let res = router.execute_contract( creator.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &msg, &coins(deposit_amount, NATIVE_DENOM), ); @@ -172,15 +172,15 @@ fn deposit_assets_trade_pool() { // Only owner can deposit NFTs into nft pool let token_id_1 = mint(&mut router, &user1, minter); - approve(&mut router, &user1, &collection, &infinity_pool, token_id_1); + approve(&mut router, &user1, &collection, &infinity_swap, token_id_1); let token_id_2 = mint(&mut router, &user1, minter); - approve(&mut router, &user1, &collection, &infinity_pool, token_id_2); + approve(&mut router, &user1, &collection, &infinity_swap, token_id_2); let msg = ExecuteMsg::DepositNfts { pool_id: pool.id, collection: collection.to_string(), nft_token_ids: vec![token_id_1.to_string(), token_id_2.to_string()], }; - let res = router.execute_contract(user1.clone(), infinity_pool.clone(), &msg, &[]); + let res = router.execute_contract(user1.clone(), infinity_swap.clone(), &msg, &[]); assert_error( res, ContractError::Unauthorized("sender is not the owner of the pool".to_string()), @@ -192,7 +192,7 @@ fn deposit_assets_trade_pool() { &mut router, &creator, &collection, - &infinity_pool, + &infinity_swap, token_id_1, ); let token_id_2 = mint(&mut router, &creator, minter); @@ -200,7 +200,7 @@ fn deposit_assets_trade_pool() { &mut router, &creator, &collection, - &infinity_pool, + &infinity_swap, token_id_2, ); let msg = ExecuteMsg::DepositNfts { @@ -208,6 +208,6 @@ fn deposit_assets_trade_pool() { collection: collection.to_string(), nft_token_ids: vec![token_id_1.to_string(), token_id_2.to_string()], }; - let res = router.execute_contract(creator, infinity_pool, &msg, &[]); + let res = router.execute_contract(creator, infinity_swap, &msg, &[]); assert!(res.is_ok()); } diff --git a/test/unit/src/tests/query_tests.rs b/test/unit/src/tests/query_tests.rs index c72ed7c..b1d1e74 100644 --- a/test/unit/src/tests/query_tests.rs +++ b/test/unit/src/tests/query_tests.rs @@ -4,15 +4,15 @@ use crate::helpers::fixtures::{create_and_activate_pool_fixtures, create_pool_fi use crate::helpers::nft_functions::mint_and_approve_many; use crate::helpers::pool_functions::prepare_swap_pool; use crate::setup::setup_accounts::setup_addtl_account; -use crate::setup::setup_infinity_swap::setup_infinity_pool; +use crate::setup::setup_infinity_swap::setup_infinity_swap; use crate::setup::setup_marketplace::setup_marketplace; use crate::setup::templates::standard_minter_template; use cosmwasm_std::{Addr, Uint128}; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ConfigResponse, ExecuteMsg, NftTokenIdsResponse, PoolQuoteResponse, PoolsByIdResponse, PoolsResponse, QueryMsg, QueryOptions, }; -use infinity_pool::state::{BondingCurve, Config, PoolQuote}; +use infinity_swap::state::{BondingCurve, Config, PoolQuote}; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; use test_suite::common_setup::setup_accounts_and_block::setup_block_time; @@ -27,13 +27,13 @@ fn try_query_config() { let _asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator, marketplace.clone()).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator, marketplace.clone()).unwrap(); let config_query = QueryMsg::Config {}; let res: ConfigResponse = router .wrap() - .query_wasm_smart(infinity_pool, &config_query) + .query_wasm_smart(infinity_swap, &config_query) .unwrap(); assert_eq!( @@ -55,11 +55,11 @@ fn try_query_pools() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pools = create_pool_fixtures( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), collection, creator, user, @@ -78,7 +78,7 @@ fn try_query_pools() { let res: PoolsResponse = router .wrap() - .query_wasm_smart(infinity_pool, &pool_query) + .query_wasm_smart(infinity_swap, &pool_query) .unwrap(); assert_eq!(res.pools.len(), 2); assert_eq!(res.pools[0], pools[3].clone()); @@ -94,11 +94,11 @@ fn try_query_pools_by_id() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pools = create_pool_fixtures( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), collection, creator, user, @@ -113,7 +113,7 @@ fn try_query_pools_by_id() { let res: PoolsByIdResponse = router .wrap() - .query_wasm_smart(infinity_pool, &pool_query) + .query_wasm_smart(infinity_swap, &pool_query) .unwrap(); assert_eq!(res.pools[0], (1, Some(pools[0].clone()))); assert_eq!(res.pools[1], (2, Some(pools[1].clone()))); @@ -129,11 +129,11 @@ fn try_query_pools_by_owner() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); let pools = create_pool_fixtures( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), collection, creator, user.clone(), @@ -153,7 +153,7 @@ fn try_query_pools_by_owner() { let res: PoolsResponse = router .wrap() - .query_wasm_smart(infinity_pool, &pool_query) + .query_wasm_smart(infinity_swap, &pool_query) .unwrap(); assert_eq!(res.pools.len(), 3); assert_eq!(res.pools[0], pools[9].clone()); @@ -170,13 +170,13 @@ fn try_query_pools_by_buy_price() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let _pools = create_and_activate_pool_fixtures( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), minter, collection.clone(), creator, @@ -196,7 +196,7 @@ fn try_query_pools_by_buy_price() { let res: PoolQuoteResponse = router .wrap() - .query_wasm_smart(infinity_pool, &pool_query) + .query_wasm_smart(infinity_swap, &pool_query) .unwrap(); assert_eq!(res.pool_quotes.len(), 10); @@ -268,13 +268,13 @@ fn try_query_pools_by_sell_price() { let asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); let _pools = create_and_activate_pool_fixtures( &mut router, - infinity_pool.clone(), + infinity_swap.clone(), minter, collection.clone(), creator, @@ -294,7 +294,7 @@ fn try_query_pools_by_sell_price() { let res: PoolQuoteResponse = router .wrap() - .query_wasm_smart(infinity_pool, &pool_query) + .query_wasm_smart(infinity_swap, &pool_query) .unwrap(); assert_eq!(res.pool_quotes.len(), 10); let expected_pool_quotes = vec![ @@ -364,7 +364,7 @@ fn try_query_pool_nft_token_ids() { let _asset_account = Addr::unchecked(ASSET_ACCOUNT); let marketplace = setup_marketplace(&mut router, creator.clone()).unwrap(); - let infinity_pool = setup_infinity_pool(&mut router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(&mut router, creator.clone(), marketplace).unwrap(); setup_block_time(&mut router, GENESIS_MINT_START_TIME, None); @@ -374,13 +374,13 @@ fn try_query_pool_nft_token_ids() { &owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 500, ); let pool = prepare_swap_pool( &mut router, - &infinity_pool.clone(), + &infinity_swap.clone(), &owner, Uint128::from(1_000_000u128), owner_token_ids.clone(), @@ -405,7 +405,7 @@ fn try_query_pool_nft_token_ids() { let response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { diff --git a/test/unit/src/tests/sim_tests/get_messages.rs b/test/unit/src/tests/sim_tests/get_messages.rs index 6836c7b..a35e91f 100644 --- a/test/unit/src/tests/sim_tests/get_messages.rs +++ b/test/unit/src/tests/sim_tests/get_messages.rs @@ -2,15 +2,15 @@ use std::vec; use cosmwasm_std::Timestamp; use cosmwasm_std::{Addr, Uint128}; -use infinity_pool::msg::PoolNftSwap; -use infinity_pool::msg::QueryMsg::SimDirectSwapNftsForTokens; -use infinity_pool::msg::QueryMsg::SimDirectSwapTokensForSpecificNfts; -use infinity_pool::msg::QueryMsg::SimSwapNftsForTokens; -use infinity_pool::msg::QueryMsg::SimSwapTokensForAnyNfts; -use infinity_pool::msg::QueryMsg::SimSwapTokensForSpecificNfts; -use infinity_pool::msg::{self}; -use infinity_pool::msg::{NftSwap, SwapParams}; -use infinity_pool::state::Pool; +use infinity_swap::msg::PoolNftSwap; +use infinity_swap::msg::QueryMsg::SimDirectSwapNftsForTokens; +use infinity_swap::msg::QueryMsg::SimDirectSwapTokensForSpecificNfts; +use infinity_swap::msg::QueryMsg::SimSwapNftsForTokens; +use infinity_swap::msg::QueryMsg::SimSwapTokensForAnyNfts; +use infinity_swap::msg::QueryMsg::SimSwapTokensForSpecificNfts; +use infinity_swap::msg::{self}; +use infinity_swap::msg::{NftSwap, SwapParams}; +use infinity_swap::state::Pool; use sg_std::GENESIS_MINT_START_TIME; pub fn get_sim_swap_message( diff --git a/test/unit/src/tests/sim_tests/helpers.rs b/test/unit/src/tests/sim_tests/helpers.rs index aaccdb5..bb9fa4e 100644 --- a/test/unit/src/tests/sim_tests/helpers.rs +++ b/test/unit/src/tests/sim_tests/helpers.rs @@ -2,15 +2,15 @@ use std::vec; use crate::helpers::nft_functions::{approve, mint}; use crate::helpers::pool_functions::create_pool; -use crate::setup::setup_infinity_pool::setup_infinity_pool; +use crate::setup::setup_infinity_swap::setup_infinity_swap; use crate::setup::setup_marketplace::setup_marketplace_trading_fee; use crate::swap_processor::{NftPayment, Swap, TokenPayment}; use cosmwasm_std::{coins, Addr, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::ExecuteMsg; -use infinity_pool::state::BondingCurve; -use infinity_pool::state::Pool; -use infinity_pool::state::PoolType; +use infinity_swap::msg::ExecuteMsg; +use infinity_swap::state::BondingCurve; +use infinity_swap::state::Pool; +use infinity_swap::state::PoolType; use sg_multi_test::StargazeApp; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; use test_suite::common_setup::setup_accounts_and_block::setup_block_time; @@ -24,7 +24,7 @@ pub struct SwapPoolResult { pub creator: Addr, pub minter: Addr, pub collection: Addr, - pub infinity_pool: Addr, + pub infinity_swap: Addr, pub pool: Pool, } @@ -45,7 +45,7 @@ pub struct VendingTemplateSetup<'a> { pub struct ProcessSwapPoolResultsResponse { pub minter: Addr, pub collection: Addr, - pub infinity_pool: Addr, + pub infinity_swap: Addr, pub pool: Pool, pub creator: Addr, pub user1: Addr, @@ -81,12 +81,12 @@ pub fn setup_swap_pool( let marketplace = setup_marketplace_trading_fee(router, creator.clone(), trading_fee).unwrap(); setup_block_time(router, GENESIS_MINT_START_TIME, None); - let infinity_pool = setup_infinity_pool(router, creator.clone(), marketplace).unwrap(); + let infinity_swap = setup_infinity_swap(router, creator.clone(), marketplace).unwrap(); let mut results: Vec> = vec![]; for swap_pool_config in swap_pool_configs { - let infinity_pool = infinity_pool.clone(); + let infinity_swap = infinity_swap.clone(); let creator = creator.clone(); let user1 = user1.clone(); let user2 = user2.clone(); @@ -126,7 +126,7 @@ pub fn setup_swap_pool( // Can create a Linear Nft Pool let pool_result = create_pool( router, - infinity_pool.clone(), + infinity_swap.clone(), creator.clone(), create_pool_msg, ); @@ -137,7 +137,7 @@ pub fn setup_swap_pool( creator, minter, collection, - infinity_pool, + infinity_swap, pool: result, }), Err(err) => Err(err), @@ -155,7 +155,7 @@ pub fn deposit_nfts_and_tokens( router: &mut StargazeApp, minter: Addr, collection: Addr, - infinity_pool: Addr, + infinity_swap: Addr, pool: Pool, creator: Addr, deposit_amount: u128, @@ -164,11 +164,11 @@ pub fn deposit_nfts_and_tokens( router, minter, collection, - infinity_pool.clone(), + infinity_swap.clone(), pool.clone(), creator.clone(), ); - let _ = deposit_tokens(router, deposit_amount, infinity_pool, pool, creator); + let _ = deposit_tokens(router, deposit_amount, infinity_swap, pool, creator); DepositNftsResult { token_id_1: tokens.token_id_1, token_id_2: tokens.token_id_2, @@ -179,20 +179,20 @@ pub fn deposit_nfts( router: &mut StargazeApp, minter: Addr, collection: Addr, - infinity_pool: Addr, + infinity_swap: Addr, pool: Pool, creator: Addr, ) -> DepositNftsResult { let token_id_1 = mint(router, &creator, &minter); - approve(router, &creator, &collection, &infinity_pool, token_id_1); + approve(router, &creator, &collection, &infinity_swap, token_id_1); let token_id_2 = mint(router, &creator, &minter); - approve(router, &creator, &collection, &infinity_pool, token_id_2); + approve(router, &creator, &collection, &infinity_swap, token_id_2); let msg = ExecuteMsg::DepositNfts { pool_id: pool.id, collection: collection.to_string(), nft_token_ids: vec![token_id_1.to_string(), token_id_2.to_string()], }; - let _ = router.execute_contract(creator, infinity_pool, &msg, &[]); + let _ = router.execute_contract(creator, infinity_swap, &msg, &[]); DepositNftsResult { token_id_1, @@ -204,26 +204,26 @@ pub fn deposit_one_nft( router: &mut StargazeApp, minter: Addr, collection: Addr, - infinity_pool: Addr, + infinity_swap: Addr, pool: Pool, creator: Addr, ) -> u32 { let token_id_1 = mint(router, &creator, &minter); - approve(router, &creator, &collection, &infinity_pool, token_id_1); + approve(router, &creator, &collection, &infinity_swap, token_id_1); let msg = ExecuteMsg::DepositNfts { pool_id: pool.id, collection: collection.to_string(), nft_token_ids: vec![token_id_1.to_string()], }; - let _ = router.execute_contract(creator, infinity_pool, &msg, &[]); + let _ = router.execute_contract(creator, infinity_swap, &msg, &[]); token_id_1 } pub fn deposit_tokens( router: &mut StargazeApp, deposit_amount: u128, - infinity_pool: Addr, + infinity_swap: Addr, pool: Pool, creator: Addr, ) -> Result<(), anyhow::Error> { @@ -232,7 +232,7 @@ pub fn deposit_tokens( let msg = ExecuteMsg::DepositTokens { pool_id: pool.id }; let res = router.execute_contract( creator, - infinity_pool, + infinity_swap, &msg, &coins(deposit_amount_1, NATIVE_DENOM), ); @@ -255,11 +255,11 @@ fn process_swap_result( true, r.pool.clone(), r.creator.clone(), - r.infinity_pool.clone(), + r.infinity_swap.clone(), ); let minter = r.minter.clone(); let collection = r.collection.clone(); - let infinity_pool = r.infinity_pool.clone(); + let infinity_swap = r.infinity_swap.clone(); let pool = r.pool.clone(); let creator = r.creator.clone(); let user1 = r.user1.clone(); @@ -269,7 +269,7 @@ fn process_swap_result( router, minter.clone(), collection.clone(), - infinity_pool.clone(), + infinity_swap.clone(), pool.clone(), creator.clone(), ), @@ -278,7 +278,7 @@ fn process_swap_result( let _ = deposit_tokens( router, deposit_amount, - r.infinity_pool.clone(), + r.infinity_swap.clone(), r.pool.clone(), r.creator.clone(), ); @@ -287,7 +287,7 @@ fn process_swap_result( token_id, minter, collection, - infinity_pool, + infinity_swap, pool, creator, user1, @@ -320,7 +320,7 @@ pub fn process_swap_results( let mut swap_results: Vec> = setup_swap_pool(router, vts, swap_pool_configs, trading_fee); let swap_result = swap_results.pop().unwrap(); - let (token_id, minter, collection, infinity_pool, pool, creator, user1, user2) = + let (token_id, minter, collection, infinity_swap, pool, creator, user1, user2) = process_swap_result( router, &swap_result, @@ -339,7 +339,7 @@ pub fn process_swap_results( ProcessSwapPoolResultsResponse { minter, collection, - infinity_pool, + infinity_swap, pool, creator, user1, @@ -353,13 +353,13 @@ pub fn set_pool_active( is_active: bool, pool: Pool, creator: Addr, - infinity_pool: Addr, + infinity_swap: Addr, ) { let msg = ExecuteMsg::SetActivePool { is_active, pool_id: pool.id, }; - let _ = router.execute_contract(creator, infinity_pool, &msg, &[]); + let _ = router.execute_contract(creator, infinity_swap, &msg, &[]); } pub fn check_nft_sale(scp: NftSaleCheckParams) { diff --git a/test/unit/src/tests/sim_tests/sim_direct_swap_nfts_for_tokens.rs b/test/unit/src/tests/sim_tests/sim_direct_swap_nfts_for_tokens.rs index d0cfa6e..aec0036 100644 --- a/test/unit/src/tests/sim_tests/sim_direct_swap_nfts_for_tokens.rs +++ b/test/unit/src/tests/sim_tests/sim_direct_swap_nfts_for_tokens.rs @@ -3,7 +3,7 @@ use crate::helpers::pool_functions::prepare_pool_variations; use crate::helpers::swap_functions::{setup_swap_test, validate_swap_fees, SwapTestSetup}; use crate::setup::setup_accounts::setup_addtl_account; use cosmwasm_std::{StdError, StdResult, Timestamp, Uint128}; -use infinity_pool::msg::{NftSwap, QueryMsg, SwapParams, SwapResponse}; +use infinity_swap::msg::{NftSwap, QueryMsg, SwapParams, SwapResponse}; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_marketplace::msg::{ParamsResponse, QueryMsg as MarketplaceQueryMsg}; use sg_std::GENESIS_MINT_START_TIME; @@ -19,7 +19,7 @@ fn cant_swap_inactive_pool() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -33,7 +33,7 @@ fn cant_swap_inactive_pool() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -42,7 +42,7 @@ fn cant_swap_inactive_pool() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -51,7 +51,7 @@ fn cant_swap_inactive_pool() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -88,7 +88,7 @@ fn cant_swap_inactive_pool() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -109,7 +109,7 @@ fn cant_swap_invalid_pool_type() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -123,7 +123,7 @@ fn cant_swap_invalid_pool_type() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -132,7 +132,7 @@ fn cant_swap_invalid_pool_type() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -141,7 +141,7 @@ fn cant_swap_invalid_pool_type() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -178,7 +178,7 @@ fn cant_swap_invalid_pool_type() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -199,7 +199,7 @@ fn can_swap_active_pool() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -213,7 +213,7 @@ fn can_swap_active_pool() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -222,7 +222,7 @@ fn can_swap_active_pool() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -231,7 +231,7 @@ fn can_swap_active_pool() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -269,7 +269,7 @@ fn can_swap_active_pool() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!(res.unwrap().swaps.len(), 3); } } @@ -284,7 +284,7 @@ fn insufficient_tokens_error() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -298,7 +298,7 @@ fn insufficient_tokens_error() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -307,7 +307,7 @@ fn insufficient_tokens_error() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -316,7 +316,7 @@ fn insufficient_tokens_error() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -353,7 +353,7 @@ fn insufficient_tokens_error() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -374,7 +374,7 @@ fn sale_price_below_min_expected() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -388,7 +388,7 @@ fn sale_price_below_min_expected() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -397,7 +397,7 @@ fn sale_price_below_min_expected() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -406,7 +406,7 @@ fn sale_price_below_min_expected() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -443,7 +443,7 @@ fn sale_price_below_min_expected() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -464,7 +464,7 @@ fn robust_query_does_not_revert_whole_tx_on_error() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -478,7 +478,7 @@ fn robust_query_does_not_revert_whole_tx_on_error() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -487,7 +487,7 @@ fn robust_query_does_not_revert_whole_tx_on_error() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -496,7 +496,7 @@ fn robust_query_does_not_revert_whole_tx_on_error() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -544,7 +544,7 @@ fn robust_query_does_not_revert_whole_tx_on_error() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!(res.unwrap().swaps.len(), 2); } } @@ -559,7 +559,7 @@ fn minimal_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); @@ -573,7 +573,7 @@ fn minimal_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -582,7 +582,7 @@ fn minimal_fee_tx_is_handled_correctly() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -591,7 +591,7 @@ fn minimal_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -638,7 +638,7 @@ fn minimal_fee_tx_is_handled_correctly() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { validate_swap_fees( @@ -661,7 +661,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); let user2 = setup_addtl_account(&mut router, "asset", 100u128).unwrap(); @@ -676,7 +676,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -685,7 +685,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -694,7 +694,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -741,7 +741,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { validate_swap_fees( diff --git a/test/unit/src/tests/sim_tests/sim_direct_swap_tokens_for_specific_nfts.rs b/test/unit/src/tests/sim_tests/sim_direct_swap_tokens_for_specific_nfts.rs index 814b973..3887e70 100644 --- a/test/unit/src/tests/sim_tests/sim_direct_swap_tokens_for_specific_nfts.rs +++ b/test/unit/src/tests/sim_tests/sim_direct_swap_tokens_for_specific_nfts.rs @@ -3,7 +3,7 @@ use crate::helpers::pool_functions::prepare_pool_variations; use crate::helpers::swap_functions::{setup_swap_test, validate_swap_fees, SwapTestSetup}; use crate::setup::setup_accounts::setup_addtl_account; use cosmwasm_std::{StdError, StdResult, Timestamp, Uint128}; -use infinity_pool::msg::{ +use infinity_swap::msg::{ NftSwap, NftTokenIdsResponse, QueryMsg, QueryOptions, SwapParams, SwapResponse, }; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; @@ -21,7 +21,7 @@ fn cant_swap_inactive_pool() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -35,7 +35,7 @@ fn cant_swap_inactive_pool() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -44,7 +44,7 @@ fn cant_swap_inactive_pool() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -63,7 +63,7 @@ fn cant_swap_inactive_pool() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -97,7 +97,7 @@ fn cant_swap_inactive_pool() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -118,7 +118,7 @@ fn cant_swap_invalid_pool_type() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -132,7 +132,7 @@ fn cant_swap_invalid_pool_type() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -141,7 +141,7 @@ fn cant_swap_invalid_pool_type() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -159,7 +159,7 @@ fn cant_swap_invalid_pool_type() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -193,7 +193,7 @@ fn cant_swap_invalid_pool_type() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -214,7 +214,7 @@ fn can_swap_active_pool() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -228,7 +228,7 @@ fn can_swap_active_pool() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -237,7 +237,7 @@ fn can_swap_active_pool() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -255,7 +255,7 @@ fn can_swap_active_pool() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -289,7 +289,7 @@ fn can_swap_active_pool() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!(res.unwrap().swaps.len(), 3); } } @@ -304,7 +304,7 @@ fn incorrect_nfts_error() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -318,7 +318,7 @@ fn incorrect_nfts_error() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -328,7 +328,7 @@ fn incorrect_nfts_error() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -337,7 +337,7 @@ fn incorrect_nfts_error() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -373,7 +373,7 @@ fn incorrect_nfts_error() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -397,7 +397,7 @@ fn sale_price_above_max_expected() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -411,7 +411,7 @@ fn sale_price_above_max_expected() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -420,7 +420,7 @@ fn sale_price_above_max_expected() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -438,7 +438,7 @@ fn sale_price_above_max_expected() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -472,7 +472,7 @@ fn sale_price_above_max_expected() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!(res.unwrap_err(), StdError::GenericErr { msg: "Querier contract error: Generic error: Swap error: pool sale price is above max expected" @@ -491,7 +491,7 @@ fn robust_query_does_not_revert_whole_tx() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -505,7 +505,7 @@ fn robust_query_does_not_revert_whole_tx() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -514,7 +514,7 @@ fn robust_query_does_not_revert_whole_tx() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -532,7 +532,7 @@ fn robust_query_does_not_revert_whole_tx() { let mut nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -576,7 +576,7 @@ fn robust_query_does_not_revert_whole_tx() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!(res.unwrap().swaps.len(), 2); } } @@ -591,7 +591,7 @@ fn minimal_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); @@ -605,7 +605,7 @@ fn minimal_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -614,7 +614,7 @@ fn minimal_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -641,7 +641,7 @@ fn minimal_fee_tx_is_handled_correctly() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -676,7 +676,7 @@ fn minimal_fee_tx_is_handled_correctly() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { validate_swap_fees( @@ -699,7 +699,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); let user2 = setup_addtl_account(&mut router, "asset", 100_u128).unwrap(); @@ -714,7 +714,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -723,7 +723,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -750,7 +750,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -784,7 +784,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { validate_swap_fees( diff --git a/test/unit/src/tests/sim_tests/sim_swap_nfts_for_tokens.rs b/test/unit/src/tests/sim_tests/sim_swap_nfts_for_tokens.rs index bc25b66..1189cf5 100644 --- a/test/unit/src/tests/sim_tests/sim_swap_nfts_for_tokens.rs +++ b/test/unit/src/tests/sim_tests/sim_swap_nfts_for_tokens.rs @@ -3,7 +3,7 @@ use crate::helpers::pool_functions::prepare_pool_variations; use crate::helpers::swap_functions::{setup_swap_test, validate_swap_fees, SwapTestSetup}; use crate::setup::setup_accounts::setup_addtl_account; use cosmwasm_std::{StdError, StdResult, Timestamp, Uint128}; -use infinity_pool::msg::{NftSwap, QueryMsg, SwapParams, SwapResponse}; +use infinity_swap::msg::{NftSwap, QueryMsg, SwapParams, SwapResponse}; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_marketplace::msg::{ParamsResponse, QueryMsg as MarketplaceQueryMsg}; use sg_std::GENESIS_MINT_START_TIME; @@ -19,7 +19,7 @@ fn cant_swap_inactive_pools() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -33,7 +33,7 @@ fn cant_swap_inactive_pools() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -42,7 +42,7 @@ fn cant_swap_inactive_pools() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -51,7 +51,7 @@ fn cant_swap_inactive_pools() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -84,7 +84,7 @@ fn cant_swap_inactive_pools() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.unwrap().swaps.is_empty()); } @@ -99,7 +99,7 @@ fn can_swap_active_pools() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -113,7 +113,7 @@ fn can_swap_active_pools() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -122,7 +122,7 @@ fn can_swap_active_pools() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -131,7 +131,7 @@ fn can_swap_active_pools() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -164,7 +164,7 @@ fn can_swap_active_pools() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.is_ok()); assert!(!res.unwrap().swaps.is_empty()); @@ -180,7 +180,7 @@ fn sale_price_below_min_expected() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -194,7 +194,7 @@ fn sale_price_below_min_expected() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -203,7 +203,7 @@ fn sale_price_below_min_expected() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -212,7 +212,7 @@ fn sale_price_below_min_expected() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -245,7 +245,7 @@ fn sale_price_below_min_expected() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), @@ -266,7 +266,7 @@ fn robust_query_does_not_revert_whole_tx() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -280,7 +280,7 @@ fn robust_query_does_not_revert_whole_tx() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -289,7 +289,7 @@ fn robust_query_does_not_revert_whole_tx() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -298,7 +298,7 @@ fn robust_query_does_not_revert_whole_tx() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -331,7 +331,7 @@ fn robust_query_does_not_revert_whole_tx() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.is_ok()); assert_eq!(res.unwrap().swaps.len(), 2); @@ -347,7 +347,7 @@ fn minimal_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); @@ -361,7 +361,7 @@ fn minimal_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -370,7 +370,7 @@ fn minimal_fee_tx_is_handled_correctly() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -379,7 +379,7 @@ fn minimal_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -421,7 +421,7 @@ fn minimal_fee_tx_is_handled_correctly() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { let pool = pools.iter().find(|p| p.id == swap.pool_id).unwrap(); @@ -444,7 +444,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); let user2 = setup_addtl_account(&mut router, "asset", 100u128).unwrap(); @@ -459,7 +459,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -468,7 +468,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -477,7 +477,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -519,7 +519,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { let pool = pools.iter().find(|p| p.id == swap.pool_id).unwrap(); @@ -542,7 +542,7 @@ fn trades_are_routed_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -556,7 +556,7 @@ fn trades_are_routed_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -565,7 +565,7 @@ fn trades_are_routed_correctly() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -574,7 +574,7 @@ fn trades_are_routed_correctly() { &mut router, 14, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -609,7 +609,7 @@ fn trades_are_routed_correctly() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); let swaps = res.unwrap().swaps; assert_eq!(swaps.len(), num_swaps); diff --git a/test/unit/src/tests/sim_tests/sim_swap_tokens_for_any_nfts.rs b/test/unit/src/tests/sim_tests/sim_swap_tokens_for_any_nfts.rs index 481dc58..4ea2ac4 100644 --- a/test/unit/src/tests/sim_tests/sim_swap_tokens_for_any_nfts.rs +++ b/test/unit/src/tests/sim_tests/sim_swap_tokens_for_any_nfts.rs @@ -4,8 +4,8 @@ use crate::helpers::swap_functions::{setup_swap_test, validate_swap_fees, SwapTe use crate::setup::setup_accounts::setup_addtl_account; use cosmwasm_std::{coins, StdError, StdResult, Timestamp, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::{ExecuteMsg, QueryMsg, SwapParams, SwapResponse}; -use infinity_pool::state::BondingCurve; +use infinity_swap::msg::{ExecuteMsg, QueryMsg, SwapParams, SwapResponse}; +use infinity_swap::state::BondingCurve; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_marketplace::msg::{ParamsResponse, QueryMsg as MarketplaceQueryMsg}; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; @@ -21,7 +21,7 @@ fn cant_swap_inactive_pools() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -35,7 +35,7 @@ fn cant_swap_inactive_pools() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -44,7 +44,7 @@ fn cant_swap_inactive_pools() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -70,7 +70,7 @@ fn cant_swap_inactive_pools() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.unwrap().swaps.is_empty()); } @@ -85,7 +85,7 @@ fn can_swap_active_pools() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -99,7 +99,7 @@ fn can_swap_active_pools() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -108,7 +108,7 @@ fn can_swap_active_pools() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -134,7 +134,7 @@ fn can_swap_active_pools() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.is_ok()); assert!(!res.unwrap().swaps.is_empty()); @@ -150,7 +150,7 @@ fn sale_price_above_max_expected() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -164,7 +164,7 @@ fn sale_price_above_max_expected() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -173,7 +173,7 @@ fn sale_price_above_max_expected() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -199,7 +199,7 @@ fn sale_price_above_max_expected() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), @@ -220,7 +220,7 @@ fn robust_query_does_not_revert_whole_tx() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -234,7 +234,7 @@ fn robust_query_does_not_revert_whole_tx() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -243,7 +243,7 @@ fn robust_query_does_not_revert_whole_tx() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -272,7 +272,7 @@ fn robust_query_does_not_revert_whole_tx() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.is_ok()); assert_eq!(res.unwrap().swaps.len(), 2); @@ -288,7 +288,7 @@ fn minimal_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); @@ -302,7 +302,7 @@ fn minimal_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -311,7 +311,7 @@ fn minimal_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -349,7 +349,7 @@ fn minimal_fee_tx_is_handled_correctly() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { let pool = pools.iter().find(|p| p.id == swap.pool_id).unwrap(); @@ -372,7 +372,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); let user2 = setup_addtl_account(&mut router, "asset", 100u128).unwrap(); @@ -387,7 +387,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -396,7 +396,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -434,7 +434,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { let pool = pools.iter().find(|p| p.id == swap.pool_id).unwrap(); @@ -457,7 +457,7 @@ fn trades_are_routed_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -471,7 +471,7 @@ fn trades_are_routed_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 500, ); @@ -480,7 +480,7 @@ fn trades_are_routed_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -506,7 +506,7 @@ fn trades_are_routed_correctly() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); let swaps = res.unwrap().swaps; assert_eq!(swaps.len(), num_swaps); @@ -528,7 +528,7 @@ fn constant_product_pools_with_little_nfts() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -542,13 +542,13 @@ fn constant_product_pools_with_little_nfts() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let _pool = prepare_swap_pool( &mut router, - &infinity_pool, + &infinity_swap, &accts.owner, Uint128::from(1_000u128), owner_token_ids.to_vec().drain(0..4).collect(), @@ -582,7 +582,7 @@ fn constant_product_pools_with_little_nfts() { }; let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); let _swaps = res.unwrap().swaps; @@ -600,7 +600,7 @@ fn constant_product_pools_with_little_nfts() { let funds: Uint128 = max_expected_token_input.iter().sum(); let exec_res = router.execute_contract( accts.bidder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &exec_msg, &coins(funds.u128(), NATIVE_DENOM), ); diff --git a/test/unit/src/tests/sim_tests/sim_swap_tokens_for_specific_nfts.rs b/test/unit/src/tests/sim_tests/sim_swap_tokens_for_specific_nfts.rs index d9e0cbd..b7b329a 100644 --- a/test/unit/src/tests/sim_tests/sim_swap_tokens_for_specific_nfts.rs +++ b/test/unit/src/tests/sim_tests/sim_swap_tokens_for_specific_nfts.rs @@ -3,10 +3,10 @@ use crate::helpers::pool_functions::prepare_pool_variations; use crate::helpers::swap_functions::{setup_swap_test, validate_swap_fees, SwapTestSetup}; use crate::setup::setup_accounts::setup_addtl_account; use cosmwasm_std::{StdError, StdResult, Timestamp, Uint128}; -use infinity_pool::msg::{ +use infinity_swap::msg::{ NftSwap, NftTokenIdsResponse, PoolNftSwap, QueryMsg, QueryOptions, SwapParams, SwapResponse, }; -use infinity_pool::state::Pool; +use infinity_swap::state::Pool; use itertools::Itertools; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_marketplace::msg::{ParamsResponse, QueryMsg as MarketplaceQueryMsg}; @@ -24,7 +24,7 @@ fn cant_swap_inactive_pool() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -38,7 +38,7 @@ fn cant_swap_inactive_pool() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -47,7 +47,7 @@ fn cant_swap_inactive_pool() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -72,7 +72,7 @@ fn cant_swap_inactive_pool() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -111,7 +111,7 @@ fn cant_swap_inactive_pool() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -132,7 +132,7 @@ fn cant_swap_invalid_pool_type() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -146,7 +146,7 @@ fn cant_swap_invalid_pool_type() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -155,7 +155,7 @@ fn cant_swap_invalid_pool_type() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -180,7 +180,7 @@ fn cant_swap_invalid_pool_type() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -219,7 +219,7 @@ fn cant_swap_invalid_pool_type() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), StdError::GenericErr { @@ -240,7 +240,7 @@ fn can_swap_active_pool() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -254,7 +254,7 @@ fn can_swap_active_pool() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -263,7 +263,7 @@ fn can_swap_active_pool() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -288,7 +288,7 @@ fn can_swap_active_pool() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -327,7 +327,7 @@ fn can_swap_active_pool() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.is_ok()); assert!(!res.unwrap().swaps.is_empty()); @@ -344,7 +344,7 @@ fn incorrect_nfts_error() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -358,7 +358,7 @@ fn incorrect_nfts_error() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let mut bidder_token_ids = mint_and_approve_many( @@ -367,7 +367,7 @@ fn incorrect_nfts_error() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -376,7 +376,7 @@ fn incorrect_nfts_error() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -424,7 +424,7 @@ fn incorrect_nfts_error() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!( res.unwrap_err(), @@ -449,7 +449,7 @@ fn sale_price_above_max_expected() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -463,7 +463,7 @@ fn sale_price_above_max_expected() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -472,7 +472,7 @@ fn sale_price_above_max_expected() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -497,7 +497,7 @@ fn sale_price_above_max_expected() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -536,7 +536,7 @@ fn sale_price_above_max_expected() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert_eq!(res.unwrap_err(), StdError::GenericErr { msg: "Querier contract error: Generic error: Swap error: pool sale price is above max expected" @@ -555,7 +555,7 @@ fn robust_query_does_not_revert_whole_tx() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -569,7 +569,7 @@ fn robust_query_does_not_revert_whole_tx() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -578,7 +578,7 @@ fn robust_query_does_not_revert_whole_tx() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -603,7 +603,7 @@ fn robust_query_does_not_revert_whole_tx() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -653,7 +653,7 @@ fn robust_query_does_not_revert_whole_tx() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); assert!(res.is_ok()); assert!(!res.unwrap().swaps.is_empty()); @@ -670,7 +670,7 @@ fn trading_fee_is_applied_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); @@ -684,7 +684,7 @@ fn trading_fee_is_applied_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -693,7 +693,7 @@ fn trading_fee_is_applied_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -727,7 +727,7 @@ fn trading_fee_is_applied_correctly() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -766,7 +766,7 @@ fn trading_fee_is_applied_correctly() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { let pool = chunk.iter().find(|p| p.id == swap.pool_id).unwrap(); @@ -790,7 +790,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, marketplace, } = setup_swap_test(5000).unwrap(); let user2 = setup_addtl_account(&mut router, "asset", 100u128).unwrap(); @@ -805,7 +805,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -814,7 +814,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -848,7 +848,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -887,7 +887,7 @@ fn finders_and_swap_fee_tx_is_handled_correctly() { let res: StdResult = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg); + .query_wasm_smart(infinity_swap.clone(), &sim_msg); for swap in res.unwrap().swaps { let pool = chunk.iter().find(|p| p.id == swap.pool_id).unwrap(); diff --git a/test/unit/src/tests/swap_tests/direct_swap_nfts_for_tokens.rs b/test/unit/src/tests/swap_tests/direct_swap_nfts_for_tokens.rs index 9e15d08..f3d9b73 100644 --- a/test/unit/src/tests/swap_tests/direct_swap_nfts_for_tokens.rs +++ b/test/unit/src/tests/swap_tests/direct_swap_nfts_for_tokens.rs @@ -4,7 +4,7 @@ use crate::helpers::swap_functions::{setup_swap_test, validate_swap_outcome, Swa use crate::helpers::utils::get_native_balances; use cosmwasm_std::{Addr, Timestamp, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::{ExecuteMsg, NftSwap, QueryMsg, SwapParams, SwapResponse}; +use infinity_swap::msg::{ExecuteMsg, NftSwap, QueryMsg, SwapParams, SwapResponse}; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_std::GENESIS_MINT_START_TIME; use test_suite::common_setup::msg::VendingTemplateResponse; @@ -19,7 +19,7 @@ fn correct_swap_simple() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -33,7 +33,7 @@ fn correct_swap_simple() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let mut bidder_token_ids = mint_and_approve_many( @@ -42,7 +42,7 @@ fn correct_swap_simple() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -52,7 +52,7 @@ fn correct_swap_simple() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -68,7 +68,7 @@ fn correct_swap_simple() { accts.owner.clone(), accts.bidder.clone(), finder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), ]; let collection_info: CollectionInfoResponse = router @@ -107,7 +107,7 @@ fn correct_swap_simple() { let _sim_res: SwapResponse = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg) + .query_wasm_smart(infinity_swap.clone(), &sim_msg) .unwrap(); let exec_msg = ExecuteMsg::DirectSwapNftsForTokens { @@ -123,7 +123,7 @@ fn correct_swap_simple() { let pre_swap_balances = get_native_balances(&router, &check_addresses); let exec_res = router - .execute_contract(accts.bidder.clone(), infinity_pool.clone(), &exec_msg, &[]) + .execute_contract(accts.bidder.clone(), infinity_swap.clone(), &exec_msg, &[]) .unwrap(); let post_swap_balances = get_native_balances(&router, &check_addresses); diff --git a/test/unit/src/tests/swap_tests/direct_swap_tokens_for_specific_nfts.rs b/test/unit/src/tests/swap_tests/direct_swap_tokens_for_specific_nfts.rs index a4a1ef1..a3d1095 100644 --- a/test/unit/src/tests/swap_tests/direct_swap_tokens_for_specific_nfts.rs +++ b/test/unit/src/tests/swap_tests/direct_swap_tokens_for_specific_nfts.rs @@ -4,7 +4,7 @@ use crate::helpers::swap_functions::{setup_swap_test, validate_swap_outcome, Swa use crate::helpers::utils::get_native_balances; use cosmwasm_std::{coins, Addr, Timestamp, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg, NftSwap, NftTokenIdsResponse, QueryMsg, QueryOptions, SwapParams, SwapResponse, }; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; @@ -21,7 +21,7 @@ fn correct_swap_simple() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -35,7 +35,7 @@ fn correct_swap_simple() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -45,7 +45,7 @@ fn correct_swap_simple() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -61,7 +61,7 @@ fn correct_swap_simple() { accts.owner.clone(), accts.bidder.clone(), finder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), ]; let collection_info: CollectionInfoResponse = router @@ -81,7 +81,7 @@ fn correct_swap_simple() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -117,7 +117,7 @@ fn correct_swap_simple() { let _sim_res: SwapResponse = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg) + .query_wasm_smart(infinity_swap.clone(), &sim_msg) .unwrap(); let exec_msg = ExecuteMsg::DirectSwapTokensForSpecificNfts { @@ -138,7 +138,7 @@ fn correct_swap_simple() { let exec_res = router .execute_contract( accts.bidder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &exec_msg, &coins(sender_amount.u128(), NATIVE_DENOM), ) diff --git a/test/unit/src/tests/swap_tests/swap_nfts_for_tokens.rs b/test/unit/src/tests/swap_tests/swap_nfts_for_tokens.rs index d7704ab..ca01b88 100644 --- a/test/unit/src/tests/swap_tests/swap_nfts_for_tokens.rs +++ b/test/unit/src/tests/swap_tests/swap_nfts_for_tokens.rs @@ -4,7 +4,7 @@ use crate::helpers::swap_functions::{setup_swap_test, validate_swap_outcome, Swa use crate::helpers::utils::get_native_balances; use cosmwasm_std::{Addr, Timestamp, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::{ExecuteMsg, NftSwap, QueryMsg, SwapParams, SwapResponse}; +use infinity_swap::msg::{ExecuteMsg, NftSwap, QueryMsg, SwapParams, SwapResponse}; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_std::GENESIS_MINT_START_TIME; use test_suite::common_setup::msg::VendingTemplateResponse; @@ -19,7 +19,7 @@ fn correct_swap_simple() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -33,7 +33,7 @@ fn correct_swap_simple() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); let bidder_token_ids = mint_and_approve_many( @@ -42,7 +42,7 @@ fn correct_swap_simple() { &accts.bidder, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -52,7 +52,7 @@ fn correct_swap_simple() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -68,7 +68,7 @@ fn correct_swap_simple() { accts.owner.clone(), accts.bidder.clone(), finder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), ]; let collection_info: CollectionInfoResponse = router @@ -104,7 +104,7 @@ fn correct_swap_simple() { let _sim_res: SwapResponse = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg) + .query_wasm_smart(infinity_swap.clone(), &sim_msg) .unwrap(); let exec_msg = ExecuteMsg::SwapNftsForTokens { @@ -120,7 +120,7 @@ fn correct_swap_simple() { let pre_swap_balances = get_native_balances(&router, &check_addresses); let exec_res = router - .execute_contract(accts.bidder.clone(), infinity_pool.clone(), &exec_msg, &[]) + .execute_contract(accts.bidder.clone(), infinity_swap.clone(), &exec_msg, &[]) .unwrap(); let post_swap_balances = get_native_balances(&router, &check_addresses); diff --git a/test/unit/src/tests/swap_tests/swap_tokens_for_any_nfts.rs b/test/unit/src/tests/swap_tests/swap_tokens_for_any_nfts.rs index 0b15a77..456cea3 100644 --- a/test/unit/src/tests/swap_tests/swap_tokens_for_any_nfts.rs +++ b/test/unit/src/tests/swap_tests/swap_tokens_for_any_nfts.rs @@ -4,7 +4,7 @@ use crate::helpers::swap_functions::{setup_swap_test, validate_swap_outcome, Swa use crate::helpers::utils::get_native_balances; use cosmwasm_std::{coins, Addr, Timestamp, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::{ExecuteMsg, QueryMsg, SwapParams, SwapResponse}; +use infinity_swap::msg::{ExecuteMsg, QueryMsg, SwapParams, SwapResponse}; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; use test_suite::common_setup::msg::VendingTemplateResponse; @@ -19,7 +19,7 @@ fn correct_swap_simple() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -33,7 +33,7 @@ fn correct_swap_simple() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -43,7 +43,7 @@ fn correct_swap_simple() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -59,7 +59,7 @@ fn correct_swap_simple() { accts.owner.clone(), accts.bidder.clone(), finder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), ]; let collection_info: CollectionInfoResponse = router @@ -88,7 +88,7 @@ fn correct_swap_simple() { let _res: SwapResponse = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg) + .query_wasm_smart(infinity_swap.clone(), &sim_msg) .unwrap(); let exec_msg = ExecuteMsg::SwapTokensForAnyNfts { @@ -108,7 +108,7 @@ fn correct_swap_simple() { let exec_res = router .execute_contract( accts.bidder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &exec_msg, &coins(sender_amount.u128(), NATIVE_DENOM), ) diff --git a/test/unit/src/tests/swap_tests/swap_tokens_for_specific_nfts.rs b/test/unit/src/tests/swap_tests/swap_tokens_for_specific_nfts.rs index 7329f5d..f7579fb 100644 --- a/test/unit/src/tests/swap_tests/swap_tokens_for_specific_nfts.rs +++ b/test/unit/src/tests/swap_tests/swap_tokens_for_specific_nfts.rs @@ -4,11 +4,11 @@ use crate::helpers::swap_functions::{setup_swap_test, validate_swap_outcome, Swa use crate::helpers::utils::get_native_balances; use cosmwasm_std::{coins, Addr, Timestamp, Uint128}; use cw_multi_test::Executor; -use infinity_pool::msg::{ +use infinity_swap::msg::{ ExecuteMsg, NftSwap, NftTokenIdsResponse, PoolNftSwap, QueryMsg, QueryOptions, SwapParams, SwapResponse, }; -use infinity_pool::state::Pool; +use infinity_swap::state::Pool; use itertools::Itertools; use sg721_base::msg::{CollectionInfoResponse, QueryMsg as Sg721QueryMsg}; use sg_std::{GENESIS_MINT_START_TIME, NATIVE_DENOM}; @@ -24,7 +24,7 @@ fn correct_swap_simple() { collection_response_vec, .. }, - infinity_pool, + infinity_swap, .. } = setup_swap_test(5000).unwrap(); @@ -38,7 +38,7 @@ fn correct_swap_simple() { &accts.owner, &minter, &collection, - &infinity_pool, + &infinity_swap, 100, ); @@ -48,7 +48,7 @@ fn correct_swap_simple() { &mut router, 7, &None, - &infinity_pool, + &infinity_swap, &collection, &accts.owner, deposit_tokens_per_pool, @@ -72,7 +72,7 @@ fn correct_swap_simple() { accts.owner.clone(), accts.bidder.clone(), finder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), ]; let collection_info: CollectionInfoResponse = router @@ -93,7 +93,7 @@ fn correct_swap_simple() { let nft_token_ids_response: NftTokenIdsResponse = router .wrap() .query_wasm_smart( - infinity_pool.clone(), + infinity_swap.clone(), &QueryMsg::PoolNftTokenIds { pool_id: pool.id, query_options: QueryOptions { @@ -136,7 +136,7 @@ fn correct_swap_simple() { let _sim_res: SwapResponse = router .wrap() - .query_wasm_smart(infinity_pool.clone(), &sim_msg) + .query_wasm_smart(infinity_swap.clone(), &sim_msg) .unwrap(); let exec_msg = ExecuteMsg::SwapTokensForSpecificNfts { @@ -154,7 +154,7 @@ fn correct_swap_simple() { let exec_res = router .execute_contract( accts.bidder.clone(), - infinity_pool.clone(), + infinity_swap.clone(), &exec_msg, &coins(sender_amount.u128(), NATIVE_DENOM), ) diff --git a/ts/codegen.ts b/ts/codegen.ts index 0b6a10b..cc7f7e0 100644 --- a/ts/codegen.ts +++ b/ts/codegen.ts @@ -1,11 +1,11 @@ -import codegen from "@cosmwasm/ts-codegen"; +import codegen from "@cosmwasm/ts-codegen" codegen({ contracts: [ { name: "InfinityPool", - dir: "../contracts/infinity-pool/schema", - }, + dir: "../contracts/infinity-swap/schema" + } ], outPath: "./src/", @@ -13,28 +13,28 @@ codegen({ options: { bundle: { bundleFile: "index.ts", - scope: "contracts", + scope: "contracts" }, types: { - enabled: true, + enabled: true }, client: { - enabled: true, + enabled: true }, reactQuery: { enabled: false, optionalClient: true, version: "v4", mutations: true, - queryKeys: true, + queryKeys: true }, recoil: { - enabled: false, + enabled: false }, messageComposer: { - enabled: true, - }, - }, + enabled: true + } + } }).then(() => { - console.log("✨ all done!"); -}); + console.log("✨ all done!") +}) diff --git a/ts/package.json b/ts/package.json index 48281e7..8bf6cb0 100644 --- a/ts/package.json +++ b/ts/package.json @@ -1,7 +1,7 @@ { - "name": "@tasiov/infinity-pool", + "name": "@tasiov/infinity-swap", "version": "0.7.0", - "description": "Infinity Pool Typescript Types", + "description": "Infinity Swap Typescript Types", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1",