From a7511b6b021be65ac4555005c719d218f6ba1187 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Wed, 13 Jul 2016 20:45:15 +0200 Subject: [PATCH] fix benchmark compilation (#1612) --- util/benches/trie.rs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/util/benches/trie.rs b/util/benches/trie.rs index 8c573e170..7f0677943 100644 --- a/util/benches/trie.rs +++ b/util/benches/trie.rs @@ -25,7 +25,6 @@ use test::Bencher; use ethcore_util::hash::*; use ethcore_util::bytes::*; use ethcore_util::trie::*; -use ethcore_util::hashdb::*; use ethcore_util::memorydb::*; use ethcore_util::triehash::*; use ethcore_util::sha3::*; @@ -34,10 +33,10 @@ use ethcore_util::sha3::*; fn random_word(alphabet: &[u8], min_count: usize, diff_count: usize, seed: &mut H256) -> Vec { assert!(min_count + diff_count <= 32); *seed = seed.sha3(); - let r = min_count + (seed.bytes()[31] as usize % (diff_count + 1)); + let r = min_count + (seed[31] as usize % (diff_count + 1)); let mut ret: Vec = Vec::with_capacity(r); for i in 0..r { - ret.push(alphabet[seed.bytes()[i] as usize % alphabet.len()]); + ret.push(alphabet[seed[i] as usize % alphabet.len()]); } ret } @@ -45,15 +44,15 @@ fn random_word(alphabet: &[u8], min_count: usize, diff_count: usize, seed: &mut fn random_bytes(min_count: usize, diff_count: usize, seed: &mut H256) -> Vec { assert!(min_count + diff_count <= 32); *seed = seed.sha3(); - let r = min_count + (seed.bytes()[31] as usize % (diff_count + 1)); - seed.bytes()[0..r].to_vec() + let r = min_count + (seed[31] as usize % (diff_count + 1)); + seed[0..r].to_vec() } fn random_value(seed: &mut H256) -> Bytes { *seed = seed.sha3(); - match seed.bytes()[0] % 2 { - 1 => vec![seed.bytes()[31];1], - _ => seed.bytes().to_vec(), + match seed[0] % 2 { + 1 => vec![seed[31];1], + _ => seed.to_vec(), } }