Cleanup dao-testing

Arena-DAO · Sep 17, 2024 · 5631670 · 5631670
1 parent 5dc69ca
commit 5631670
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 26 deletions.
diff --git a/contracts/external/cw-admin-factory/Cargo.toml b/contracts/external/cw-admin-factory/Cargo.toml
@@ -40,7 +40,7 @@ cw4 = { workspace = true }
 dao-dao-core = { workspace = true, features = ["library"] }
 dao-interface = { workspace = true }
 dao-proposal-single = { workspace = true }
-dao-testing = { workspace = true }
+dao-testing = { workspace = true, features = ["test-tube"] }
 dao-voting = { workspace = true }
 dao-voting-cw4 = { workspace = true }
 osmosis-test-tube = { workspace = true }
diff --git a/contracts/external/cw-admin-factory/src/lib.rs b/contracts/external/cw-admin-factory/src/lib.rs
@@ -8,7 +8,7 @@ pub mod state;
 #[cfg(test)]
 mod tests;
 
-// Integrationg tests using an actual chain binary, requires
+// Integration tests using an actual chain binary, requires
 // the "test-tube" feature to be enabled
 // cargo test --features test-tube
 #[cfg(test)]

diff --git a/packages/dao-testing/src/lib.rs b/packages/dao-testing/src/lib.rs
@@ -13,4 +13,5 @@ pub mod contracts;
 pub use tests::*;
 
 #[cfg(not(target_arch = "wasm32"))]
+#[cfg(feature = "test-tube")]
 pub mod test_tube;
diff --git a/packages/dao-testing/src/test_tube/cw_admin_factory.rs b/packages/dao-testing/src/test_tube/cw_admin_factory.rs
@@ -26,6 +26,7 @@ impl<'a> CwAdminFactory<'a> {
         funds: &[Coin],
     ) -> Result<Self, RunnerError> {
         let wasm = Wasm::new(app);
+
         let code_id = wasm
             .store_code(&Self::get_wasm_byte_code(), None, signer)?
             .data

diff --git a/packages/dao-testing/src/test_tube/mod.rs b/packages/dao-testing/src/test_tube/mod.rs
@@ -6,35 +6,14 @@
 // the "test-tube" feature to be enabled
 // cargo test --features test-tube
 
-#[cfg(feature = "test-tube")]
-pub mod cw_admin_factory;
-
-#[cfg(feature = "test-tube")]
-pub mod cw_abc;
-
-#[cfg(feature = "test-tube")]
-pub mod cw_tokenfactory_issuer;
-
-#[cfg(feature = "test-tube")]
 pub mod cw4_group;
-
-#[cfg(feature = "test-tube")]
 pub mod cw721_base;
-
-#[cfg(feature = "test-tube")]
+pub mod cw_abc;
+pub mod cw_admin_factory;
+pub mod cw_tokenfactory_issuer;
 pub mod dao_abc_factory;
-
-#[cfg(feature = "test-tube")]
 pub mod dao_dao_core;
-
-#[cfg(feature = "test-tube")]
 pub mod dao_proposal_single;
-
-#[cfg(feature = "test-tube")]
 pub mod dao_test_custom_factory;
-
-#[cfg(feature = "test-tube")]
 pub mod dao_voting_cw4;
-
-#[cfg(feature = "test-tube")]
 pub mod dao_voting_token_staked;