little osmosis test tube fixes and examples/Readme

README.md

@@ -207,7 +207,7 @@ impl<Chain: CwEnv> Example<Chain> {
 
 ### Testing with OsmosisTestTube
 
-OsmosisTestTube is available for testing in cw-orchestrator. In order to use it, you may need to install [clang] and [go] to compile the osmosis blockchain that serves as the backend for this env. 
+OsmosisTestTube is available for testing in cw-orchestrator. In order to use it, you may need to install [clang] and [go] to compile the osmosis blockchain that serves as the backend for this env. This compilation is taken care of by cargo directly but if you don't have the right dependencies installed, weird errors may arise. Visit https://docs.osmosis.zone/osmosis-core/osmosisd for a comprehensive list of dependencies.
 
 ## Contributing
 

contracts/counter/Cargo.toml

@@ -31,4 +31,4 @@ counter-contract = { path = ".", features = ["interface"] }
 # Deps for deployment
 dotenv = { version = "0.15.0" }
 env_logger = { version = "0.10.0" }
-cw-orch = { path = "../../cw-orch", features = ["daemon", "test-tube"] }
+cw-orch = { path = "../../cw-orch", features = ["daemon", "osmosis-test-tube"] }

contracts/counter/tests/test-tube.rs → contracts/counter/tests/osmosis-test-tube.rs

@@ -5,7 +5,7 @@ use counter_contract::{
     msg::{GetCountResponse, InstantiateMsg, QueryMsg},
     CounterContract,
 };
-use cw_orch::test_tube::OsmosisTestTube;
+use cw_orch::osmosis_test_tube::OsmosisTestTube;
 // Use prelude to get all the necessary imports
 use cw_orch::prelude::*;
 

cw-orch/Cargo.toml

@@ -23,6 +23,14 @@ name = "mock_test"
 name = "daemon_test"
 required-features = ["daemon"]
 
+[[example]]
+name = "osmosis_test_tube"
+required-features = ["osmosis-test-tube"]
+
+[[example]]
+name = "injective"
+required-features = ["eth"]
+
 [features]
 default = []
 # enable node-backed tests (ensure Docker is running)
@@ -52,7 +60,7 @@ daemon = [
   "dep:prost",
 ]
 eth = ["daemon", "dep:ethers-signers", "dep:ethers-core", "dep:snailquote"]
-test-tube = ["dep:osmosis-test-tube"]
+osmosis-test-tube = ["dep:osmosis-test-tube"]
 
 [dependencies]
 # Default deps

cw-orch/examples/osmosis_test_tube.rs

@@ -0,0 +1,25 @@
+use cosmwasm_std::coins;
+use counter_contract::{
+    contract::CounterContract,
+    msg::{ExecuteMsg, GetCountResponse, InstantiateMsg, QueryMsg},
+};
+use cw_orch::prelude::OsmosisTestTube;
+use cw_orch::prelude::{CwOrchExecute, CwOrchInstantiate, CwOrchQuery, CwOrchUpload};
+
+pub fn main() {
+    let chain = OsmosisTestTube::new(coins(1_000_000_000_000, "uosmo"));
+
+    let contract_counter = CounterContract::new("mock:contract_counter", chain);
+
+    let upload_res = contract_counter.upload();
+    assert!(upload_res.is_ok());
+
+    let init_res = contract_counter.instantiate(&InstantiateMsg { count: 0 }, None, None);
+    assert!(init_res.is_ok());
+
+    let exec_res = contract_counter.execute(&ExecuteMsg::Increment {}, None);
+    assert!(exec_res.is_ok());
+
+    let query_res = contract_counter.query::<GetCountResponse>(&QueryMsg::GetCount {});
+    assert!(query_res.is_ok());
+}

cw-orch/src/error.rs

@@ -11,7 +11,7 @@ pub enum CwOrchError {
     #[cfg(feature = "daemon")]
     #[error(transparent)]
     DaemonError(#[from] DaemonError),
-    #[cfg(feature = "test-tube")]
+    #[cfg(feature = "osmosis-test-tube")]
     #[error(transparent)]
     TestTubeError(#[from] osmosis_test_tube::RunnerError),
     #[error("JSON Conversion Error")]

cw-orch/src/lib.rs

@@ -28,9 +28,9 @@ mod interface_traits;
 #[cfg(feature = "daemon")]
 mod keys;
 pub mod mock;
+#[cfg(feature = "osmosis-test-tube")]
+pub mod osmosis_test_tube;
 mod paths;
-#[cfg(feature = "test-tube")]
-pub mod test_tube;
 
 pub mod state;
 

cw-orch/src/test_tube/core.rs → cw-orch/src/osmosis_test_tube/core.rs

@@ -46,8 +46,8 @@ pub use osmosis_test_tube;
 /// ## Example
 /// ```
 /// # use cosmwasm_std::{Addr, coins, Uint128};
-/// use cw_orch::test_tube::OsmosisTestTube;
-/// use crate::cw_orch::test_tube::osmosis_test_tube::Account;
+/// use cw_orch::osmosis_test_tube::OsmosisTestTube;
+/// use cw_orch::osmosis_test_tube::osmosis_test_tube::Account;
 ///
 /// // Creates an app, creates a sender with an initial balance
 /// let tube: OsmosisTestTube = OsmosisTestTube::new(coins(1_000_000_000_000, "uosmo"));

cw-orch/src/test_tube/mod.rs → cw-orch/src/osmosis_test_tube/mod.rs

@@ -1,4 +1,4 @@
-//! Integration testing execution environment backed by a [test-tube](test_tube) App.
+//! Integration testing execution environment backed by a [osmosis-test-tube](osmosis_test_tube) App.
 //! It has an associated state that stores deployment information for easy retrieval and contract interactions.
 
 mod core;

cw-orch/src/prelude.rs

@@ -28,6 +28,10 @@ pub use crate::environment::{CwEnv, TxHandler, TxResponse};
 // Mock for testing
 pub use crate::mock::Mock;
 
+// OsmosisTestTube for testing
+#[cfg(feature = "osmosis-test-tube")]
+pub use crate::osmosis_test_tube::OsmosisTestTube;
+
 // error
 pub use crate::error::CwOrchError;