Skip to content

Commit

Permalink
Merge pull request #147 from AleoHQ/fix-for-test-results
Browse files Browse the repository at this point in the history
Removed panic hook rewrite
  • Loading branch information
ibaryshnikov authored Jan 4, 2021
2 parents a14447a + 3eb3956 commit 79cb525
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
rust:
- stable
- 1.48.0
# - nightly
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
strategy:
matrix:
rust:
- stable
- 1.48.0
# - nightly
steps:
- name: Checkout
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
matrix:
rust:
- stable
- 1.48.0
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -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
Expand Down
8 changes: 0 additions & 8 deletions phase1-coordinator/src/coordinator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)?;
Expand Down

0 comments on commit 79cb525

Please sign in to comment.