Skip to content

Commit

Permalink
Merge pull request #68 from garious/fix-bench
Browse files Browse the repository at this point in the history
Fix bench
  • Loading branch information
garious authored Mar 19, 2018
2 parents 47325cb + caa9a84 commit 3418033
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ matrix:
- rust: stable
- rust: nightly
env:
- FEATURES='asm,unstable'
- FEATURES='unstable'
before_script: |
export PATH="$PATH:$HOME/.cargo/bin"
rustup component add rustfmt-preview
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,10 @@ codecov = { repository = "loomprotocol/silk", branch = "master", service = "gith
[features]
unstable = []
ipv6 = []
asm = ["sha2-asm"]

[dependencies]
rayon = "1.0.0"
sha2 = "0.7.0"
sha2-asm = {version="0.3", optional=true}
generic-array = { version = "0.9.0", default-features = false, features = ["serde"] }
serde = "1.0.27"
serde_derive = "1.0.27"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,5 @@ $ rustup install nightly
Run the benchmarks:

```bash
$ cargo +nightly bench --features="asm,unstable"
$ cargo +nightly bench --features="unstable"
```
9 changes: 0 additions & 9 deletions src/ledger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,4 @@ mod bench {
assert!(verify_slice(&events, &start_hash));
});
}

#[bench]
fn event_bench_seq(bencher: &mut Bencher) {
let start_hash = Default::default();
let events = next_ticks(&start_hash, 10_000, 8);
bencher.iter(|| {
assert!(verify_slice_seq(&events, &start_hash));
});
}
}

0 comments on commit 3418033

Please sign in to comment.