diff --git a/Cargo.lock b/Cargo.lock index edd41ffb3..35fff8807 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -804,9 +804,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cosm-orc" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f90492cad471f940506b1e6531dda0b62d3bc0aab2e58c745b902f30144d4d1" +checksum = "6676a17fddc94aac5fe07bad646d99b7f7cef1f0cc2c74b61af25733cbbb9f08" dependencies = [ "config", "cosm-tome", @@ -820,9 +820,9 @@ dependencies = [ [[package]] name = "cosm-tome" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa6c1895e44f212da439e325a2ab8717a1981f26987d32b754d1a629c999488" +checksum = "596064e3608349aa302eb68b2df8ed3a66bbb51d9b470dbd9afff70843e44642" dependencies = [ "async-trait", "cosmrs 0.10.0", @@ -4517,9 +4517,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -6329,6 +6329,7 @@ dependencies = [ "libc", "mio", "num_cpus", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", diff --git a/packages/cw-orch/src/external/mod.rs b/packages/cw-orch/src/external/mod.rs index c5c5ad30f..ee24e4bfd 100644 --- a/packages/cw-orch/src/external/mod.rs +++ b/packages/cw-orch/src/external/mod.rs @@ -1,17 +1,17 @@ mod admin_factory; +mod btsg_ft_factory; mod cw721_roles; mod cw_vesting; mod migrator; mod payroll_factory; mod token_swap; mod tokenfactory_issuer; -mod btsg_ft_factory; pub use admin_factory::DaoExternalAdminFactory; +pub use btsg_ft_factory::DaoExternalFantokenFactory; pub use cw721_roles::DaoExternalCw721Roles; pub use cw_vesting::DaoExternalCwVesting; pub use migrator::DaoExternalMigrator; pub use payroll_factory::DaoExternalPayrollFactory; pub use token_swap::DaoExternalTokenSwap; pub use tokenfactory_issuer::DaoExternalTokenfactoryIssuer; -pub use btsg_ft_factory::DaoExternalFantokenFactory; diff --git a/scripts/src/lib.rs b/scripts/src/lib.rs index ecbdd8053..99f646ded 100644 --- a/scripts/src/lib.rs +++ b/scripts/src/lib.rs @@ -1,4 +1,4 @@ -#[allow(clippy::collapsible_if)] +#[allow(dead_code)] fn main() {} mod dao; @@ -7,4 +7,4 @@ pub use dao::*; pub use external::*; #[cfg(test)] -mod tests; \ No newline at end of file +mod tests; diff --git a/scripts/src/tests/external/admin_factory.rs b/scripts/src/tests/external/admin_factory.rs index b75750ed6..beeb4a668 100644 --- a/scripts/src/tests/external/admin_factory.rs +++ b/scripts/src/tests/external/admin_factory.rs @@ -9,7 +9,7 @@ use crate::{ fn test_admin() -> anyhow::Result<()> { let mock = MockBech32::new(PREFIX); let admin = mock.addr_make(ADMIN); - let app = AdminFactorySuite::deploy_on(mock.clone(), admin.clone())?; + let _app = AdminFactorySuite::deploy_on(mock.clone(), admin.clone())?; mock.next_block().unwrap(); Ok(()) } diff --git a/scripts/src/tests/external/btsg_ft_factory.rs b/scripts/src/tests/external/btsg_ft_factory.rs index b75750ed6..beeb4a668 100644 --- a/scripts/src/tests/external/btsg_ft_factory.rs +++ b/scripts/src/tests/external/btsg_ft_factory.rs @@ -9,7 +9,7 @@ use crate::{ fn test_admin() -> anyhow::Result<()> { let mock = MockBech32::new(PREFIX); let admin = mock.addr_make(ADMIN); - let app = AdminFactorySuite::deploy_on(mock.clone(), admin.clone())?; + let _app = AdminFactorySuite::deploy_on(mock.clone(), admin.clone())?; mock.next_block().unwrap(); Ok(()) } diff --git a/scripts/src/tests/external/cw721_roles.rs b/scripts/src/tests/external/cw721_roles.rs index 202778114..c38a32aa6 100644 --- a/scripts/src/tests/external/cw721_roles.rs +++ b/scripts/src/tests/external/cw721_roles.rs @@ -9,7 +9,7 @@ use crate::{ fn test_cw721_roles() -> anyhow::Result<()> { let mock = MockBech32::new(PREFIX); let admin = mock.addr_make(ADMIN); - let app = Cw721RolesSuite::deploy_on(mock.clone(), admin.clone())?; + let _app = Cw721RolesSuite::deploy_on(mock.clone(), admin.clone())?; mock.next_block().unwrap(); Ok(()) } diff --git a/scripts/src/tests/external/dao_migration.rs b/scripts/src/tests/external/dao_migration.rs index 0f80a6948..ed333c6a0 100644 --- a/scripts/src/tests/external/dao_migration.rs +++ b/scripts/src/tests/external/dao_migration.rs @@ -9,7 +9,7 @@ use crate::{ fn test_dao_migration() -> anyhow::Result<()> { let mock = MockBech32::new(PREFIX); let admin = mock.addr_make(ADMIN); - let app = DaoMigrationSuite::deploy_on(mock.clone(), admin.clone())?; + let _app = DaoMigrationSuite::deploy_on(mock.clone(), admin.clone())?; mock.next_block().unwrap(); Ok(()) } diff --git a/scripts/src/tests/external/mod.rs b/scripts/src/tests/external/mod.rs index 0cd1957fa..0a7c11872 100644 --- a/scripts/src/tests/external/mod.rs +++ b/scripts/src/tests/external/mod.rs @@ -1,8 +1,8 @@ pub mod admin_factory; +pub mod btsg_ft_factory; pub mod cw721_roles; +pub mod dao_migration; pub mod payroll; pub mod token_swap; pub mod tokenfactory_issuer; pub mod vesting; -pub mod dao_migration; -pub mod btsg_ft_factory; diff --git a/scripts/src/tests/external/payroll.rs b/scripts/src/tests/external/payroll.rs index eea003b1a..6fb284970 100644 --- a/scripts/src/tests/external/payroll.rs +++ b/scripts/src/tests/external/payroll.rs @@ -9,7 +9,7 @@ use crate::{ fn test_payroll() -> anyhow::Result<()> { let mock = MockBech32::new(PREFIX); let admin = mock.addr_make(ADMIN); - let app = PayrollSuite::deploy_on(mock.clone(), admin.clone())?; + let _app = PayrollSuite::deploy_on(mock.clone(), admin.clone())?; mock.next_block().unwrap(); Ok(()) } diff --git a/scripts/src/tests/external/tokenfactory_issuer.rs b/scripts/src/tests/external/tokenfactory_issuer.rs index 30c518986..46a3b9fd6 100644 --- a/scripts/src/tests/external/tokenfactory_issuer.rs +++ b/scripts/src/tests/external/tokenfactory_issuer.rs @@ -9,7 +9,7 @@ use crate::{ fn test_tokenfactory() -> anyhow::Result<()> { let mock = MockBech32::new(PREFIX); let admin = mock.addr_make(ADMIN); - let app = TokenFactorySuite::deploy_on(mock.clone(), admin.clone())?; + let _app = TokenFactorySuite::deploy_on(mock.clone(), admin.clone())?; mock.next_block().unwrap(); Ok(()) diff --git a/scripts/src/tests/external/vesting.rs b/scripts/src/tests/external/vesting.rs index 2ef501b47..0bebbfaf7 100644 --- a/scripts/src/tests/external/vesting.rs +++ b/scripts/src/tests/external/vesting.rs @@ -1,7 +1,6 @@ use cw_orch::{anyhow, prelude::*}; use crate::{ - external::TokenFactorySuite, tests::{ADMIN, PREFIX}, VestingSuite, }; @@ -10,7 +9,7 @@ use crate::{ fn test_vesting() -> anyhow::Result<()> { let mock = MockBech32::new(PREFIX); let admin = mock.addr_make(ADMIN); - let app = VestingSuite::deploy_on(mock.clone(), admin.clone())?; + let _app = VestingSuite::deploy_on(mock.clone(), admin.clone())?; mock.next_block().unwrap(); Ok(()) } diff --git a/scripts/src/tests/mod.rs b/scripts/src/tests/mod.rs index bb2375cef..29d6e7e54 100644 --- a/scripts/src/tests/mod.rs +++ b/scripts/src/tests/mod.rs @@ -1,5 +1,5 @@ -mod external; mod deploy; +mod external; pub(crate) const PREFIX: &str = "mock"; pub(crate) const ADMIN: &str = "admin";