From 220ecdb549b711117f442d4b334bdb6122e472f7 Mon Sep 17 00:00:00 2001 From: eliasmpw Date: Wed, 16 Aug 2023 15:46:26 +0200 Subject: [PATCH] fix: github workflow --- base-workspace/.cargo/config | 2 +- cw20/base/.cargo/config | 4 ++-- cw20/base/Cargo.toml | 2 +- cw20/base/src/contract.rs | 4 ++-- cw20/escrow/.cargo/config | 2 +- cw20/escrow/src/bin/schema.rs | 1 - cw20/escrow/src/contract.rs | 4 ++-- cw20/escrow/src/integration_test.rs | 8 ++++---- cw721/on-chain-metadata/.cargo/config | 2 +- 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/base-workspace/.cargo/config b/base-workspace/.cargo/config index 08d13a6..4fa7f37 100644 --- a/base-workspace/.cargo/config +++ b/base-workspace/.cargo/config @@ -1,5 +1,5 @@ [alias] -wasm = "build --release --target wasm32-unknown-unknown" +wasm = "build --release --lib --target wasm32-unknown-unknown" wasm-debug = "build --target wasm32-unknown-unknown" unit-test = "test --lib" schema = "run --bin schema" diff --git a/cw20/base/.cargo/config b/cw20/base/.cargo/config index 7d1a066..4fa7f37 100644 --- a/cw20/base/.cargo/config +++ b/cw20/base/.cargo/config @@ -1,5 +1,5 @@ [alias] -wasm = "build --release --target wasm32-unknown-unknown" +wasm = "build --release --lib --target wasm32-unknown-unknown" wasm-debug = "build --target wasm32-unknown-unknown" unit-test = "test --lib" -schema = "run --example schema" +schema = "run --bin schema" diff --git a/cw20/base/Cargo.toml b/cw20/base/Cargo.toml index 763be0d..dfb4800 100644 --- a/cw20/base/Cargo.toml +++ b/cw20/base/Cargo.toml @@ -46,13 +46,13 @@ optimize = """docker run --rm \ cosmwasm-schema = "1.3.1" cosmwasm-std = "1.3.1" cosmwasm-storage = "1.3.1" -cw20-base = { version = "1.1.0", features = ["library"] } cw-storage-plus = "1.1.0" cw-utils = "1.0.1" cw0 = "0.10.3" cw2 = "1.1.0" cw20 = "1.1.0" schemars = "0.8.12" +semver = "1" serde = { version = "1.0.183", default-features = false, features = ["derive"] } thiserror = "1.0.44" diff --git a/cw20/base/src/contract.rs b/cw20/base/src/contract.rs index 7e3547b..6d4e68d 100644 --- a/cw20/base/src/contract.rs +++ b/cw20/base/src/contract.rs @@ -432,7 +432,7 @@ pub fn execute_update_marketing( .marketing .as_ref() .ok_or(ContractError::Unauthorized {})? - != &info.sender + != info.sender { return Err(ContractError::Unauthorized {}); } @@ -485,7 +485,7 @@ pub fn execute_upload_logo( .marketing .as_ref() .ok_or(ContractError::Unauthorized {})? - != &info.sender + != info.sender { return Err(ContractError::Unauthorized {}); } diff --git a/cw20/escrow/.cargo/config b/cw20/escrow/.cargo/config index 4e06268..83eab94 100644 --- a/cw20/escrow/.cargo/config +++ b/cw20/escrow/.cargo/config @@ -1,5 +1,5 @@ [alias] -wasm = "build --release --target wasm32-unknown-unknown" +wasm = "build --release --lib --target wasm32-unknown-unknown" wasm-debug = "build --target wasm32-unknown-unknown" unit-test = "test --lib" integration-test = "test --test integration" diff --git a/cw20/escrow/src/bin/schema.rs b/cw20/escrow/src/bin/schema.rs index d23face..b378cc2 100644 --- a/cw20/escrow/src/bin/schema.rs +++ b/cw20/escrow/src/bin/schema.rs @@ -6,7 +6,6 @@ fn main() { write_api! { instantiate: InstantiateMsg, execute: ExecuteMsg, - // TODO fix QueryMsg not matching expected query: QueryMsg, } } diff --git a/cw20/escrow/src/contract.rs b/cw20/escrow/src/contract.rs index 251f09b..446ecc9 100644 --- a/cw20/escrow/src/contract.rs +++ b/cw20/escrow/src/contract.rs @@ -89,7 +89,7 @@ pub fn execute_create( }, Balance::Cw20(token) => { // make sure the token sent is on the whitelist by default - if !cw20_whitelist.iter().any(|t| t == &token.address) { + if !cw20_whitelist.iter().any(|t| t == token.address) { cw20_whitelist.push(token.address.clone()) } GenericBalance { @@ -161,7 +161,7 @@ pub fn execute_top_up( if let Balance::Cw20(token) = &balance { // ensure the token is on the whitelist - if !escrow.cw20_whitelist.iter().any(|t| t == &token.address) { + if !escrow.cw20_whitelist.iter().any(|t| t == token.address) { return Err(ContractError::NotInWhitelist {}); } }; diff --git a/cw20/escrow/src/integration_test.rs b/cw20/escrow/src/integration_test.rs index 74d6956..7239543 100644 --- a/cw20/escrow/src/integration_test.rs +++ b/cw20/escrow/src/integration_test.rs @@ -75,8 +75,8 @@ fn escrow_happy_path_cw20_tokens() { let cash = Cw20Contract(cash_addr.clone()); // ensure our balances - let querier= QuerierWrapper::::new(&router); - let owner_balance = cash.balance::< _, Empty>(&querier, owner.clone()).unwrap(); + let querier = QuerierWrapper::::new(&router); + let owner_balance = cash.balance::<_, Empty>(&querier, owner.clone()).unwrap(); assert_eq!(owner_balance, Uint128::new(5000)); let escrow_balance = cash .balance::<_, Empty>(&querier, escrow_addr.clone()) @@ -119,7 +119,7 @@ fn escrow_happy_path_cw20_tokens() { assert_eq!(2, escrow_attr.len()); // ensure balances updated - let querier= QuerierWrapper::::new(&router); + let querier = QuerierWrapper::::new(&router); let owner_balance = cash.balance::<_, Empty>(&querier, owner.clone()).unwrap(); assert_eq!(owner_balance, Uint128::new(3800)); let escrow_balance = cash @@ -150,7 +150,7 @@ fn escrow_happy_path_cw20_tokens() { .unwrap(); // ensure balances updated - release to ben - let querier= QuerierWrapper::::new(&router); + let querier = QuerierWrapper::::new(&router); let owner_balance = cash.balance::<_, Empty>(&querier, owner).unwrap(); assert_eq!(owner_balance, Uint128::new(3800)); let escrow_balance = cash.balance::<_, Empty>(&querier, escrow_addr).unwrap(); diff --git a/cw721/on-chain-metadata/.cargo/config b/cw721/on-chain-metadata/.cargo/config index 08d13a6..4fa7f37 100644 --- a/cw721/on-chain-metadata/.cargo/config +++ b/cw721/on-chain-metadata/.cargo/config @@ -1,5 +1,5 @@ [alias] -wasm = "build --release --target wasm32-unknown-unknown" +wasm = "build --release --lib --target wasm32-unknown-unknown" wasm-debug = "build --target wasm32-unknown-unknown" unit-test = "test --lib" schema = "run --bin schema"