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

Merge branch 'master' into ui-2

Browse Source
This commit is contained in:
Jaco Greeff 2017-08-28 10:09:54 +02:00
commit 1b0efa97b2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ethcore/src/ethereum/ethash.rs
View File

@ -187,7 +187,14 @@ impl Engine for Arc<Ethash> {
/// Additional engine-specific information for the user/developer concerning `header`. /// Additional engine-specific information for the user/developer concerning `header`.
fn extra_info(&self, header: &Header) -> BTreeMap<String, String> { fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
map!["nonce".to_owned() => format!("0x{}", header.nonce().hex()), "mixHash".to_owned() => format!("0x{}", header.mix_hash().hex())] if header.seal().len() == self.seal_fields() {
map![
"nonce".to_owned() => format!("0x{}", header.nonce().hex()),
"mixHash".to_owned() => format!("0x{}", header.mix_hash().hex())
]
} else {
BTreeMap::default()
}
} }
fn schedule(&self, block_number: BlockNumber) -> Schedule { fn schedule(&self, block_number: BlockNumber) -> Schedule {

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

@ -37,9 +37,9 @@ struct BitVecJournal {
impl BitVecJournal { impl BitVecJournal {
pub fn new(size: usize) -> BitVecJournal { pub fn new(size: usize) -> BitVecJournal {
let extra = if size % 8 > 0 { 1 } else { 0 }; let extra = if size % 64 > 0 { 1 } else { 0 };
BitVecJournal { BitVecJournal {
elems: vec![0u64; size / 8 + extra], elems: vec![0u64; size / 64 + extra],
journal: HashSet::new(), journal: HashSet::new(),
} }
} }