♻️ Restructure Repo To Make Launching Adapter Contracts Easier (#65)

* 🚚 restructure repo folders and files for ez pz adapter dev x * 🚨 run make entry-point schema * 💚 update gh workflow * 📝 update readme
skip-mev · Aug 9, 2023 · 0bd9593 · 0bd9593
1 parent 1a57cec
commit 0bd9593
Show file tree

Hide file tree

Showing 51 changed files with 72 additions and 70 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -93,7 +93,7 @@ jobs:
       - name: Run schema diff check
         # use nightly toolchain so that we get all the latest formatting features
         run: |
-          cargo +nightly run --package skip-swap-entry-point --bin schema     
+          cargo +nightly run --package skip-api-entry-point --bin schema     
           if [[ `git status --porcelain` ]]; then
             echo "Schema is different, please run make entry-point schema"
             exit 1

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,13 +2,13 @@
 resolver = "2"
 members  = [
   "contracts/entry-point",
-  "contracts/networks/neutron/*",
-  "contracts/networks/osmosis/*",
+  "contracts/adapters/ibc/*",
+  "contracts/adapters/swap/*",
   "packages/*",
 ]
 
 [workspace.package]
-version       = "0.2.0"
+version       = "0.2.1"
 authors       = ["Skip"]
 edition       = "2021"
 rust-version  = "1.71.0"

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ fmt:
 # Only generates the entry point schema since that is the only
 # contract that can be called externally.
 entry-point schema:
-	cargo run --package skip-swap-entry-point --bin schema         
+	cargo run --package skip-api-entry-point --bin schema         
 
 test:
 	cargo test --locked --workspace

diff --git a/README.md b/README.md
@@ -63,13 +63,13 @@ The repository is organized in the following way:
 │
 ├── contracts/              <- Contains all contracts
 │   ├── entry-point/        <- Contains source code and tests for entry point contract
-│   └── networks/           <- Contains source code and tests for all network adapter contracts
-│       ├── neutron/
-│       │   ├── ibc-transfer/
-│       │   └── swap/
-│       └── osmosis/
-│           ├── ibc-transfer/
-│           └── swap/
+│   └── adapters/           <- Contains source code and tests for all network adapter contracts
+│       ├── ibc/
+│       │   ├── ibc-hooks/
+│       │   └── neutron-transfer/
+│       └── swap/
+│           ├── astroport/
+│           └── osmosis-poolmanager/
 │
 ├── deployed-contracts/     <- Contains deployed contracts info for each network
 │   ├── neutron/

diff --git a/.../networks/osmosis/ibc-transfer/Cargo.toml → contracts/adapters/ibc/ibc-hooks/Cargo.toml b/.../networks/osmosis/ibc-transfer/Cargo.toml → contracts/adapters/ibc/ibc-hooks/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name          = "skip-swap-osmosis-ibc-transfer"
+name          = "skip-api-ibc-adapter-ibc-hooks"
 version       = { workspace = true }
 rust-version  = { workspace = true }
 authors       = { workspace = true }

diff --git a/...s/networks/osmosis/ibc-transfer/README.md → contracts/adapters/ibc/ibc-hooks/README.md b/...s/networks/osmosis/ibc-transfer/README.md → contracts/adapters/ibc/ibc-hooks/README.md
diff --git a/...ks/neutron/ibc-transfer/src/bin/schema.rs → ...ibc/ibc-hooks/src/bin/ibc-hooks-schema.rs b/...ks/neutron/ibc-transfer/src/bin/schema.rs → ...ibc/ibc-hooks/src/bin/ibc-hooks-schema.rs
diff --git a/...orks/osmosis/ibc-transfer/src/contract.rs → ...ts/adapters/ibc/ibc-hooks/src/contract.rs b/...orks/osmosis/ibc-transfer/src/contract.rs → ...ts/adapters/ibc/ibc-hooks/src/contract.rs
diff --git a/...etworks/osmosis/ibc-transfer/src/error.rs → ...racts/adapters/ibc/ibc-hooks/src/error.rs b/...etworks/osmosis/ibc-transfer/src/error.rs → ...racts/adapters/ibc/ibc-hooks/src/error.rs
diff --git a/.../networks/neutron/ibc-transfer/src/lib.rs → contracts/adapters/ibc/ibc-hooks/src/lib.rs b/.../networks/neutron/ibc-transfer/src/lib.rs → contracts/adapters/ibc/ibc-hooks/src/lib.rs
diff --git a/...etworks/osmosis/ibc-transfer/src/state.rs → ...racts/adapters/ibc/ibc-hooks/src/state.rs b/...etworks/osmosis/ibc-transfer/src/state.rs → ...racts/adapters/ibc/ibc-hooks/src/state.rs
diff --git a/...ansfer/tests/test_execute_ibc_transfer.rs → ...-hooks/tests/test_execute_ibc_transfer.rs b/...ansfer/tests/test_execute_ibc_transfer.rs → ...-hooks/tests/test_execute_ibc_transfer.rs
@@ -8,7 +8,7 @@ use ibc_proto::cosmos::base::v1beta1::Coin as IbcCoin;
 use ibc_proto::ibc::applications::transfer::v1::MsgTransfer;
 use prost::Message;
 use skip::ibc::{ExecuteMsg, IbcFee, IbcInfo};
-use skip_swap_osmosis_ibc_transfer::{
+use skip_api_ibc_adapter_ibc_hooks::{
     error::ContractResult,
     state::{ENTRY_POINT_CONTRACT_ADDRESS, IN_PROGRESS_CHANNEL_ID, IN_PROGRESS_RECOVER_ADDRESS},
 };
@@ -230,7 +230,7 @@ fn test_execute_ibc_transfer(params: Params) -> ContractResult<()> {
     ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?;
 
     // Call execute_ibc_transfer with the given test parameters
-    let res = skip_swap_osmosis_ibc_transfer::contract::execute(
+    let res = skip_api_ibc_adapter_ibc_hooks::contract::execute(
         deps.as_mut(),
         env,
         info,

diff --git a/.../osmosis/ibc-transfer/tests/test_reply.rs → ...dapters/ibc/ibc-hooks/tests/test_reply.rs b/.../osmosis/ibc-transfer/tests/test_reply.rs → ...dapters/ibc/ibc-hooks/tests/test_reply.rs
@@ -4,7 +4,7 @@ use cosmwasm_std::{
 };
 use ibc_proto::ibc::applications::transfer::v1::MsgTransferResponse;
 use prost::Message;
-use skip_swap_osmosis_ibc_transfer::{
+use skip_api_ibc_adapter_ibc_hooks::{
     error::ContractResult,
     state::{ACK_ID_TO_RECOVER_ADDRESS, IN_PROGRESS_CHANNEL_ID, IN_PROGRESS_RECOVER_ADDRESS},
 };
@@ -206,7 +206,7 @@ fn test_reply(params: Params) -> ContractResult<()> {
     }
 
     // Call reply with the given test parameters
-    let res = skip_swap_osmosis_ibc_transfer::contract::reply(deps.as_mut(), env, params.reply);
+    let res = skip_api_ibc_adapter_ibc_hooks::contract::reply(deps.as_mut(), env, params.reply);
 
     // Assert the behavior is correct
     match res {

diff --git a/...s/osmosis/ibc-transfer/tests/test_sudo.rs → ...adapters/ibc/ibc-hooks/tests/test_sudo.rs b/...s/osmosis/ibc-transfer/tests/test_sudo.rs → ...adapters/ibc/ibc-hooks/tests/test_sudo.rs
@@ -5,7 +5,7 @@ use cosmwasm_std::{
     StdError, SubMsg,
 };
 use skip::{ibc::IbcLifecycleComplete, sudo::OsmosisSudoMsg as SudoMsg};
-use skip_swap_osmosis_ibc_transfer::{error::ContractResult, state::ACK_ID_TO_RECOVER_ADDRESS};
+use skip_api_ibc_adapter_ibc_hooks::{error::ContractResult, state::ACK_ID_TO_RECOVER_ADDRESS};
 use test_case::test_case;
 
 /*
@@ -153,7 +153,7 @@ fn test_sudo(params: Params) -> ContractResult<()> {
     }
 
     // Call sudo with the given test parameters
-    let res = skip_swap_osmosis_ibc_transfer::contract::sudo(deps.as_mut(), env, params.sudo_msg);
+    let res = skip_api_ibc_adapter_ibc_hooks::contract::sudo(deps.as_mut(), env, params.sudo_msg);
 
     // Assert the behavior is correct
     match res {

diff --git a/.../networks/neutron/ibc-transfer/Cargo.toml → .../adapters/ibc/neutron-transfer/Cargo.toml b/.../networks/neutron/ibc-transfer/Cargo.toml → .../adapters/ibc/neutron-transfer/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name          = "skip-swap-neutron-ibc-transfer"
+name          = "skip-api-ibc-adapter-neutron-transfer"
 version       = { workspace = true }
 rust-version  = { workspace = true }
 authors       = { workspace = true }

diff --git a/...s/networks/neutron/ibc-transfer/README.md → ...s/adapters/ibc/neutron-transfer/README.md b/...s/networks/neutron/ibc-transfer/README.md → ...s/adapters/ibc/neutron-transfer/README.md
diff --git a/...ks/osmosis/ibc-transfer/src/bin/schema.rs → ...ansfer/src/bin/neutron-transfer-schema.rs b/...ks/osmosis/ibc-transfer/src/bin/schema.rs → ...ansfer/src/bin/neutron-transfer-schema.rs
diff --git a/...orks/neutron/ibc-transfer/src/contract.rs → ...ters/ibc/neutron-transfer/src/contract.rs b/...orks/neutron/ibc-transfer/src/contract.rs → ...ters/ibc/neutron-transfer/src/contract.rs
diff --git a/...etworks/neutron/ibc-transfer/src/error.rs → ...dapters/ibc/neutron-transfer/src/error.rs b/...etworks/neutron/ibc-transfer/src/error.rs → ...dapters/ibc/neutron-transfer/src/error.rs
diff --git a/contracts/networks/neutron/swap/src/lib.rs → .../adapters/ibc/neutron-transfer/src/lib.rs b/contracts/networks/neutron/swap/src/lib.rs → .../adapters/ibc/neutron-transfer/src/lib.rs
diff --git a/...etworks/neutron/ibc-transfer/src/state.rs → ...dapters/ibc/neutron-transfer/src/state.rs b/...etworks/neutron/ibc-transfer/src/state.rs → ...dapters/ibc/neutron-transfer/src/state.rs
diff --git a/...ansfer/tests/test_execute_ibc_transfer.rs → ...ansfer/tests/test_execute_ibc_transfer.rs b/...ansfer/tests/test_execute_ibc_transfer.rs → ...ansfer/tests/test_execute_ibc_transfer.rs
@@ -7,7 +7,7 @@ use cosmwasm_std::{
 };
 use neutron_proto::neutron::{feerefunder::Fee as NeutronFee, transfer::MsgTransfer};
 use skip::ibc::{ExecuteMsg, IbcFee, IbcInfo};
-use skip_swap_neutron_ibc_transfer::{
+use skip_api_ibc_adapter_neutron_transfer::{
     error::ContractResult,
     state::{ENTRY_POINT_CONTRACT_ADDRESS, IN_PROGRESS_RECOVER_ADDRESS},
 };
@@ -142,7 +142,7 @@ fn test_execute_ibc_transfer(params: Params) -> ContractResult<()> {
     ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?;
 
     // Call execute_ibc_transfer with the given test parameters
-    let res = skip_swap_neutron_ibc_transfer::contract::execute(
+    let res = skip_api_ibc_adapter_neutron_transfer::contract::execute(
         deps.as_mut(),
         env,
         info,

diff --git a/.../neutron/ibc-transfer/tests/test_reply.rs → .../ibc/neutron-transfer/tests/test_reply.rs b/.../neutron/ibc-transfer/tests/test_reply.rs → .../ibc/neutron-transfer/tests/test_reply.rs
@@ -4,7 +4,7 @@ use cosmwasm_std::{
 };
 use neutron_proto::neutron::transfer::MsgTransferResponse;
 use prost::Message;
-use skip_swap_neutron_ibc_transfer::{
+use skip_api_ibc_adapter_neutron_transfer::{
     error::{ContractError, ContractResult},
     state::{ACK_ID_TO_RECOVER_ADDRESS, IN_PROGRESS_RECOVER_ADDRESS},
 };
@@ -175,7 +175,8 @@ fn test_reply(params: Params) -> ContractResult<()> {
     }
 
     // Call reply with the given test parameters
-    let res = skip_swap_neutron_ibc_transfer::contract::reply(deps.as_mut(), env, params.reply);
+    let res =
+        skip_api_ibc_adapter_neutron_transfer::contract::reply(deps.as_mut(), env, params.reply);
 
     // Assert the behavior is correct
     match res {

diff --git a/...s/neutron/ibc-transfer/tests/test_sudo.rs → ...s/ibc/neutron-transfer/tests/test_sudo.rs b/...s/neutron/ibc-transfer/tests/test_sudo.rs → ...s/ibc/neutron-transfer/tests/test_sudo.rs
@@ -5,7 +5,7 @@ use cosmwasm_std::{
     StdError, SubMsg,
 };
 use neutron_sdk::sudo::msg::{RequestPacket, TransferSudoMsg};
-use skip_swap_neutron_ibc_transfer::{
+use skip_api_ibc_adapter_neutron_transfer::{
     error::{ContractError, ContractResult},
     state::ACK_ID_TO_RECOVER_ADDRESS,
 };
@@ -319,7 +319,8 @@ fn test_sudo(params: Params) -> ContractResult<()> {
     }
 
     // Call sudo with the given test parameters
-    let res = skip_swap_neutron_ibc_transfer::contract::sudo(deps.as_mut(), env, params.sudo_msg);
+    let res =
+        skip_api_ibc_adapter_neutron_transfer::contract::sudo(deps.as_mut(), env, params.sudo_msg);
 
     // Assert the behavior is correct
     match res {

diff --git a/contracts/networks/neutron/swap/Cargo.toml → contracts/adapters/swap/astroport/Cargo.toml b/contracts/networks/neutron/swap/Cargo.toml → contracts/adapters/swap/astroport/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name          = "skip-swap-neutron-astroport-swap"
+name          = "skip-api-swap-adapter-astroport"
 version       = { workspace = true }
 rust-version  = { workspace = true }
 authors       = { workspace = true }

diff --git a/contracts/networks/neutron/swap/README.md → contracts/adapters/swap/astroport/README.md b/contracts/networks/neutron/swap/README.md → contracts/adapters/swap/astroport/README.md
diff --git a/...s/networks/neutron/swap/src/bin/schema.rs → ...wap/astroport/src/bin/astroport-schema.rs b/...s/networks/neutron/swap/src/bin/schema.rs → ...wap/astroport/src/bin/astroport-schema.rs
diff --git a/...cts/networks/neutron/swap/src/contract.rs → ...s/adapters/swap/astroport/src/contract.rs b/...cts/networks/neutron/swap/src/contract.rs → ...s/adapters/swap/astroport/src/contract.rs
diff --git a/contracts/networks/neutron/swap/src/error.rs → ...acts/adapters/swap/astroport/src/error.rs b/contracts/networks/neutron/swap/src/error.rs → ...acts/adapters/swap/astroport/src/error.rs
diff --git a/.../networks/osmosis/ibc-transfer/src/lib.rs → contracts/adapters/swap/astroport/src/lib.rs b/.../networks/osmosis/ibc-transfer/src/lib.rs → contracts/adapters/swap/astroport/src/lib.rs
diff --git a/contracts/networks/neutron/swap/src/state.rs → ...acts/adapters/swap/astroport/src/state.rs b/contracts/networks/neutron/swap/src/state.rs → ...acts/adapters/swap/astroport/src/state.rs
diff --git a/...s/neutron/swap/tests/test_execute_swap.rs → ...swap/astroport/tests/test_execute_swap.rs b/...s/neutron/swap/tests/test_execute_swap.rs → ...swap/astroport/tests/test_execute_swap.rs
@@ -9,7 +9,7 @@ use cosmwasm_std::{
     SubMsg, WasmMsg,
 };
 use skip::swap::{ExecuteMsg, SwapOperation};
-use skip_swap_neutron_astroport_swap::{
+use skip_api_swap_adapter_astroport::{
     error::{ContractError, ContractResult},
     state::{ENTRY_POINT_CONTRACT_ADDRESS, ROUTER_CONTRACT_ADDRESS},
 };
@@ -254,7 +254,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> {
     ROUTER_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("router_contract"))?;
 
     // Call execute_swap with the given test parameters
-    let res = skip_swap_neutron_astroport_swap::contract::execute(
+    let res = skip_api_swap_adapter_astroport::contract::execute(
         deps.as_mut(),
         env,
         info,

diff --git a/...tests/test_execute_transfer_funds_back.rs → ...tests/test_execute_transfer_funds_back.rs b/...tests/test_execute_transfer_funds_back.rs → ...tests/test_execute_transfer_funds_back.rs
@@ -5,7 +5,7 @@ use cosmwasm_std::{
     SubMsg,
 };
 use skip::{error::SkipError, swap::ExecuteMsg};
-use skip_swap_neutron_astroport_swap::error::{ContractError, ContractResult};
+use skip_api_swap_adapter_astroport::error::{ContractError, ContractResult};
 use test_case::test_case;
 
 /*
@@ -122,7 +122,7 @@ fn test_execute_transfer_funds_back(params: Params) -> ContractResult<()> {
     let info = mock_info(&params.caller, &[]);
 
     // Call execute_swap with the given test parameters
-    let res = skip_swap_neutron_astroport_swap::contract::execute(
+    let res = skip_api_swap_adapter_astroport::contract::execute(
         deps.as_mut(),
         env,
         info,

diff --git a/contracts/networks/osmosis/swap/Cargo.toml → ...pters/swap/osmosis-poolmanager/Cargo.toml b/contracts/networks/osmosis/swap/Cargo.toml → ...pters/swap/osmosis-poolmanager/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name          = "skip-swap-osmosis-poolmanager-swap"
+name          = "skip-api-swap-adapter-osmosis-poolmanager"
 version       = { workspace = true }
 rust-version  = { workspace = true }
 authors       = { workspace = true }

diff --git a/contracts/networks/osmosis/swap/README.md → ...apters/swap/osmosis-poolmanager/README.md b/contracts/networks/osmosis/swap/README.md → ...apters/swap/osmosis-poolmanager/README.md
diff --git a/...s/networks/osmosis/swap/src/bin/schema.rs → ...ger/src/bin/osmosis-poolmanager-schema.rs b/...s/networks/osmosis/swap/src/bin/schema.rs → ...ger/src/bin/osmosis-poolmanager-schema.rs
diff --git a/...cts/networks/osmosis/swap/src/contract.rs → .../swap/osmosis-poolmanager/src/contract.rs b/...cts/networks/osmosis/swap/src/contract.rs → .../swap/osmosis-poolmanager/src/contract.rs
diff --git a/contracts/networks/osmosis/swap/src/error.rs → ...ers/swap/osmosis-poolmanager/src/error.rs b/contracts/networks/osmosis/swap/src/error.rs → ...ers/swap/osmosis-poolmanager/src/error.rs
diff --git a/contracts/networks/osmosis/swap/src/lib.rs → ...pters/swap/osmosis-poolmanager/src/lib.rs b/contracts/networks/osmosis/swap/src/lib.rs → ...pters/swap/osmosis-poolmanager/src/lib.rs
diff --git a/contracts/networks/osmosis/swap/src/state.rs → ...ers/swap/osmosis-poolmanager/src/state.rs b/contracts/networks/osmosis/swap/src/state.rs → ...ers/swap/osmosis-poolmanager/src/state.rs
diff --git a/...s/osmosis/swap/tests/test_execute_swap.rs → ...is-poolmanager/tests/test_execute_swap.rs b/...s/osmosis/swap/tests/test_execute_swap.rs → ...is-poolmanager/tests/test_execute_swap.rs
@@ -7,7 +7,7 @@ use cosmwasm_std::{
 use osmosis_std::types::cosmos::base::v1beta1::Coin as OsmosisStdCoin;
 use osmosis_std::types::osmosis::poolmanager::v1beta1::{MsgSwapExactAmountIn, SwapAmountInRoute};
 use skip::swap::{ExecuteMsg, SwapOperation};
-use skip_swap_osmosis_poolmanager_swap::{
+use skip_api_swap_adapter_osmosis_poolmanager::{
     error::ContractResult, state::ENTRY_POINT_CONTRACT_ADDRESS,
 };
 use test_case::test_case;
@@ -267,7 +267,7 @@ fn test_execute_swap(params: Params) -> ContractResult<()> {
     ENTRY_POINT_CONTRACT_ADDRESS.save(deps.as_mut().storage, &Addr::unchecked("entry_point"))?;
 
     // Call execute_swap with the given test parameters
-    let res = skip_swap_osmosis_poolmanager_swap::contract::execute(
+    let res = skip_api_swap_adapter_osmosis_poolmanager::contract::execute(
         deps.as_mut(),
         env,
         info,

diff --git a/...tests/test_execute_transfer_funds_back.rs → ...tests/test_execute_transfer_funds_back.rs b/...tests/test_execute_transfer_funds_back.rs → ...tests/test_execute_transfer_funds_back.rs
@@ -5,7 +5,7 @@ use cosmwasm_std::{
     SubMsg,
 };
 use skip::{error::SkipError, swap::ExecuteMsg};
-use skip_swap_osmosis_poolmanager_swap::error::{ContractError, ContractResult};
+use skip_api_swap_adapter_osmosis_poolmanager::error::{ContractError, ContractResult};
 use test_case::test_case;
 
 /*
@@ -122,7 +122,7 @@ fn test_execute_transfer_funds_back(params: Params) -> ContractResult<()> {
     let info = mock_info(&params.caller, &[]);
 
     // Call execute_swap with the given test parameters
-    let res = skip_swap_osmosis_poolmanager_swap::contract::execute(
+    let res = skip_api_swap_adapter_osmosis_poolmanager::contract::execute(
         deps.as_mut(),
         env,
         info,

diff --git a/contracts/entry-point/Cargo.toml b/contracts/entry-point/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name          = "skip-swap-entry-point"
+name          = "skip-api-entry-point"
 version       = { workspace = true }
 rust-version  = { workspace = true }
 authors       = { workspace = true }

diff --git a/contracts/entry-point/tests/test_execute_post_swap_action.rs b/contracts/entry-point/tests/test_execute_post_swap_action.rs
@@ -8,7 +8,7 @@ use skip::{
     entry_point::{Action, ExecuteMsg},
     ibc::{ExecuteMsg as IbcTransferExecuteMsg, IbcFee, IbcInfo},
 };
-use skip_swap_entry_point::{
+use skip_api_entry_point::{
     error::ContractError,
     state::{BLOCKED_CONTRACT_ADDRESSES, IBC_TRANSFER_CONTRACT_ADDRESS},
 };
@@ -487,7 +487,7 @@ fn test_execute_post_swap_action(params: Params) {
         .unwrap();
 
     // Call execute_post_swap_action with the given test parameters
-    let res = skip_swap_entry_point::contract::execute(
+    let res = skip_api_entry_point::contract::execute(
         deps.as_mut(),
         env,
         info,

diff --git a/contracts/entry-point/tests/test_execute_swap_and_action.rs b/contracts/entry-point/tests/test_execute_swap_and_action.rs
@@ -15,7 +15,7 @@ use skip::{
     ibc::{IbcFee, IbcInfo},
     swap::{ExecuteMsg as SwapExecuteMsg, Swap, SwapExactCoinIn, SwapExactCoinOut, SwapOperation},
 };
-use skip_swap_entry_point::{
+use skip_api_entry_point::{
     error::ContractError,
     state::{IBC_TRANSFER_CONTRACT_ADDRESS, SWAP_VENUE_MAP},
 };
@@ -1212,7 +1212,7 @@ fn test_execute_swap_and_action(params: Params) {
         .unwrap();
 
     // Call execute_swap_and_action with the given test case params
-    let res = skip_swap_entry_point::contract::execute(
+    let res = skip_api_entry_point::contract::execute(
         deps.as_mut(),
         env,
         info,