fix: github workflow

archway-network · Aug 16, 2023 · 220ecdb · 220ecdb
1 parent 08a2787
commit 220ecdb
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -75,8 +75,8 @@ fn escrow_happy_path_cw20_tokens() {
     let cash = Cw20Contract(cash_addr.clone());
 
     // ensure our balances
-    let querier= QuerierWrapper::<Empty>::new(&router);
-    let owner_balance = cash.balance::< _, Empty>(&querier, owner.clone()).unwrap();
+    let querier = QuerierWrapper::<Empty>::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::<Empty>::new(&router);
+    let querier = QuerierWrapper::<Empty>::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::<Empty>::new(&router);    
+    let querier = QuerierWrapper::<Empty>::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
@@ -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"