From 295d11323d5a7841ff69bc0e3ce955fbe477d0d1 Mon Sep 17 00:00:00 2001 From: ibaryshnikov Date: Mon, 4 Jan 2021 21:32:50 +0300 Subject: [PATCH 1/4] removed panic hook rewrite --- phase1-coordinator/src/coordinator.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/phase1-coordinator/src/coordinator.rs b/phase1-coordinator/src/coordinator.rs index 8cbe7054..7aa2bf6e 100644 --- a/phase1-coordinator/src/coordinator.rs +++ b/phase1-coordinator/src/coordinator.rs @@ -2935,14 +2935,6 @@ mod tests { fn coordinator_concurrent_contribution_verification_test() -> anyhow::Result<()> { initialize_test_environment(&TEST_ENVIRONMENT_3); - // take_hook() returns the default hook in case when a custom one is not set - let orig_hook = panic::take_hook(); - panic::set_hook(Box::new(move |panic_info| { - // invoke the default handler and exit the process - orig_hook(panic_info); - process::exit(1); - })); - let coordinator = Coordinator::new(TEST_ENVIRONMENT_3.clone(), Box::new(Dummy))?; let storage = coordinator.storage(); initialize_coordinator_single_contributor(&coordinator)?; From fa1625bd0af3631a2be0a245cfd37838fb0f15f2 Mon Sep 17 00:00:00 2001 From: ibaryshnikov Date: Mon, 4 Jan 2021 21:50:45 +0300 Subject: [PATCH 2/4] pinned rustc to 1.48.0 in CI to avoid regression from rust 1.49.0 --- .github/workflows/cli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 4bc362d7..56005981 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: rust: - - stable + - 1.48.0 # - nightly steps: - name: Checkout From 3fa17cf90c64979466686c8f68609cf85643fbb8 Mon Sep 17 00:00:00 2001 From: ibaryshnikov Date: Mon, 4 Jan 2021 22:02:06 +0300 Subject: [PATCH 3/4] pinned rustc to 1.48.0 in both core.yml and wasm.yml --- .github/workflows/core.yml | 4 ++-- .github/workflows/wasm.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 0c9086da..ac2e23cd 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: rust: - - stable + - 1.48.0 # - nightly steps: - name: Checkout @@ -65,7 +65,7 @@ jobs: with: command: check args: --examples --all-features --all - if: matrix.rust == 'stable' + if: matrix.rust == '1.48.0' # pinned, should be removed later - name: Test uses: actions-rs/cargo@v1 diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 85547841..41a068ea 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: rust: - - stable + - 1.48.0 steps: - name: Checkout uses: actions/checkout@v2 From 3eb3956ba862d030850194b0d97a84e1619d2ef3 Mon Sep 17 00:00:00 2001 From: ibaryshnikov Date: Mon, 4 Jan 2021 22:10:56 +0300 Subject: [PATCH 4/4] specify --toolchain 1.48.0 when installing webassembly --- .github/workflows/wasm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index 41a068ea..b8d8a4eb 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -28,9 +28,10 @@ jobs: toolchain: ${{ matrix.rust }} override: true + # pinned --toolchain 1.48.0 should be changed later to stable - name: Install WASM run: | - rustup target add wasm32-unknown-unknown --toolchain stable + rustup target add wasm32-unknown-unknown --toolchain 1.48.0 cargo install wasm-bindgen-cli cargo update -p wasm-bindgen