diff --git a/.gitignore b/.gitignore index 80ae661..f39c1b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /target +artifacts + Cargo.lock .env diff --git a/Cargo.toml b/Cargo.toml index 2183535..41f9a80 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,22 +42,22 @@ daemon = ["interface", "cw-orch/daemon"] cosmwasm-std = { version = "1.5.3" } cosmwasm-schema = { version = "1.5.3" } cw-controllers = { version = "1.1.2" } -cw-storage-plus = "1.1.0" +cw-storage-plus = "1.2.0" thiserror = { version = "1.0.50" } schemars = "0.8" cw-asset = { version = "3.0.0" } -abstract-app = { version = "0.20" } +abstract-app = { version = "0.21.0" } # Dependencies for interface -cw-orch = { version = "0.19.1", optional = true } +cw-orch = { version = "0.20.1", optional = true } [dev-dependencies] app = { path = ".", features = ["interface"] } -abstract-client = { version = "0.20" } -abstract-app = { version = "0.20", features = ["test-utils"] } +abstract-client = { version = "0.21.0" } +abstract-app = { version = "0.21", features = ["test-utils"] } speculoos = "0.11.0" semver = "1.0" dotenv = "0.15.0" env_logger = "0.10.0" -cw-orch = { version = "0.19.1" } +cw-orch = { version = "0.20.1" } clap = { version = "4.3.7", features = ["derive"] } diff --git a/artifacts/app.wasm b/artifacts/app.wasm deleted file mode 100644 index 44f52f8..0000000 Binary files a/artifacts/app.wasm and /dev/null differ diff --git a/artifacts/checksums.txt b/artifacts/checksums.txt deleted file mode 100644 index fd59c70..0000000 --- a/artifacts/checksums.txt +++ /dev/null @@ -1 +0,0 @@ -a0d5439b64c9669a4d07bf1afc025cd604bec8894f0cfba4f22af6006f92b9f3 app.wasm diff --git a/artifacts/checksums_intermediate.txt b/artifacts/checksums_intermediate.txt deleted file mode 100644 index 4af02d4..0000000 --- a/artifacts/checksums_intermediate.txt +++ /dev/null @@ -1 +0,0 @@ -fea81ae49406fddee8c79f9e971c91769e797823be861090a69ef4ea8d68929c /target/wasm32-unknown-unknown/release/app.wasm diff --git a/template-setup.sh b/template-setup.sh index 15854ca..fa48d15 100755 --- a/template-setup.sh +++ b/template-setup.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -mv example.env .env +cp example.env .env # Function to prompt for 'y' input prompt_confirmation() { diff --git a/tests/integration.rs b/tests/integration.rs index 5d21b21..0fb4eb0 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -1,4 +1,3 @@ -use abstract_app::abstract_testing::OWNER; use abstract_app::objects::namespace::Namespace; use abstract_client::AbstractClient; @@ -20,15 +19,19 @@ use cosmwasm_std::{coins, Addr}; #[allow(clippy::type_complexity)] fn setup( count: i32, -) -> anyhow::Result<(AbstractClient, Application>)> { - // Create a sender - let sender = Addr::unchecked(OWNER); +) -> anyhow::Result<( + AbstractClient, + Application>, +)> { + // Create a sender and mock env + let mock = MockBech32::new("mock"); + let sender = mock.sender(); let namespace = Namespace::from_id(APP_ID)?; // You can set up Abstract with a builder. - let client = AbstractClient::builder(Mock::new(&sender)).build()?; + let client = AbstractClient::builder(mock).build()?; // The client supports setting balances for addresses and configuring ANS. - client.set_balance(&sender, &coins(123, "ucosm"))?; + client.set_balance(sender, &coins(123, "ucosm"))?; // Build a Publisher Account let publisher = client.publisher_builder(namespace).build()?; diff --git a/tests/wasm.rs b/tests/wasm.rs deleted file mode 100644 index caa897e..0000000 --- a/tests/wasm.rs +++ /dev/null @@ -1,20 +0,0 @@ -use app::contract::APP_ID; -use app::AppInterface; - -use abstract_app::abstract_testing::OWNER; -use cw_orch::prelude::*; - -/// This is the raw way to access the cw-orchestrator logic. -/// I.e. this does not use the AbstractClient. -#[test] -fn successful_wasm() { - // Create a sender - let sender = Addr::unchecked(OWNER); - // Create the mock - let mock = Mock::new(&sender); - - // Construct the counter interface - let contract = AppInterface::new(APP_ID, mock); - // Panics if no path to a .wasm file is found - contract.wasm(); -}