Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade rust 1.74 #2674

Merged
merged 11 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
ref: data.data.head.ref,
sha: data.data.head.sha,
}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
ref: ${{ fromJson(steps.issue.outputs.result).sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: [self-hosted, linux]
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/cache@v3
Expand All @@ -52,7 +52,7 @@ jobs:
acala-primitives \
acala-rpc \
acala-runtime runtime-common runtime-integration-tests karura-runtime mandala-runtime \
ethjson evm-jsontests jsontests \
ethjson evm-jsontests \
--exclude-files **/mock.rs **/weights.rs **/weights/* --out xml
- name: Upload to codecov.io
uses: codecov/codecov-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
network: [mandala, karura, acala]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch || github.ref }}
submodules: recursive
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-build-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
matrix: ${{ steps.docker-setup-matrix.outputs.matrix }}
version: ${{ steps.docker-setup-matrix.outputs.version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -52,7 +52,7 @@ jobs:
strategy:
matrix: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch || github.ref }}
submodules: recursive
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build-profiling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: "Build docker profiling image for acala"
runs-on: self-hosted
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch || github.ref }}
submodules: recursive
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/extrinsic-ordering-check-from-bin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
IMAGE: ${{ github.event.inputs.image }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/extrinsic-ordering-check-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
check-extrinsic-ordering-on-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
steps:
# Checkout the Acala codebase
- name: Checkout Codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -69,7 +69,7 @@ jobs:
# Build WASM with Substrate Runtime Tool
- name: Srtool build
id: srtool_build
uses: chevdor/[email protected].0
uses: chevdor/[email protected].1
env:
BUILD_OPTS: "--features on-chain-release-build,no-metadata-docs"
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-tokens.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
persist-credentials: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-bootnotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
verify-karura:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: verify bootnotes
Expand All @@ -17,7 +17,7 @@ jobs:
verify-acala:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: verify bootnotes
Expand Down
2 changes: 2 additions & 0 deletions modules/liquid-crowdloan/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ fn redeem_works() {
.balances(vec![(BOB, LCDOT, 100), (LiquidCrowdloan::account_id(), DOT, 100)])
.build()
.execute_with(|| {
assert_eq!(Currencies::free_balance(LCDOT, &BOB), 100);
assert_ok!(LiquidCrowdloan::redeem(RuntimeOrigin::signed(BOB), 100));
assert_eq!(Currencies::free_balance(LCDOT, &BOB), 0);
assert_eq!(Currencies::free_balance(DOT, &BOB), 100);
Expand Down Expand Up @@ -119,6 +120,7 @@ fn set_redeem_currency_id() {
LDOT
));

assert_eq!(Currencies::free_balance(LCDOT, &ALICE), 100);
assert_err!(
LiquidCrowdloan::redeem(RuntimeOrigin::signed(ALICE), u128::MAX),
sp_runtime::ArithmeticError::Overflow
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.73.0"
channel = "1.74.0"
components = ["rustfmt", "clippy"]
targets = ["wasm32-unknown-unknown"]