Merge branch 'f/denom-fix-injective-testing' into f/injective-std-traits

InjectiveLabs · Sep 2, 2024 · 8138fd2 · 8138fd2
2 parents 09759a3 + 2d67326
commit 8138fd2
Show file tree

Hide file tree

Showing 17 changed files with 161 additions and 141 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,12 +20,12 @@ cw-utils             = { version = "2.0.0" }
 cw2                  = { version = "2.0.0" }
 ethereum-types       = { version = "0.5.2" }
 hex                  = { version = "0.4.3", features = [ "serde" ] }
-injective-cosmwasm   = { version = "0.3.0" }
-injective-math       = { version = "0.3.0" }
-injective-std        = { version = "1.13.0" }
-injective-std-derive = { version = "1.13.0" }
-injective-test-tube  = { version = "=1.13.0-2" }
-injective-testing    = { version = "0.2.1" }
+injective-cosmwasm   = { version = "0.3.0", path = "./packages/injective-cosmwasm" }
+injective-math       = { version = "0.3.0", path = "./packages/injective-math" }
+injective-std        = { version = "1.13.0", path = "./packages/injective-std" }
+injective-std-derive = { version = "1.13.0", path = "./packages/injective-std-derive" }
+injective-test-tube  = { version = "1.13.2" }
+injective-testing    = { version = "1.1.0", path = "./packages/injective-testing" }
 itertools            = { version = "0.10.3" }
 primitive-types      = { version = "0.12.2", default-features = false }
 proc-macro2          = { version = "1.0.40" }

diff --git a/build_release.sh b/build_release.sh
@@ -8,4 +8,4 @@ fi
 docker run --rm -v "$(pwd)":/code \
   --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \
   --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
-  cosmwasm/workspace-optimizer${ARCH}:0.12.11
+  cosmwasm/optimizer${ARCH}:0.16.0
diff --git a/contracts/injective-cosmwasm-mock/src/utils.rs b/contracts/injective-cosmwasm-mock/src/utils.rs
@@ -31,7 +31,7 @@ use injective_test_tube::{
     },
     Account, Authz, Bank, Exchange, ExecuteResponse, Gov, InjectiveTestApp, Insurance, Module, Oracle, Runner, SigningAccount, Wasm,
 };
-use injective_testing::human_to_i64;
+use injective_testing::utils::human_to_i64;
 use prost::Message;
 use std::{collections::HashMap, ops::Neg, str::FromStr};
 

diff --git a/packages/injective-testing/CHANGELOG.md b/packages/injective-testing/CHANGELOG.md
@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.2] - 2024-08-30
+
+### Fixed
+
+- Fixed decimals used as denoms in spot markets
+
+## [1.1.1] - 2024-08-30
+
+### Fixed
+
+- Fixed incorrect denoms
+
+## [1.1.0] - 2024-08-23
+
+### Changed
+
+- Updated `lib.rs` so that the re-organisation is adhered to
+
 ## [1.0.0] - 2024-08-23
 
 ### Changed

diff --git a/packages/injective-testing/Cargo.toml b/packages/injective-testing/Cargo.toml
@@ -5,7 +5,7 @@ edition     = "2021"
 license     = "Apache-2.0"
 name        = "injective-testing"
 repository  = "https://github.com/InjectiveLabs/cw-injective/tree/dev/packages/injective-testing"
-version     = "1.0.0"
+version     = "1.1.2"
 
 [dependencies]
 anyhow              = { workspace = true }

diff --git a/packages/injective-testing/src/lib.rs b/packages/injective-testing/src/lib.rs
@@ -1,9 +1,4 @@
-mod mocks;
-mod multi_test;
-mod test_tube;
+pub mod mocks;
+pub mod multi_test;
+pub mod test_tube;
 pub mod utils;
-
-pub use mocks::*;
-pub use multi_test::*;
-pub use test_tube::*;
-pub use utils::*;
diff --git a/packages/injective-testing/src/mocks.rs b/packages/injective-testing/src/mocks.rs
@@ -13,8 +13,7 @@ pub const MOCK_ATOM_DECIMALS: i32 = 8i32;
 pub const MOCK_QUOTE_DECIMALS: i32 = 6i32;
 
 pub const MOCK_ATOM_DENOM: &str = "atom";
