Skip to content

Commit

Permalink
fix: sync with upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
crnbarr93 committed Jan 31, 2025
1 parent 9e9b8d6 commit 4833b69
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 74 deletions.
1 change: 1 addition & 0 deletions .cargo/config → .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
wasm = "build --release --lib --target wasm32-unknown-unknown"
unit-test = "test --lib"
schema = "run --bin schema"
integration-test = "test --lib integration_tests"
61 changes: 0 additions & 61 deletions .circleci/config.yml

This file was deleted.

5 changes: 2 additions & 3 deletions .github/workflows/Basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on: [push, pull_request]
name: Basic

jobs:

test:
name: Test Suite
runs-on: ubuntu-latest
Expand All @@ -17,7 +16,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.60.0
toolchain: 1.83.0
target: wasm32-unknown-unknown
override: true

Expand Down Expand Up @@ -48,7 +47,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.60.0
toolchain: 1.83.0
override: true
components: rustfmt, clippy

Expand Down
6 changes: 2 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@ incremental = false
overflow-checks = true

[features]
# for more explicit tests, cargo test --features=backtraces
backtraces = ["cosmwasm-std/backtraces"]
# use library feature to disable all instantiate/execute/query exports
library = []

[package.metadata.scripts]
optimize = """docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/optimizer:0.15.0
cosmwasm/optimizer:0.16.0
"""

[dependencies]
Expand All @@ -48,4 +46,4 @@ thiserror = { version = "1.0.49" }
andromeda-std = { version = "1.0.0-rc1" }

[dev-dependencies]
cw-multi-test = "0.17.0"
cw-multi-test = "2.0.0"
4 changes: 2 additions & 2 deletions Developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ to run it is this:
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/optimizer:0.15.0
cosmwasm/optimizer:0.16.0
```

Or, If you're on an arm64 machine, you should use a docker image built with arm64.
Expand All @@ -83,7 +83,7 @@ Or, If you're on an arm64 machine, you should use a docker image built with arm6
docker run --rm -v "$(pwd)":/code \
--mount type=volume,source="$(basename "$(pwd)")_cache",target=/target \
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
cosmwasm/optimizer-arm64:0.15.0
cosmwasm/optimizer-arm64:0.16.0
```

We must mount the contract code to `/code`. You can use an absolute path instead
Expand Down
6 changes: 3 additions & 3 deletions meta/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
image: Ubuntu

environment:
TOOLCHAIN: 1.69.0
CARGO_GENERATE_VERSION: 0.18.3
TOOLCHAIN: 1.82.0
CARGO_GENERATE_VERSION: 0.22.1

# services:
# - docker
Expand All @@ -31,7 +31,7 @@ install:
- cargo --version
- rustup target add wasm32-unknown-unknown
# Use || true because this fails when already installed from cache
- cargo install --features vendored-openssl cargo-generate --version "$CARGO_GENERATE_VERSION" --debug || true
- cargo install --features vendored-openssl cargo-generate --locked --version "$CARGO_GENERATE_VERSION" --debug || true

build_script:
# No matter what is currently checked out by the CI (main, other branch, PR merge commit),
Expand Down
2 changes: 1 addition & 1 deletion src/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mod tests {
.bank
.init_balance(
storage,
&Addr::unchecked(USER),
&MockApi::default().addr_make(USER),
vec![Coin {
denom: NATIVE_DENOM.to_string(),
amount: Uint128::new(1),
Expand Down

0 comments on commit 4833b69

Please sign in to comment.