add mock exec to Astro testnet

Cargo.toml

@@ -42,11 +42,12 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 [dependencies]
 astroport = "3.6.1"
 cosmwasm-schema = "1.5.0"
-cosmwasm-std = { version = "1.5.0", features = [
-  "cosmwasm_1_3",
-  # Enable this if you only deploy to chains that have CosmWasm 1.4 or higher
-  # "cosmwasm_1_4",
+cosmwasm-std = { version = "1.2.7", features = [
+  "abort",
+  "iterator",
+  "stargate",
 ] }
+
 cw-storage-plus = "1.1.0"
 cw-utils = "1.0.2"
 cw2 = "1.1.1"
@@ -55,4 +56,4 @@ serde = { version = "1.0.189", default-features = false, features = ["derive"] }
 thiserror = { version = "1.0.49" }
 
 [dev-dependencies]
-cw-multi-test = "0.17.0"
+cw-multi-test = "0.18.0"

src/contract.rs

@@ -1,6 +1,8 @@
 #[cfg(not(feature = "library"))]
 use cosmwasm_std::entry_point;
-use cosmwasm_std::{to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult};
+use cosmwasm_std::{
+    coins, to_json_binary, Binary, Deps, DepsMut, Env, MessageInfo, Response, StdResult,
+};
 use cw2::set_contract_version;
 
 use crate::error::ContractError;
@@ -43,12 +45,13 @@ pub fn execute(
     match msg {
         ExecuteMsg::Increment {} => execute::increment(deps),
         ExecuteMsg::Reset { count } => execute::reset(deps, info, count),
+        ExecuteMsg::Astro {} => execute::astro_exec(deps, info),
     }
 }
 
 pub mod execute {
     use astroport::asset::Asset;
-    use cosmwasm_std::Coin;
+    use cosmwasm_std::{Coin, Decimal};
 
     use super::*;
 
@@ -72,22 +75,21 @@ pub mod execute {
         Ok(Response::new().add_attribute("action", "reset"))
     }
     pub fn astro_exec(deps: DepsMut, info: MessageInfo) -> Result<Response, ContractError> {
-        let inj_amount = cw_utils::must_pay(&info, "uinj")?;
-        let pair = "inj1r2qrk95gmnr3zwasy8u9shtzsx39q3yah73unj";
+        let inj_amount = cw_utils::must_pay(&info, "inj")?.u128();
+        // Pair of hINJ-INJ on testnet
+        let pair = "inj1relf3d6yh2e6arv84gaajawskttdq3vptn8qrs";
         let swap_astro_msg = pair::ExecuteMsg::Swap {
             offer_asset: Asset::native("inj", inj_amount),
             ask_asset_info: None,
             belief_price: None,
-            max_spread: None,
+            max_spread: Some(Decimal::percent(50)),
             to: None,
         };
+        assert!(inj_amount > 0);
         let exec_cw20_mint_msg = WasmMsg::Execute {
             contract_addr: pair.into(),
             msg: to_json_binary(&swap_astro_msg)?,
-            funds: vec![Coin {
-                denom: "uinj".to_string(),
-                amount: inj_amount,
-            }],
+            funds: coins(inj_amount, "inj"),
         };
         let res = Response::new()
             .add_message(exec_cw20_mint_msg)
@@ -119,7 +121,9 @@ pub mod query {
 mod tests {
     use super::*;
     use cosmwasm_std::testing::{mock_dependencies, mock_env, mock_info};
+    use cosmwasm_std::Addr;
     use cosmwasm_std::{coins, from_json};
+    use cw_multi_test::{App, ContractWrapper, Executor};
 
     #[test]
     fn proper_initialization() {
@@ -184,4 +188,42 @@ mod tests {
         let value: GetCountResponse = from_json(&res).unwrap();
         assert_eq!(5, value.count);
     }
+    #[test]
+    fn astro_test() {
+        let mut app = App::new(|router, _, storage| {
+            router
+                .bank
+                .init_balance(storage, &Addr::unchecked("user"), coins(1000, "uinj"))
+                .unwrap()
+        });
+        let code = ContractWrapper::new(execute, instantiate, query);
+        let code_id = app.store_code(Box::new(code));
+        let addr = app
+            .instantiate_contract(
+                code_id,
+                Addr::unchecked("user"),
+                &InstantiateMsg { count: 17 },
+                &[],
+                "Contract",
+                None,
+            )
+            .unwrap();
+        let resp = app
+            .execute_contract(
+                Addr::unchecked("user"),
+                addr,
+                &ExecuteMsg::Astro {},
+                &coins(10, "uinj"),
+            )
+            .unwrap();
+        // let wasm = resp.events.iter().find(|ev| ev.ty == "wasm").unwrap();
+        // assert_eq!(
+        //     wasm.attributes
+        //         .iter()
+        //         .find(|attr| attr.key == "action")
+        //         .unwrap()
+        //         .value,
+        //     "swap"
+        // );
+    }
 }

src/integration_tests.rs

@@ -1,8 +1,13 @@
 #[cfg(test)]
 mod tests {
+    use std::marker::PhantomData;
+
     use crate::helpers::CwTemplateContract;
     use crate::msg::InstantiateMsg;
-    use cosmwasm_std::{Addr, Coin, Empty, Uint128};
+    use cosmwasm_std::{
+        testing::{MockApi, MockQuerier, MockStorage},
+        Addr, Coin, Empty, OwnedDeps, Querier, Uint128,
+    };
     use cw_multi_test::{App, AppBuilder, Contract, ContractWrapper, Executor};
 
     pub fn contract_template() -> Box<dyn Contract<Empty>> {
@@ -33,7 +38,15 @@ mod tests {
                 .unwrap();
         })
     }
-
+    fn mock_deps_with_query() -> OwnedDeps<MockStorage, MockApi, MockQuerier, Empty> {
+        let mock_querier = MockQuerier::<Empty>::new(&[]);
+        OwnedDeps {
+            storage: MockStorage::default(),
+            api: MockApi::default(),
+            querier: mock_querier,
+            custom_query_type: PhantomData,
+        }
+    }
     fn proper_instantiate() -> (App, CwTemplateContract) {
         let mut app = mock_app();
         let cw_template_id = app.store_code(contract_template());

src/msg.rs

@@ -9,6 +9,7 @@ pub struct InstantiateMsg {
 pub enum ExecuteMsg {
     Increment {},
     Reset { count: i32 },
+    Astro {},
 }
 
 #[cw_serde]