gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block_hash => blockhash

Browse Source
This commit is contained in:
Michael Vines
2019-03-02 10:25:16 -08:00
committed by Greg Fitzgerald
parent 0f1582c196
commit a94880574b
55 changed files with 591 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/benches/bank.rs
View File

@@ -25,7 +25,7 @@ fn bench_process_transaction(bencher: &mut Bencher) {
&mint_keypair,
rando0.pubkey(),
10_000,
bank.last_block_hash(),
bank.last_blockhash(),
0,
);
assert_eq!(bank.process_transaction(&tx), Ok(()));
@@ -33,7 +33,7 @@ fn bench_process_transaction(bencher: &mut Bencher) {
// Seed the 'to' account and a cell for its signature.
let rando1 = Keypair::new();
let tx =
SystemTransaction::new_move(&rando0, rando1.pubkey(), 1, bank.last_block_hash(), 0);
SystemTransaction::new_move(&rando0, rando1.pubkey(), 1, bank.last_blockhash(), 0);
assert_eq!(bank.process_transaction(&tx), Ok(()));
// Finally, return the transaction to the benchmark.
@@ -41,7 +41,7 @@ fn bench_process_transaction(bencher: &mut Bencher) {
})
.collect();
let mut id = bank.last_block_hash();
let mut id = bank.last_blockhash();
for _ in 0..(MAX_RECENT_TICK_HASHES - 1) {
bank.register_tick(&id);

14
runtime/benches/bloom.rs
View File

@@ -44,15 +44,15 @@ fn bench_sigs_bloom(bencher: &mut Bencher) {
// 1M TPS * 1s (length of block in sigs) == 1M items in filter
// 1.0E-8 false positive rate
// https://hur.st/bloomfilter/?n=1000000&p=1.0E-8&m=&k=
let block_hash = hash(Hash::default().as_ref());
// eprintln!("block_hash = {:?}", block_hash);
let blockhash = hash(Hash::default().as_ref());
// eprintln!("blockhash = {:?}", blockhash);
let keys = (0..27)
.into_iter()
.map(|i| block_hash.hash_at_index(i))
.map(|i| blockhash.hash_at_index(i))
.collect();
let mut sigs: Bloom<Signature> = Bloom::new(38_340_234, keys);
let mut id = block_hash;
let mut id = blockhash;
let mut falses = 0;
let mut iterations = 0;
bencher.iter(|| {
@@ -76,11 +76,11 @@ fn bench_sigs_bloom(bencher: &mut Bencher) {
#[ignore]
fn bench_sigs_hashmap(bencher: &mut Bencher) {
// same structure as above, new
let block_hash = hash(Hash::default().as_ref());
// eprintln!("block_hash = {:?}", block_hash);
let blockhash = hash(Hash::default().as_ref());
// eprintln!("blockhash = {:?}", blockhash);
let mut sigs: HashSet<Signature> = HashSet::new();
let mut id = block_hash;
let mut id = blockhash;
let mut falses = 0;
let mut iterations = 0;
bencher.iter(|| {