From 718f620c8988d2cb66462ad5be856c1efa030c7e Mon Sep 17 00:00:00 2001
From: jbernal87 <jose.incredulo@gmail.com>
Date: Sun, 4 Feb 2024 10:53:23 +0100
Subject: [PATCH] fix initial tests

---
 Cargo.lock                                    | 98 +++++++++----------
 contracts/injective-cosmwasm-mock/Cargo.toml  | 22 +++--
 .../injective-cosmwasm-mock/src/contract.rs   |  2 +-
 contracts/injective-cosmwasm-mock/src/lib.rs  |  2 +
 .../src/testing/query_spot_market_test.rs     | 35 +++----
 5 files changed, 76 insertions(+), 83 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2421ddf4..366282ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -95,7 +95,7 @@ dependencies = [
  "injective-protobuf",
  "protobuf",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "thiserror",
 ]
 
@@ -271,7 +271,7 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -402,7 +402,7 @@ dependencies = [
  "getrandom",
  "k256 0.13.2",
  "rand_core 0.6.4",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_json 1.0.111",
  "subtle-encoding",
  "tendermint",
@@ -441,7 +441,7 @@ checksum = "0df41ea55f2946b6b43579659eec048cc2f66e8c8e2e3652fc5e5e476f673856"
 dependencies = [
  "cosmwasm-schema-derive",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_json 1.0.111",
  "thiserror",
 ]
@@ -472,7 +472,7 @@ dependencies = [
  "forward_ref",
  "hex",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde-json-wasm 0.5.1",
  "sha2 0.10.8",
  "static_assertions 1.1.0",
@@ -486,7 +486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd2b4ae72a03e8f56c85df59d172d51d2d7dc9cec6e2bc811e3fb60c588032a4"
 dependencies = [
  "cosmwasm-std",
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -588,7 +588,7 @@ dependencies = [
  "k256 0.11.6",
  "prost 0.9.0",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "thiserror",
 ]
 
@@ -600,7 +600,7 @@ checksum = "d9b6f91c0b94481a3e9ef1ceb183c37d00764f8751e39b45fc09f4d9b970d469"
 dependencies = [
  "cosmwasm-std",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -611,7 +611,7 @@ checksum = "d5ff29294ee99373e2cd5fd21786a3c0ced99a52fec2ca347d565489c61b723c"
 dependencies = [
  "cosmwasm-std",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -625,7 +625,7 @@ dependencies = [
  "cw2 0.16.0",
  "schemars",
  "semver",
- "serde 1.0.194",
+ "serde 1.0.196",
  "thiserror",
 ]
 
@@ -640,7 +640,7 @@ dependencies = [
  "cw2 1.1.2",
  "schemars",
  "semver",
- "serde 1.0.194",
+ "serde 1.0.196",
  "thiserror",
 ]
 
@@ -654,7 +654,7 @@ dependencies = [
  "cosmwasm-std",
  "cw-storage-plus 0.16.0",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -668,7 +668,7 @@ dependencies = [
  "cw-storage-plus 1.2.0",
  "schemars",
  "semver",
- "serde 1.0.194",
+ "serde 1.0.196",
  "thiserror",
 ]
 
@@ -776,7 +776,7 @@ dependencies = [
  "cw2 0.16.0",
  "injective-cosmwasm 0.2.21",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "thiserror",
 ]
 
@@ -845,7 +845,7 @@ dependencies = [
  "hashbrown 0.12.3",
  "hex",
  "rand_core 0.6.4",
- "serde 1.0.194",
+ "serde 1.0.196",
  "sha2 0.9.9",
  "zeroize",
 ]
@@ -968,7 +968,7 @@ dependencies = [
  "ethbloom",
  "ethereum-types-serialize",
  "fixed-hash 0.3.2",
- "serde 1.0.194",
+ "serde 1.0.196",
  "uint 0.5.0",
 ]
 
@@ -978,7 +978,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1873d77b32bc1891a79dad925f2acbc318ee942b38b9110f9dbc5fbeffcea350"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -1311,7 +1311,7 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -1487,7 +1487,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58e3cae7e99c7ff5a995da2cf78dd0a5383740eda71d98cf7b1910c301ac69b8"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -1528,7 +1528,7 @@ dependencies = [
  "hex",
  "injective-math 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_repr",
  "subtle-encoding",
  "tiny-keccak",
@@ -1545,7 +1545,7 @@ dependencies = [
  "hex",
  "injective-math 0.2.4",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde-json-wasm 1.0.0",
  "serde_repr",
  "serde_test",
@@ -1565,7 +1565,7 @@ dependencies = [
  "injective-std 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "injective-test-tube",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "thiserror",
 ]
 
@@ -1578,7 +1578,7 @@ dependencies = [
  "ethereum-types",
  "primitive-types",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "subtle-encoding",
 ]
 
@@ -1592,7 +1592,7 @@ dependencies = [
  "ethereum-types",
  "primitive-types",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "subtle-encoding",
 ]
 
@@ -1607,7 +1607,7 @@ dependencies = [
  "protobuf",
  "protobuf-codegen-pure",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "subtle-encoding",
 ]
 
@@ -1621,7 +1621,7 @@ dependencies = [
  "prost 0.11.9",
  "prost-types",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde-cw-value",
 ]
 
@@ -1637,15 +1637,15 @@ dependencies = [
  "prost 0.11.9",
  "prost-types",
  "schemars",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde-cw-value",
 ]
 
 [[package]]
 name = "injective-test-tube"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f42f6affb7a2a6b2460d07c1bc4f470a1b0766ea46cf1d265a4ce7a2d3bd73"
+checksum = "61cb772fd4c8c1da872b742633e73928cbf1cf0505a09ec8ad41934a4d7f10b4"
 dependencies = [
  "base64 0.13.1",
  "bindgen",
@@ -1655,7 +1655,7 @@ dependencies = [
  "injective-cosmwasm 0.2.18",
  "injective-std 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.11.9",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_json 1.0.111",
  "test-tube-inj",
  "thiserror",
@@ -1673,7 +1673,7 @@ dependencies = [
  "injective-math 0.2.4",
  "rand 0.4.6",
  "secp256k1",
- "serde 1.0.194",
+ "serde 1.0.196",
  "tiny-keccak",
 ]
 
@@ -2494,7 +2494,7 @@ dependencies = [
  "dyn-clone",
  "enumset",
  "schemars_derive",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_json 1.0.111",
 ]
 
@@ -2603,9 +2603,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.194"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
@@ -2616,7 +2616,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75d32da6b8ed758b7d850b6c3c08f1d7df51a4df3cb201296e63e34a78e99d4"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -2625,7 +2625,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16a62a1fad1e1828b24acac8f2b468971dade7b8c3c2e672bcadefefb1f8c137"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -2634,7 +2634,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83c37d03f3b0f6b5f77c11af1e7c772de1c9af83e50bef7bb6069601900ba67b"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -2643,14 +2643,14 @@ version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.194"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2686,7 +2686,7 @@ checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -2706,7 +2706,7 @@ version = "1.0.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
@@ -2894,7 +2894,7 @@ dependencies = [
  "prost 0.11.9",
  "prost-types",
  "ripemd",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_bytes",
  "serde_json 1.0.111",
  "serde_repr",
@@ -2914,7 +2914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71a72dbbea6dde12045d261f2c70c0de039125675e8a026c8d5ad34522756372"
 dependencies = [
  "flex-error",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_json 1.0.111",
  "tendermint",
  "toml",
@@ -2933,7 +2933,7 @@ dependencies = [
  "num-traits",
  "prost 0.11.9",
  "prost-types",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_bytes",
  "subtle-encoding",
  "time",
@@ -2957,7 +2957,7 @@ dependencies = [
  "peg",
  "pin-project",
  "semver",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_bytes",
  "serde_json 1.0.111",
  "subtle",
@@ -2993,7 +2993,7 @@ dependencies = [
  "cosmrs",
  "cosmwasm-std",
  "prost 0.11.9",
- "serde 1.0.194",
+ "serde 1.0.196",
  "serde_json 1.0.111",
  "tendermint-proto",
  "thiserror",
@@ -3033,7 +3033,7 @@ checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
 dependencies = [
  "deranged",
  "powerfmt",
- "serde 1.0.194",
+ "serde 1.0.196",
  "time-core",
  "time-macros",
 ]
@@ -3136,7 +3136,7 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
- "serde 1.0.194",
+ "serde 1.0.196",
 ]
 
 [[package]]
diff --git a/contracts/injective-cosmwasm-mock/Cargo.toml b/contracts/injective-cosmwasm-mock/Cargo.toml
index 99434b15..2650677d 100644
--- a/contracts/injective-cosmwasm-mock/Cargo.toml
+++ b/contracts/injective-cosmwasm-mock/Cargo.toml
@@ -30,13 +30,15 @@ optimize = """docker run --rm -v "$(pwd)":/code \
 """
 
 [dependencies]
-cosmwasm-std        = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] }
-cw-storage-plus     = "1.2.0"
-cw2                 = "0.16.0"
-injective-cosmwasm  = { path = "../../packages/injective-cosmwasm" }
-injective-math      = { path = "../../packages/injective-math" }
-injective-std       = { version = "0.1.5" }
-injective-test-tube = "1.1.6"
-schemars            = "0.8.8"
-serde               = { version = "1.0.137", default-features = false, features = [ "derive" ] }
-thiserror           = { version = "1.0.31" }
+cosmwasm-std       = { version = "1.5.0", features = [ "abort", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "iterator", "stargate" ] }
+cw-storage-plus    = "1.2.0"
+cw2                = "0.16.0"
+injective-cosmwasm = { path = "../../packages/injective-cosmwasm" }
+injective-math     = { path = "../../packages/injective-math" }
+schemars           =  { version ="0.8.16"}
+serde              = { version = "1.0.196", default-features = false, features = [ "derive" ] }
+thiserror          = { version = "1.0.56" }
+
+[dev-dependencies]
+injective-test-tube = "1.1.7"
+injective-std      = { version = "0.1.5" }
diff --git a/contracts/injective-cosmwasm-mock/src/contract.rs b/contracts/injective-cosmwasm-mock/src/contract.rs
index 1eac3c9e..c3f6d1a3 100644
--- a/contracts/injective-cosmwasm-mock/src/contract.rs
+++ b/contracts/injective-cosmwasm-mock/src/contract.rs
@@ -36,7 +36,7 @@ pub fn query(deps: Deps<InjectiveQueryWrapper>, _env: Env, msg: QueryMsg) -> Std
     let querier = InjectiveQuerier::new(&deps.querier);
 
     match msg {
-        QueryMsg::TestSpotMarketQuery { market_id } => to_json_binary(&querier.query_spot_market(&market_id)?.market),
+        QueryMsg::TestSpotMarketQuery { market_id } => to_json_binary(&querier.query_spot_market(&market_id)?),
         QueryMsg::TestExchangeParamsQuery {} => to_json_binary(&querier.query_exchange_params()?),
     }
 }
diff --git a/contracts/injective-cosmwasm-mock/src/lib.rs b/contracts/injective-cosmwasm-mock/src/lib.rs
index 39d14d52..213e21b9 100644
--- a/contracts/injective-cosmwasm-mock/src/lib.rs
+++ b/contracts/injective-cosmwasm-mock/src/lib.rs
@@ -3,6 +3,8 @@ mod error;
 pub mod msg;
 #[cfg(test)]
 mod testing;
+
+#[cfg(test)]
 pub mod utils;
 
 pub use crate::error::ContractError;
diff --git a/contracts/injective-cosmwasm-mock/src/testing/query_spot_market_test.rs b/contracts/injective-cosmwasm-mock/src/testing/query_spot_market_test.rs
index 28a017b8..283b7ad9 100644
--- a/contracts/injective-cosmwasm-mock/src/testing/query_spot_market_test.rs
+++ b/contracts/injective-cosmwasm-mock/src/testing/query_spot_market_test.rs
@@ -3,7 +3,7 @@ use crate::{
     utils::test_setup,
 };
 use cosmwasm_std::{Addr, Coin};
-use injective_cosmwasm::{checked_address_to_subaccount_id, MarketId};
+use injective_cosmwasm::{checked_address_to_subaccount_id, ExchangeParamsResponse, MarketId};
 use injective_math::{scale::Scaled, FPDecimal};
 use injective_std::types::injective::exchange::v1beta1::{MsgInstantSpotMarketLaunch, QuerySpotMarketsRequest};
 use injective_test_tube::{injective_cosmwasm::SpotMarketResponse, Account, Exchange, Module, Wasm};
@@ -40,30 +40,18 @@ fn test_msg_deposit() {
 #[test]
 #[cfg_attr(not(feature = "integration"), ignore)]
 fn test_exchange_params() {
-    let (app, accs, contract_address) = test_setup();
-    let signer = &accs[2];
+    let (app, _accs, contract_address) = test_setup();
     let wasm = Wasm::new(&app);
-    let exchange = Exchange::new(&app);
+    let res: ExchangeParamsResponse = wasm.query(&contract_address, &QueryMsg::TestExchangeParamsQuery {}).unwrap();
 
-    // Instantiate spot market
-    let ticker = "INJ/USDT".to_string();
-    exchange
-        .instant_spot_market_launch(
-            MsgInstantSpotMarketLaunch {
-                sender: signer.address(),
-                ticker: ticker.clone(),
-                base_denom: BASE_DENOM.to_string(),
-                quote_denom: QUOTE_DENOM.to_string(),
-                min_price_tick_size: dec_to_proto(FPDecimal::must_from_str("0.000000000000001")),
-                min_quantity_tick_size: dec_to_proto(FPDecimal::must_from_str("1000000000000000")),
-            },
-            signer,
-        )
-        .unwrap();
+    assert!(res.params.is_some());
+    let params = res.params.unwrap();
 
-    let res: SpotMarketResponse = wasm.query(&contract_address, &QueryMsg::TestExchangeParamsQuery {}).unwrap();
-    println!("{:?}", res);
-    assert_eq!(1, 2);
+    let listing_fee_coin = Coin::new(1_000_000_000_000_000_000_000, "inj");
+    assert_eq!(params.spot_market_instant_listing_fee, listing_fee_coin);
+    assert_eq!(params.derivative_market_instant_listing_fee, listing_fee_coin);
+    assert_eq!(params.trading_rewards_vesting_duration, 604800);
+    assert_eq!(params.is_instant_derivative_market_launch_enabled, Some(true));
 }
 
 #[test]
@@ -76,6 +64,7 @@ fn test_query_spot_market() {
 
     // Instantiate spot market
     let ticker = "INJ/USDT".to_string();
+
     exchange
         .instant_spot_market_launch(
             MsgInstantSpotMarketLaunch {
@@ -105,5 +94,5 @@ fn test_query_spot_market() {
     let market_id = MarketId::new(spot_market_id.clone()).unwrap();
     let query_msg = QueryMsg::TestSpotMarketQuery { market_id };
     let res: SpotMarketResponse = wasm.query(&contract_address, &query_msg).unwrap();
-    assert_eq!(res.market.clone().unwrap().market_id.as_str(), spot_market_id.clone());
+    assert_eq!(res.market.unwrap().market_id.as_str(), spot_market_id);
 }