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

fix compilation warnings (#11522)

Browse Source
This commit is contained in:
Andronik Ordian
2020-02-26 12:58:09 +01:00
committed by GitHub
parent cd7018007e
commit ec8dbb36e6
9 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
util/bloom/src/lib.rs
View File

@@ -84,9 +84,9 @@ impl Bloom {
let k_num = Bloom::optimal_k_num(bitmap_bits, items_count);
let bitmap = BitVecJournal::new(bitmap_bits as usize);
Bloom {
bitmap: bitmap,
bitmap_bits: bitmap_bits,
k_num: k_num,
bitmap,
bitmap_bits,
k_num,
}
}
@@ -96,9 +96,9 @@ impl Bloom {
let bitmap_bits = (bitmap_size as u64) * 8u64;
let bitmap = BitVecJournal::from_parts(parts);
Bloom {
bitmap: bitmap,
bitmap_bits: bitmap_bits,
k_num: k_num,
bitmap,
bitmap_bits,
k_num,
}
}
@@ -169,15 +169,14 @@ impl Bloom {
{
let mut sip = SipHasher::new();
item.hash(&mut sip);
let hash = sip.finish();
hash
sip.finish()
}
fn bloom_hash(base_hash: u64, k_i: u32) -> u64 {
if k_i < 2 {
base_hash
} else {
base_hash.wrapping_add((k_i as u64).wrapping_mul(base_hash) % 0xffffffffffffffc5)
base_hash.wrapping_add((k_i as u64).wrapping_mul(base_hash) % 0xffff_ffff_ffff_ffc5)
}
}