grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evm bench fix broken dependencies (#9134)

Browse Source 
* `evm bench` use valid dependencies

Benchmarks of the `evm` used stale versions of a couple a crates that
this commit fixes!

* fix warnings
This commit is contained in:
Niklas Adolfsson 2018-07-16 21:19:59 +02:00 committed by 5chdn
parent 24708e7ee0
commit 0bcf40d79f
No known key found for this signature in database
GPG Key ID: 1A40871B597F5F80
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ethcore/benches/evm.rs
View File

@ -1,4 +1,4 @@
// Copyright 2015-2017 Parity Technologies (UK) Ltd. // Copyright 2015-2018 Parity Technologies (UK) Ltd.
// This file is part of Parity. // This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify // Parity is free software: you can redistribute it and/or modify
@ -16,18 +16,16 @@
#![feature(test)] #![feature(test)]
extern crate test;
extern crate ethcore_util as util;
extern crate rand;
extern crate bn; extern crate bn;
extern crate crypto; extern crate ethereum_types;
extern crate ethkey; extern crate ethkey;
extern crate parity_crypto;
extern crate rand;
extern crate rustc_hex; extern crate rustc_hex;
extern crate ethcore_bigint; extern crate test;
use self::test::{Bencher};
use rand::{StdRng};
use self::test::Bencher;
use rand::StdRng;
#[bench] #[bench]
fn bn_128_pairing(b: &mut Bencher) { fn bn_128_pairing(b: &mut Bencher) {
@ -61,16 +59,12 @@ fn bn_128_mul(b: &mut Bencher) {
#[bench] #[bench]
fn sha256(b: &mut Bencher) { fn sha256(b: &mut Bencher) {
use crypto::sha2::Sha256; use parity_crypto::digest::sha256;
use crypto::digest::Digest;
let mut input: [u8; 256] = [0; 256]; let input = [0_u8; 256];
let mut out = [0; 32];
b.iter(|| { b.iter(|| {
let mut sha = Sha256::new(); sha256(&input);
sha.input(&input);
sha.result(&mut input[0..32]);
}); });
} }
@ -78,7 +72,7 @@ fn sha256(b: &mut Bencher) {
fn ecrecover(b: &mut Bencher) { fn ecrecover(b: &mut Bencher) {
use rustc_hex::FromHex; use rustc_hex::FromHex;
use ethkey::{Signature, recover as ec_recover}; use ethkey::{Signature, recover as ec_recover};
use ethcore_bigint::hash::H256; use ethereum_types::H256;
let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap(); let input = FromHex::from_hex("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").unwrap();
let hash = H256::from_slice(&input[0..32]); let hash = H256::from_slice(&input[0..32]);
let v = H256::from_slice(&input[32..64]); let v = H256::from_slice(&input[32..64]);
@ -95,4 +89,3 @@ fn ecrecover(b: &mut Bencher) {
let _ = ec_recover(&s, &hash); let _ = ec_recover(&s, &hash);
}); });
} }