diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3f393d236f0..43b7875f35e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "image": "ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb", + "image": "ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b", "remoteUser": "ubuntu", "privileged": true, "runArgs": [ diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml index 9b7e95944ef..3b82c41ebf3 100644 --- a/.github/workflows-source/ci-main.yml +++ b/.github/workflows-source/ci-main.yml @@ -36,7 +36,7 @@ env: anchors: image: &image - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b dind-large-setup: &dind-large-setup runs-on: labels: dind-large diff --git a/.github/workflows-source/ci-pr-only.yml b/.github/workflows-source/ci-pr-only.yml index ec6a02a0c7a..145017e45de 100644 --- a/.github/workflows-source/ci-pr-only.yml +++ b/.github/workflows-source/ci-pr-only.yml @@ -20,7 +20,7 @@ env: anchors: image: &image - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b dind-small-setup: &dind-small-setup timeout-minutes: 30 runs-on: diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml index 2d63bb14fc5..80cc2b0f6ba 100644 --- a/.github/workflows-source/release-testing.yml +++ b/.github/workflows-source/release-testing.yml @@ -27,7 +27,7 @@ env: anchors: image: &image - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b dind-large-setup: &dind-large-setup runs-on: group: zh1 diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index e5ec8c8e367..f0d7eb20c97 100644 --- a/.github/workflows-source/schedule-daily.yml +++ b/.github/workflows-source/schedule-daily.yml @@ -20,7 +20,7 @@ env: anchors: image: &image - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b dind-large-setup: &dind-large-setup runs-on: group: zh1 diff --git a/.github/workflows-source/schedule-hourly.yml b/.github/workflows-source/schedule-hourly.yml index 3dcd5ef0048..c95eb62f7e6 100644 --- a/.github/workflows-source/schedule-hourly.yml +++ b/.github/workflows-source/schedule-hourly.yml @@ -20,7 +20,7 @@ env: anchors: image: &image - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b dind-large-setup: &dind-large-setup runs-on: labels: dind-large diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index 75cae1d4ccb..06a7fb1dd28 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -33,7 +33,7 @@ jobs: bazel-test-all: name: Bazel Test All container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info timeout-minutes: 90 @@ -104,7 +104,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info timeout-minutes: 90 @@ -201,7 +201,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info timeout-minutes: 90 @@ -240,7 +240,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info timeout-minutes: 90 @@ -279,7 +279,7 @@ jobs: runs-on: labels: dind-small container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b timeout-minutes: 30 steps: - name: Checkout @@ -309,7 +309,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info timeout-minutes: 90 @@ -411,7 +411,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info timeout-minutes: 90 @@ -448,7 +448,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info timeout-minutes: 90 diff --git a/.github/workflows/ci-pr-only.yml b/.github/workflows/ci-pr-only.yml index e83a58fe2a2..0d2b825b351 100644 --- a/.github/workflows/ci-pr-only.yml +++ b/.github/workflows/ci-pr-only.yml @@ -22,7 +22,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME steps: @@ -67,7 +67,7 @@ jobs: runs-on: labels: dind-small container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME steps: @@ -105,7 +105,7 @@ jobs: runs-on: labels: dind-small container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME steps: @@ -122,7 +122,7 @@ jobs: runs-on: labels: dind-small container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME timeout-minutes: 60 diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml index ebbd574cbee..b8ee022b6df 100644 --- a/.github/workflows/release-testing.yml +++ b/.github/workflows/release-testing.yml @@ -32,7 +32,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 180 # 3 hours @@ -81,7 +81,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 180 # 3 hours @@ -129,7 +129,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 90 @@ -177,7 +177,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 60 @@ -224,7 +224,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 180 # 3 hours @@ -252,7 +252,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 180 # 3 hours diff --git a/.github/workflows/rosetta-release.yml b/.github/workflows/rosetta-release.yml index ee34bcb0547..819e6d88098 100644 --- a/.github/workflows/rosetta-release.yml +++ b/.github/workflows/rosetta-release.yml @@ -22,7 +22,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index 62142de4e02..feb1bc91764 100644 --- a/.github/workflows/schedule-daily.yml +++ b/.github/workflows/schedule-daily.yml @@ -19,7 +19,7 @@ jobs: bazel-test-bare-metal: name: Bazel Test Bare Metal container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 120 @@ -80,7 +80,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 720 # 12 hours @@ -127,7 +127,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 20 @@ -174,7 +174,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 480 @@ -226,7 +226,7 @@ jobs: group: zh1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 60 diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml index 80008309e83..5a7015ea6fe 100644 --- a/.github/workflows/schedule-hourly.yml +++ b/.github/workflows/schedule-hourly.yml @@ -21,7 +21,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 120 @@ -63,7 +63,7 @@ jobs: bazel-system-test-hourly: name: Bazel System Tests Hourly container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 120 @@ -111,7 +111,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp timeout-minutes: 120 diff --git a/.github/workflows/schedule-rust-bench.yml b/.github/workflows/schedule-rust-bench.yml index 5f1730bc00f..8886fbf6cf7 100644 --- a/.github/workflows/schedule-rust-bench.yml +++ b/.github/workflows/schedule-rust-bench.yml @@ -26,7 +26,7 @@ jobs: # see linux-x86-64 runner group labels: rust-benchmarks container: - image: ghcr.io/dfinity/ic-build@sha256:fb66b22cf6cf52178f554a417837791867a2c080f9d3e9d9acaa64c811e8508a + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b # running on bare metal machine using ubuntu user options: --user ubuntu -v /cache:/cache timeout-minutes: 720 # 12 hours diff --git a/.github/workflows/schedule-weekly.yml b/.github/workflows/schedule-weekly.yml index 59861f8f818..07ba42f9bce 100644 --- a/.github/workflows/schedule-weekly.yml +++ b/.github/workflows/schedule-weekly.yml @@ -14,7 +14,7 @@ jobs: runs-on: labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME -v /cache:/cache diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml index e48db227791..92865864689 100644 --- a/.github/workflows/system-tests-k8s.yml +++ b/.github/workflows/system-tests-k8s.yml @@ -50,7 +50,7 @@ jobs: group: ln1 labels: dind-large container: - image: ghcr.io/dfinity/ic-build@sha256:d883e7f6e5a355d63f6d8a294cfbeb47161bc27055e34730c21c6eeae0617acb + image: ghcr.io/dfinity/ic-build@sha256:115daa5ad5149182bb0416cbe5730f305be3bb2f48df576bc2c23067eefce84b options: >- -e NODE_NAME -e KUBECONFIG --privileged --cgroupns host diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock index 8fc7625576b..f5f3723afbf 100644 --- a/Cargo.Bazel.Fuzzing.json.lock +++ b/Cargo.Bazel.Fuzzing.json.lock @@ -1,5 +1,5 @@ { - "checksum": "2debd702b24f7c7c56d40695d32c74e12a292344893ba7f1a2441756723febfc", + "checksum": "f5026c7a40e78a70b51f4b198bb812011d948439fd6b9031696128a040190590", "crates": { "abnf 0.12.0": { "name": "abnf", diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock index 3b4f8639fe1..2d58388f02e 100644 --- a/Cargo.Bazel.json.lock +++ b/Cargo.Bazel.json.lock @@ -1,5 +1,5 @@ { - "checksum": "ef752013465c4aa89c0749caba4ca2cd50f4fdbc0c61e65e3cdc9d6010222704", + "checksum": "7065cd712fb971a438cffb1c5d86c455a1ef31197340b958bcba5637e4aa8190", "crates": { "abnf 0.12.0": { "name": "abnf", diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 859a6c49326..052797fb93f 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -227,8 +227,12 @@ rust_register_toolchains( # The nightly version is required to compile fuzz tests from Bazel. # The version below is chosen so that it is in sync with the non-nightly version. versions = [ - "1.80.0", - "nightly/2024-06-06", + "1.81.0", + # Use the nightly version from the day before the branch. + # - + # NB! Due to a regression in the compiler https://github.com/rust-lang/rust/issues/128895, that's + # only back-ported to stable, we use a more recent version. + "nightly/2024-09-23", ], ) diff --git a/ci/container/Dockerfile b/ci/container/Dockerfile index 98d6ca19314..7d3a9cc83a7 100644 --- a/ci/container/Dockerfile +++ b/ci/container/Dockerfile @@ -164,7 +164,7 @@ ENV PYTHONPATH=/ic/ci/src:/ic/ci/src/dependencies:$PYTHONPATH RUN cd /tmp/bazel && bazel version # Add Rust/Cargo support -ARG RUST_VERSION=1.80.0 +ARG RUST_VERSION=1.81.0 RUN curl --fail https://sh.rustup.rs -sSf \ | sh -s -- -y --default-toolchain ${RUST_VERSION}-x86_64-unknown-linux-gnu --no-modify-path && \ rustup default ${RUST_VERSION}-x86_64-unknown-linux-gnu && \ diff --git a/ci/container/TAG b/ci/container/TAG index 7fd71244da8..0e1701a086d 100644 --- a/ci/container/TAG +++ b/ci/container/TAG @@ -1 +1 @@ -e320392779f38ca0f007783be6865ecb3e293685a8f31a7a72a9de854cee1ff2 +0bae86526532874d50992514f46cba23aac279315fd3e8d6726310e997751101 diff --git a/publish/canisters/BUILD.bazel b/publish/canisters/BUILD.bazel index 79f40eba37e..0c5aa71f65c 100644 --- a/publish/canisters/BUILD.bazel +++ b/publish/canisters/BUILD.bazel @@ -87,7 +87,7 @@ NNS_CANISTERS_MAX_SIZE_COMPRESSED_E5_BYTES = { "genesis-token-canister.wasm.gz": "3", "governance-canister.wasm.gz": "14", "governance-canister_test.wasm.gz": "14", - "registry-canister.wasm.gz": "13", + "registry-canister.wasm.gz": "14", "root-canister.wasm.gz": "4", } diff --git a/rs/artifact_pool/src/inmemory_pool.rs b/rs/artifact_pool/src/inmemory_pool.rs index 36c6da6649d..fe68de47d17 100644 --- a/rs/artifact_pool/src/inmemory_pool.rs +++ b/rs/artifact_pool/src/inmemory_pool.rs @@ -121,9 +121,8 @@ impl + HasTimestamp + Clone> InMemoryPoolSection< /// Get a consensus message by its hash pub fn remove_by_hash(&mut self, hash: &CryptoHash) -> Option { - self.artifacts.remove(hash).map(|artifact| { + self.artifacts.remove(hash).inspect(|artifact| { self.indexes.remove(artifact.as_ref(), hash); - artifact }) } diff --git a/rs/boundary_node/prober/src/main.rs b/rs/boundary_node/prober/src/main.rs index dd9d9ce557b..6691a8f4441 100644 --- a/rs/boundary_node/prober/src/main.rs +++ b/rs/boundary_node/prober/src/main.rs @@ -575,7 +575,7 @@ impl Install for Installer { 0, ); - install_call + () = install_call .call_and_wait() .await .context("failed to install canister")?; @@ -674,7 +674,7 @@ impl Stop for Stopper { 0, ); - stop_call + () = stop_call .call_and_wait() .await .context("failed to stop canister")?; @@ -724,7 +724,7 @@ impl Delete for Deleter { 0, ); - delete_call + () = delete_call .call_and_wait() .await .context("failed to delete canister")?; diff --git a/rs/consensus/src/consensus/block_maker.rs b/rs/consensus/src/consensus/block_maker.rs index b1c71b4c3d2..a070b2cd15e 100755 --- a/rs/consensus/src/consensus/block_maker.rs +++ b/rs/consensus/src/consensus/block_maker.rs @@ -138,7 +138,7 @@ impl BlockMaker { Some(&self.metrics), ) { - self.propose_block(pool, rank, parent).map(|proposal| { + self.propose_block(pool, rank, parent).inspect(|proposal| { debug!( self.log, "Make proposal {:?} {:?} {:?}", @@ -147,7 +147,6 @@ impl BlockMaker { proposal.as_ref().payload.as_ref() ); self.log_block(proposal.as_ref()); - proposal }) } else { None diff --git a/rs/cross-chain/proposal-cli/src/git/mod.rs b/rs/cross-chain/proposal-cli/src/git/mod.rs index 252ffbe34aa..36f4c40fe05 100644 --- a/rs/cross-chain/proposal-cli/src/git/mod.rs +++ b/rs/cross-chain/proposal-cli/src/git/mod.rs @@ -187,11 +187,6 @@ impl GitRepository { canister.iter().map(|c| self.sha256_artifact(c)).collect() } - pub fn build_canister_artifact(&mut self, canister: &TargetCanister) -> CompressedWasmHash { - self.build_canisters(); - self.sha256_artifact(canister) - } - fn build_canisters(&mut self) { let build = Command::new("./ci/container/build-ic.sh") .arg("--canisters") diff --git a/rs/crypto/internal/crypto_lib/multi_sig/bls12_381/src/types/generic_traits/tests.rs b/rs/crypto/internal/crypto_lib/multi_sig/bls12_381/src/types/generic_traits/tests.rs index 1fdb3daca9d..75724905208 100644 --- a/rs/crypto/internal/crypto_lib/multi_sig/bls12_381/src/types/generic_traits/tests.rs +++ b/rs/crypto/internal/crypto_lib/multi_sig/bls12_381/src/types/generic_traits/tests.rs @@ -12,16 +12,16 @@ proptest! { })] #[test] - fn debug_trait_on_public_key_bytes_works(public_key_bytes: PublicKeyBytes) { format!("{:?}", public_key_bytes); } + fn debug_trait_on_public_key_bytes_works(public_key_bytes: PublicKeyBytes) { let _ = format!("{:?}", public_key_bytes); } #[test] - fn debug_trait_on_individual_signature_bytes_works(individual_signature_bytes: IndividualSignatureBytes) { format!("{:?}", individual_signature_bytes); } + fn debug_trait_on_individual_signature_bytes_works(individual_signature_bytes: IndividualSignatureBytes) { let _ = format!("{:?}", individual_signature_bytes); } #[test] - fn debug_trait_on_pop_bytes_works(pop_bytes: PopBytes) { format!("{:?}", pop_bytes); } + fn debug_trait_on_pop_bytes_works(pop_bytes: PopBytes) { let _ = format!("{:?}", pop_bytes); } #[test] - fn debug_trait_on_combined_signature_bytes_works(combined_signature_bytes: CombinedSignatureBytes) { format!("{:?}", combined_signature_bytes); } + fn debug_trait_on_combined_signature_bytes_works(combined_signature_bytes: CombinedSignatureBytes) { let _ = format!("{:?}", combined_signature_bytes); } #[test] fn debug_should_redact_secretkey_bytes(secret_key_bytes: SecretKeyBytes) { diff --git a/rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/src/types/generic_traits/tests.rs b/rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/src/types/generic_traits/tests.rs index 1a1fe6895f1..e09403f70ab 100644 --- a/rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/src/types/generic_traits/tests.rs +++ b/rs/crypto/internal/crypto_lib/threshold_sig/bls12_381/src/types/generic_traits/tests.rs @@ -13,13 +13,13 @@ proptest! { })] #[test] - fn debug_trait_on_public_key_bytes_works(public_key_bytes in threshold_sig_public_key_bytes()) { format!("{:?}", public_key_bytes); } + fn debug_trait_on_public_key_bytes_works(public_key_bytes in threshold_sig_public_key_bytes()) { let _ =format!("{:?}", public_key_bytes); } #[test] - fn debug_trait_on_individual_signature_bytes_works(individual_signature_bytes: IndividualSignatureBytes) { format!("{:?}", individual_signature_bytes); } + fn debug_trait_on_individual_signature_bytes_works(individual_signature_bytes: IndividualSignatureBytes) { let _ = format!("{:?}", individual_signature_bytes); } #[test] - fn debug_trait_on_combined_signature_bytes_works(combined_signature_bytes: CombinedSignatureBytes) { format!("{:?}", combined_signature_bytes); } + fn debug_trait_on_combined_signature_bytes_works(combined_signature_bytes: CombinedSignatureBytes) { let _ = format!("{:?}", combined_signature_bytes); } #[test] fn debug_should_redact_secretkey_bytes(secret_key_bytes: SecretKeyBytes) { diff --git a/rs/embedders/src/wasmtime_embedder.rs b/rs/embedders/src/wasmtime_embedder.rs index 7908ae44042..44070b65d0c 100644 --- a/rs/embedders/src/wasmtime_embedder.rs +++ b/rs/embedders/src/wasmtime_embedder.rs @@ -1,8 +1,3 @@ -// False positive clippy lint. -// Issue: https://github.com/rust-lang/rust-clippy/issues/12856 -// Fixed in: https://github.com/rust-lang/rust-clippy/pull/12892 -#![allow(clippy::needless_borrows_for_generic_args)] - pub mod host_memory; mod signal_stack; mod system_api; diff --git a/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs b/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs index 2bef438ae2e..40806f8eeaf 100644 --- a/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs +++ b/rs/ethereum/ledger-suite-orchestrator/src/management/mod.rs @@ -268,7 +268,7 @@ impl CanisterRuntime for IcCanisterRuntime { sender_canister_version: None, }; - self.call("install_code", 0, &install_code).await?; + () = self.call("install_code", 0, &install_code).await?; Ok(()) } @@ -288,7 +288,7 @@ impl CanisterRuntime for IcCanisterRuntime { sender_canister_version: None, }; - self.call("install_code", 0, &install_code).await?; + () = self.call("install_code", 0, &install_code).await?; Ok(()) } diff --git a/rs/execution_environment/tests/backtraces.rs b/rs/execution_environment/tests/backtraces.rs index 871fd5265e3..87db4818fbb 100644 --- a/rs/execution_environment/tests/backtraces.rs +++ b/rs/execution_environment/tests/backtraces.rs @@ -72,8 +72,6 @@ Canister Backtrace: _wasm_backtrace_canister::unreachable::inner_2 _wasm_backtrace_canister::unreachable::inner _wasm_backtrace_canister::unreachable::outer -_wasm_backtrace_canister::__canister_method_unreachable::{{closure}} -canister_update unreachable "#, ); } @@ -118,8 +116,8 @@ Canister Backtrace: _wasm_backtrace_canister::oob::inner_2 _wasm_backtrace_canister::oob::inner _wasm_backtrace_canister::oob::outer -canister_update oob"#, - ); +"#, + ) } #[test] @@ -137,14 +135,12 @@ ic_cdk::api::trap ic_cdk::printer::set_panic_hook::{{closure}} std::panicking::rust_panic_with_hook std::panicking::begin_panic_handler::{{closure}} -std::sys_common::backtrace::__rust_end_short_backtrace +std::sys::backtrace::__rust_end_short_backtrace rust_begin_unwind core::panicking::panic_fmt _wasm_backtrace_canister::ic0_trap::inner_2 _wasm_backtrace_canister::ic0_trap::inner _wasm_backtrace_canister::ic0_trap::outer -_wasm_backtrace_canister::__canister_method_ic0_trap::{{closure}} -canister_update ic0_trap "#, ); } @@ -164,7 +160,6 @@ ic0::ic0::stable_write _wasm_backtrace_canister::stable_oob::inner_2 _wasm_backtrace_canister::stable_oob::inner _wasm_backtrace_canister::stable_oob::outer -canister_update stable_oob "#, ) } diff --git a/rs/https_outcalls/adapter/src/rpc_server.rs b/rs/https_outcalls/adapter/src/rpc_server.rs index 35503cfa27e..0d8f04e7563 100644 --- a/rs/https_outcalls/adapter/src/rpc_server.rs +++ b/rs/https_outcalls/adapter/src/rpc_server.rs @@ -162,12 +162,11 @@ impl HttpsOutcallsService for CanisterHttp { })?; // Build Http Request. - let mut headers = validate_headers(req.headers).map_err(|err| { + let mut headers = validate_headers(req.headers).inspect_err(|_| { self.metrics .request_errors .with_label_values(&[LABEL_REQUEST_HEADERS]) .inc(); - err })?; // Add user-agent header if not present. diff --git a/rs/https_outcalls/adapter/tests/server_test.rs b/rs/https_outcalls/adapter/tests/server_test.rs index b46d2ce9ac0..53e191471c4 100644 --- a/rs/https_outcalls/adapter/tests/server_test.rs +++ b/rs/https_outcalls/adapter/tests/server_test.rs @@ -469,38 +469,13 @@ MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgob29X4H4m2XOkSZE // implements unix listener that removes socket file when done // adapter does not need this because the socket is managed by systemd mod unix { - use std::path::{Path, PathBuf}; use std::{ pin::Pin, task::{Context, Poll}, }; use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; - use tokio::net::unix::SocketAddr; use tonic::transport::server::Connected; - pub struct UnixListenerDrop { - path: PathBuf, - listener: tokio::net::UnixListener, - } - - impl UnixListenerDrop { - pub fn bind(path: impl AsRef) -> std::io::Result { - let path = path.as_ref().to_owned(); - tokio::net::UnixListener::bind(&path) - .map(|listener| UnixListenerDrop { path, listener }) - } - pub async fn accept(&self) -> tokio::io::Result<(tokio::net::UnixStream, SocketAddr)> { - self.listener.accept().await - } - } - - impl Drop for UnixListenerDrop { - fn drop(&mut self) { - // There's no way to return a useful error here - std::fs::remove_file(&self.path).unwrap(); - } - } - #[derive(Debug)] pub struct UnixStream(pub tokio::net::UnixStream); diff --git a/rs/nervous_system/root/src/change_canister.rs b/rs/nervous_system/root/src/change_canister.rs index 34f2d809dc4..8cddc7ebb92 100644 --- a/rs/nervous_system/root/src/change_canister.rs +++ b/rs/nervous_system/root/src/change_canister.rs @@ -305,7 +305,7 @@ where { // stop_canister returns the candid empty type, which cannot be parsed using // dfn_candid::candid - Rt::call_with_cleanup( + () = Rt::call_with_cleanup( CanisterId::ic_00(), "stop_canister", (CanisterIdRecord::from(canister_id),), diff --git a/rs/nns/integration_tests/src/governance_time_warp.rs b/rs/nns/integration_tests/src/governance_time_warp.rs index e9e723e754e..474c4df090f 100644 --- a/rs/nns/integration_tests/src/governance_time_warp.rs +++ b/rs/nns/integration_tests/src/governance_time_warp.rs @@ -100,7 +100,7 @@ fn test_time_warp() { // disbursal. let duration_since_start_s = get_timestamp_s() - start_timestamp_s; let mut delta_s = (TWELVE_MONTHS_SECONDS - duration_since_start_s - 100) as i64; - nns_canisters + () = nns_canisters .governance .update_("set_time_warp", candid_one, TimeWarp { delta_s }) .await?; @@ -138,7 +138,7 @@ fn test_time_warp() { // Advance time slightly (200 s) such that that the neuron should be fully // dissolved. delta_s += 200; - nns_canisters + () = nns_canisters .governance .update_("set_time_warp", candid_one, TimeWarp { delta_s }) .await?; diff --git a/rs/nns/integration_tests/src/wait_for_quiet.rs b/rs/nns/integration_tests/src/wait_for_quiet.rs index a02d5287c89..8a1e7ce0b16 100644 --- a/rs/nns/integration_tests/src/wait_for_quiet.rs +++ b/rs/nns/integration_tests/src/wait_for_quiet.rs @@ -111,7 +111,7 @@ fn test_deadline_is_extended_with_wait_for_quiet() { // Set the TimeWarp one day in the future so a change to the WFQ deadline has a measurable // effect let delta_s = ONE_DAY_SECONDS as i64; - nns_canisters + () = nns_canisters .governance .update_("set_time_warp", candid_one, TimeWarp { delta_s }) .await?; diff --git a/rs/nns/sns-wasm/canister/canister.rs b/rs/nns/sns-wasm/canister/canister.rs index 715ba896d82..819a39fd1a2 100644 --- a/rs/nns/sns-wasm/canister/canister.rs +++ b/rs/nns/sns-wasm/canister/canister.rs @@ -232,7 +232,7 @@ fn handle_call_error(prefix: String) -> impl FnOnce((Option, String)) -> St impl CanisterApiImpl { async fn stop_canister(&self, canister: CanisterId) -> Result<(), String> { - dfn_core::call( + () = dfn_core::call( CanisterId::ic_00(), "stop_canister", candid_one, diff --git a/rs/p2p/quic_transport/src/connection_handle.rs b/rs/p2p/quic_transport/src/connection_handle.rs index 9ac1e1c5023..3e814895cc2 100644 --- a/rs/p2p/quic_transport/src/connection_handle.rs +++ b/rs/p2p/quic_transport/src/connection_handle.rs @@ -90,11 +90,10 @@ impl ConnectionHandle { .connection_handle_bytes_received_total .with_label_values(&[request.uri().path()]); - let (send_stream, recv_stream) = self.connection.open_bi().await.map_err(|err| { + let (send_stream, recv_stream) = self.connection.open_bi().await.inspect_err(|_| { self.metrics .connection_handle_errors_total .with_label_values(&[REQUEST_TYPE_RPC, ERROR_TYPE_OPEN]); - err })?; let mut send_stream_guard = SendStreamDropGuard::new(send_stream); @@ -107,36 +106,32 @@ impl ConnectionHandle { .unwrap_or_default(); let _ = send_stream.set_priority(priority.into()); - write_request(send_stream, request).await.map_err(|err| { + write_request(send_stream, request).await.inspect_err(|_| { self.metrics .connection_handle_errors_total .with_label_values(&[REQUEST_TYPE_RPC, ERROR_TYPE_WRITE]) .inc(); - err })?; - send_stream.finish().map_err(|err| { + send_stream.finish().inspect_err(|_| { self.metrics .connection_handle_errors_total .with_label_values(&[REQUEST_TYPE_RPC, ERROR_TYPE_FINISH]) .inc(); - err })?; - send_stream.stopped().await.map_err(|err| { + send_stream.stopped().await.inspect_err(|_| { self.metrics .connection_handle_errors_total .with_label_values(&[REQUEST_TYPE_PUSH, ERROR_TYPE_STOPPED]) .inc(); - err })?; - let mut response = read_response(recv_stream).await.map_err(|err| { + let mut response = read_response(recv_stream).await.inspect_err(|_| { self.metrics .connection_handle_errors_total .with_label_values(&[REQUEST_TYPE_RPC, ERROR_TYPE_READ]) .inc(); - err })?; // Propagate PeerId from this request to upper layers. diff --git a/rs/query_stats/src/payload_builder.rs b/rs/query_stats/src/payload_builder.rs index de04fd5e0bf..44bfac928b8 100644 --- a/rs/query_stats/src/payload_builder.rs +++ b/rs/query_stats/src/payload_builder.rs @@ -375,12 +375,11 @@ impl QueryStatsPayloadBuilderImpl { // Deserialize the payload .filter_map(|past_payload| { QueryStatsPayload::deserialize(past_payload.payload) - .map_err(|err| { + .inspect_err(|_| { error!( self.log, "Failed to deserialize past payload, this is a bug" ); - err }) .ok() .flatten() diff --git a/rs/replica/src/setup.rs b/rs/replica/src/setup.rs index 51d6d5ef9f8..72c35c646a0 100644 --- a/rs/replica/src/setup.rs +++ b/rs/replica/src/setup.rs @@ -19,12 +19,11 @@ use std::{env, path::PathBuf, sync::Arc}; pub fn parse_args() -> Result { let args_result = ReplicaArgs::try_parse_from(env::args()); - args_result.map(|args| { + args_result.inspect(|args| { if args.print_sample_config { print!("{}", SAMPLE_CONFIG); std::process::exit(0); } - args }) } diff --git a/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs b/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs index e2574a2bb28..3eed309a8bc 100644 --- a/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs +++ b/rs/replicated_state/src/canister_state/system_state/call_context_manager.rs @@ -811,15 +811,13 @@ impl CallContextManager { /// If we get a response for one of the outstanding calls, we unregister /// the callback and return it. pub fn unregister_callback(&mut self, callback_id: CallbackId) -> Option> { - self.callbacks.remove(&callback_id).map(|callback| { - self.stats.on_unregister_callback(&callback); + self.callbacks.remove(&callback_id).inspect(|callback| { + self.stats.on_unregister_callback(callback); if callback.deadline != NO_DEADLINE { self.unexpired_callbacks .remove(&(callback.deadline, callback_id)); } debug_assert!(self.stats_ok()); - - callback }) } diff --git a/rs/rosetta-api/icrc1/Cargo.toml b/rs/rosetta-api/icrc1/Cargo.toml index 81ec3ac4b85..279846ee6d5 100644 --- a/rs/rosetta-api/icrc1/Cargo.toml +++ b/rs/rosetta-api/icrc1/Cargo.toml @@ -31,6 +31,7 @@ ic-icrc1-index-ng = { path = "index-ng" } ic-icrc1-ledger = { path = "ledger" } ic-icrc1-ledger-sm-tests = { path = "ledger/sm-tests" } ic-icrc1-test-utils = { path = "test_utils" } +ic-icrc1-tokens-u256 = { path = "tokens_u256" } ic-nns-test-utils = { path = "../../nns/test_utils" } ic-nns-test-utils-golden-nns-state = { path = "../../nns/test_utils/golden_nns_state" } ic-registry-subnet-type = { path = "../../registry/subnet_type" } diff --git a/rs/rosetta-api/ledger_canister_core/src/spawn.rs b/rs/rosetta-api/ledger_canister_core/src/spawn.rs index a70d37bd3bf..d3b097bc2c4 100644 --- a/rs/rosetta-api/ledger_canister_core/src/spawn.rs +++ b/rs/rosetta-api/ledger_canister_core/src/spawn.rs @@ -22,7 +22,7 @@ where sender_canister_version: None, }; - Rt::call(IC_00, "install_code", /*cycles=*/ 0, (install_code,)).await?; + () = Rt::call(IC_00, "install_code", /*cycles=*/ 0, (install_code,)).await?; Ok(()) } diff --git a/rs/rosetta-api/tests/system_tests/common/system_test_environment.rs b/rs/rosetta-api/tests/system_tests/common/system_test_environment.rs index 6ab86b1536b..93749e1eda4 100644 --- a/rs/rosetta-api/tests/system_tests/common/system_test_environment.rs +++ b/rs/rosetta-api/tests/system_tests/common/system_test_environment.rs @@ -181,6 +181,7 @@ impl RosettaTestingEnvironmentBuilder { self } + #[allow(dead_code)] pub fn with_initial_balances( mut self, initial_balances: HashMap, diff --git a/rs/rosetta-api/tests/test_utils/mod.rs b/rs/rosetta-api/tests/test_utils/mod.rs index 3111067fa29..dcff24181b4 100644 --- a/rs/rosetta-api/tests/test_utils/mod.rs +++ b/rs/rosetta-api/tests/test_utils/mod.rs @@ -76,6 +76,7 @@ impl TestLedger { } } + #[allow(dead_code)] pub async fn add_block(&self, hb: HashedBlock) -> Result<(), ApiError> { let mut blockchain = self.blockchain.write().await; blockchain.push(&hb).map_err(ApiError::from)?; diff --git a/rs/rust_canisters/canister_test/src/canister.rs b/rs/rust_canisters/canister_test/src/canister.rs index 0ddff3c47e3..fd746e5a8bd 100644 --- a/rs/rust_canisters/canister_test/src/canister.rs +++ b/rs/rust_canisters/canister_test/src/canister.rs @@ -811,7 +811,8 @@ impl<'a> Canister<'a> { /// Tries to delete this canister. pub async fn delete(&self) -> Result<(), String> { - self.runtime + () = self + .runtime .get_management_canister_with_effective_canister_id(self.canister_id().into()) .update_("delete_canister", candid_multi_arity, (self.as_record(),)) .await?; diff --git a/rs/sns/root/src/lib.rs b/rs/sns/root/src/lib.rs index 080752dd84e..0e6ad6bc3f3 100644 --- a/rs/sns/root/src/lib.rs +++ b/rs/sns/root/src/lib.rs @@ -2805,7 +2805,7 @@ mod tests { async fn test_get_sns_canisters_summary_reports_settings() { // Step 1: Prepare the world. thread_local! { - static SNS_ROOT_CANISTER: RefCell = RefCell::new(SnsRootCanister { + static SNS_ROOT_CANISTER: RefCell = const { RefCell::new(SnsRootCanister { governance_canister_id: Some(PrincipalId::new_user_test_id(1)), ledger_canister_id: Some(PrincipalId::new_user_test_id(2)), swap_canister_id: Some(PrincipalId::new_user_test_id(3)), @@ -2813,7 +2813,7 @@ mod tests { archive_canister_ids: vec![], index_canister_id: Some(PrincipalId::new_user_test_id(4)), testflight: false, - }); + }) }; } let root_canister_id = CanisterId::from_u64(4); diff --git a/rs/state_layout/src/state_layout.rs b/rs/state_layout/src/state_layout.rs index f515df0d2db..a62594e3650 100644 --- a/rs/state_layout/src/state_layout.rs +++ b/rs/state_layout/src/state_layout.rs @@ -2308,13 +2308,9 @@ impl TryFrom for CanisterStateBits { .map(|c| c.try_into()) .transpose()?; - let consumed_cycles = match try_from_option_field( - value.consumed_cycles, - "CanisterStateBits::consumed_cycles", - ) { - Ok(consumed_cycles) => consumed_cycles, - Err(_) => NominalCycles::default(), - }; + let consumed_cycles = + try_from_option_field(value.consumed_cycles, "CanisterStateBits::consumed_cycles") + .unwrap_or_default(); let mut controllers = BTreeSet::new(); for controller in value.controllers.into_iter() { diff --git a/rs/tests/consensus/request_auth_malicious_replica_test.rs b/rs/tests/consensus/request_auth_malicious_replica_test.rs index 46afc81ae4a..1b217d59c64 100644 --- a/rs/tests/consensus/request_auth_malicious_replica_test.rs +++ b/rs/tests/consensus/request_auth_malicious_replica_test.rs @@ -266,7 +266,7 @@ async fn test_request_with_no_signature_and_no_pubkey( let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!( + .post(format!( "{}api/v2/canister/{}/call", malicious_node.get_public_url(), canister_id.to_text() @@ -313,7 +313,7 @@ async fn test_request_with_correct_signature_and_incorrect_pubkey( let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!( + .post(format!( "{}api/v2/canister/{}/call", malicious_node.get_public_url(), canister_id.to_text() @@ -450,7 +450,7 @@ async fn test_request_with_expired_ingress( let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!( + .post(format!( "{}api/v2/canister/{}/call", malicious_node.get_public_url(), canister_id.to_text() @@ -522,7 +522,7 @@ async fn test_request_with_delegation( let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!( + .post(format!( "{}api/v2/canister/{}/call", node_url, canister_id.to_text() diff --git a/rs/tests/driver/src/util/delegations.rs b/rs/tests/driver/src/util/delegations.rs index bfd4e01d231..967d2f9e50a 100644 --- a/rs/tests/driver/src/util/delegations.rs +++ b/rs/tests/driver/src/util/delegations.rs @@ -135,7 +135,7 @@ impl<'a> AgentWithDelegation<'a> { ) -> Response { let client = Client::new(); client - .post(&format!( + .post(format!( "{}api/v2/canister/{}/{}", self.node_url.as_str(), canister_id, diff --git a/rs/tests/src/crypto/request_signature_test.rs b/rs/tests/src/crypto/request_signature_test.rs index 52aa8737731..968f58c445f 100644 --- a/rs/tests/src/crypto/request_signature_test.rs +++ b/rs/tests/src/crypto/request_signature_test.rs @@ -255,7 +255,7 @@ async fn test_request_with_empty_signature_fails( let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!("{}api/v2/canister/{}/query", url, canister_id)) + .post(format!("{}api/v2/canister/{}/query", url, canister_id)) .header("Content-Type", "application/cbor") .body(body) .send() @@ -288,7 +288,7 @@ async fn test_request_with_empty_signature_fails( let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!("{}api/v2/canister/{}/call", url, canister_id)) + .post(format!("{}api/v2/canister/{}/call", url, canister_id)) .header("Content-Type", "application/cbor") .body(body) .send() @@ -332,7 +332,7 @@ async fn test_request_signed_by_another_identity_fails< let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!("{}api/v2/canister/{}/query", url, canister_id)) + .post(format!("{}api/v2/canister/{}/query", url, canister_id)) .header("Content-Type", "application/cbor") .body(body) .send() @@ -366,7 +366,7 @@ async fn test_request_signed_by_another_identity_fails< let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!("{}api/v2/canister/{}/call", url, canister_id)) + .post(format!("{}api/v2/canister/{}/call", url, canister_id)) .header("Content-Type", "application/cbor") .body(body) .send() @@ -409,7 +409,7 @@ async fn test_request_with_valid_signature_but_wrong_sender_fails< let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!("{}api/v2/canister/{}/query", url, canister_id)) + .post(format!("{}api/v2/canister/{}/query", url, canister_id)) .header("Content-Type", "application/cbor") .body(body) .send() @@ -442,7 +442,7 @@ async fn test_request_with_valid_signature_but_wrong_sender_fails< let body = serde_cbor::ser::to_vec(&envelope).unwrap(); let client = reqwest::Client::new(); let res = client - .post(&format!("{}api/v2/canister/{}/call", url, canister_id)) + .post(format!("{}api/v2/canister/{}/call", url, canister_id)) .header("Content-Type", "application/cbor") .body(body) .send() diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 973ef0d6d3d..a006ec983bb 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.80.0" +channel = "1.81.0" targets = ["wasm32-unknown-unknown"] profile = "default" components = ["rls"]