Merge branch 'main' into main

CosmWasm · Oct 13, 2022 · 8880b68 · 8880b68
2 parents 9bb42ed + 6c7ba44
commit 8880b68
Show file tree

Hide file tree

Showing 21 changed files with 1,819 additions and 1,341 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,6 @@ workflows:
     jobs:
       - contract_cw1_subkeys
       - contract_cw1_whitelist
-      - contract_cw1_whitelist_ng
       - contract_cw3_fixed_multisig
       - contract_cw3_flex_multisig
       - contract_cw4_group
@@ -109,33 +108,6 @@ jobs:
             - target
           key: cargocache-cw1-whitelist-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
 
-  contract_cw1_whitelist_ng:
-    docker:
-      - image: rust:1.58.1
-    working_directory: ~/project/contracts/cw1-whitelist-ng
-    steps:
-      - checkout:
-          path: ~/project
-      - run:
-          name: Version information
-          command: rustc --version; cargo --version; rustup --version
-      - restore_cache:
-          keys:
-            - cargocache-cw1-whitelist-ng-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
-      - run:
-          name: Unit Tests
-          environment:
-            RUST_BACKTRACE: 1
-          command: cargo unit-test --locked
-      - run:
-          name: Build and run schema generator
-          command: cargo schema --locked
-      - save_cache:
-          paths:
-            - /usr/local/cargo/registry
-            - target
-          key: cargocache-cw1-whitelist-ng-rust:1.58.1-{{ checksum "~/project/Cargo.lock" }}
-
   contract_cw3_fixed_multisig:
     docker:
       - image: rust:1.58.1
@@ -781,7 +753,6 @@ jobs:
       - run:
           name: Build and run schema generator for contracts
           command: |
-            export GLOBIGNORE='./contracts/cw1-whitelist-ng/'
             for C in ./contracts/*/
             do
               echo "Generating schema for $C ..."

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/cw1-whitelist-ng/.cargo/config b/contracts/cw1-whitelist-ng/.cargo/config
diff --git a/contracts/cw1-whitelist-ng/Cargo.toml b/contracts/cw1-whitelist-ng/Cargo.toml
diff --git a/contracts/cw1-whitelist-ng/NOTICE b/contracts/cw1-whitelist-ng/NOTICE
diff --git a/contracts/cw1-whitelist-ng/README.md b/contracts/cw1-whitelist-ng/README.md
diff --git a/contracts/cw1-whitelist-ng/src/bin/schema.rs b/contracts/cw1-whitelist-ng/src/bin/schema.rs