Skip to content

Commit

Permalink
ci fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dignifiedquire committed Oct 5, 2020
1 parent 468c149 commit 7b24a65
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 31 deletions.
30 changes: 0 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,32 +128,6 @@ jobs:
RUST_TEST_THREADS: 1
no_output_timeout: 30m

# Running with `use_fil_blst=true` should be integrated directly into the test code. For now we
# just re-run the tests that exercise the fil-blst code path with that setting set.
test_fil_blst:
docker:
- image: filecoin/rust:latest
working_directory: /mnt/crate
resource_class: 2xlarge+
steps:
- configure_environment_variables
- checkout
- attach_workspace:
at: "."
- restore_cache:
keys:
- cargo-v28-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
- restore_parameter_cache
- run:
name: Test with fil-blst enabled
command: |
ulimit -n 20000
ulimit -u 20000
ulimit -n 20000
cargo +$(cat rust-toolchain) test --verbose --release --test api -- --ignored
environment:
RUST_TEST_THREADS: 1
FIL_PROOFS_USE_FIL_BLST: true

# Running with `use_multicore_sdr=true` should be integrated directly into the test code. For now we
# just re-run the lifecycle tests to exercise the use_multicore_sdr code path with that setting set.
Expand Down Expand Up @@ -450,10 +424,6 @@ workflows:
requires:
- cargo_fetch
- ensure_groth_parameters_and_keys_linux
- test_fil_blst:
requires:
- cargo_fetch
- ensure_groth_parameters_and_keys_linux

- test_multicore_sdr:
requires:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,9 @@ pub fn create_labels_for_decoding<Tree: 'static + MerkleTreeTrait, T: AsRef<[u8]
mod tests {
use super::*;

use bellperson::bls::{Fr, FrRepr};
use ff::PrimeField;
use generic_array::typenum::{U0, U2, U8};
use paired::bls12_381::{Fr, FrRepr};
use storage_proofs_core::hasher::poseidon::PoseidonHasher;

#[test]
Expand Down

0 comments on commit 7b24a65

Please sign in to comment.