-pub const MOCK_GAS_DENOM: &str = "inj";
-pub const MOCK_BASE_DENOM: &str = "ubase";
+pub const MOCK_BASE_DENOM: &str = "inj";
 pub const MOCK_QUOTE_DENOM: &str = "usdt";
 pub const MOCK_USDC_DENOM: &str = "usdc";
 

diff --git a/packages/injective-testing/src/multi_test/chain_mock.rs b/packages/injective-testing/src/multi_test/chain_mock.rs
@@ -1,4 +1,4 @@
-use crate::InjectiveAddressGenerator;
+use crate::multi_test::address_generator::InjectiveAddressGenerator;
 
 use anyhow::{bail, Result as AnyResult};
 use cosmwasm_std::{testing::MockApi, Addr, Api, Binary, BlockInfo, Coin, CustomQuery, Empty, MemoryStorage, Querier, Storage};

diff --git a/packages/injective-testing/src/multi_test/mod.rs b/packages/injective-testing/src/multi_test/mod.rs
@@ -1,5 +1,2 @@
-mod address_generator;
-mod chain_mock;
-
-pub use address_generator::{generate_inj_address, InjectiveAddressGenerator, StorageAwareInjectiveAddressGenerator};
-pub use chain_mock::*;
+pub mod address_generator;
+pub mod chain_mock;
diff --git a/packages/injective-testing/src/test_tube/authz.rs b/packages/injective-testing/src/test_tube/authz.rs
@@ -1,12 +1,14 @@
-use injective_std::{
-    shim::{Any, Timestamp},
-    types::cosmos::{
-        authz::v1beta1::{GenericAuthorization, Grant, MsgGrant, MsgRevoke, MsgRevokeResponse},
-        bank::v1beta1::SendAuthorization,
-        base::v1beta1::Coin as BaseCoin,
+use injective_test_tube::{
+    injective_std::{
+        shim::{Any, Timestamp},
+        types::cosmos::{
+            authz::v1beta1::{GenericAuthorization, Grant, MsgGrant, MsgRevoke, MsgRevokeResponse},
+            bank::v1beta1::SendAuthorization,
+            base::v1beta1::Coin as BaseCoin,
+        },
     },
+    Account, Authz, ExecuteResponse, InjectiveTestApp, Module, Runner, SigningAccount,
 };
-use injective_test_tube::{Account, Authz, ExecuteResponse, InjectiveTestApp, Module, Runner, SigningAccount};
 use prost::Message;
 
 pub fn create_generic_authorization(app: &InjectiveTestApp, granter: &SigningAccount, grantee: String, msg: String, expiration: Option<Timestamp>) {
@@ -80,7 +82,7 @@ pub fn create_send_authorization(app: &InjectiveTestApp, granter: &SigningAccoun
         .unwrap();
 }
 
-pub fn execute_grid_authorizations(app: &InjectiveTestApp, granter: &SigningAccount, grantee: String, msgs: Vec<String>) {
+pub fn execute_generic_authorizations(app: &InjectiveTestApp, granter: &SigningAccount, grantee: String, msgs: Vec<String>) {
     for msg in msgs {
         create_generic_authorization(app, granter, grantee.clone(), msg, None);
     }

diff --git a/packages/injective-testing/src/test_tube/bank.rs b/packages/injective-testing/src/test_tube/bank.rs
@@ -1,9 +1,11 @@
 use cosmwasm_std::Uint128;
-use injective_std::types::cosmos::{
-    bank::v1beta1::{MsgSend, QueryBalanceRequest},
-    base::v1beta1::Coin,
+use injective_test_tube::{
+    injective_std::types::cosmos::{
+        bank::v1beta1::{MsgSend, QueryBalanceRequest},
+        base::v1beta1::Coin,
+    },
+    Account, Bank, InjectiveTestApp, SigningAccount,
 };
-use injective_test_tube::{Account, Bank, InjectiveTestApp, SigningAccount};
 use std::str::FromStr;
 
 pub fn send(bank: &Bank<InjectiveTestApp>, amount: &str, denom: &str, from: &SigningAccount, to: &SigningAccount) {