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

[ethcore cleanup]: various unrelated fixes from #11493 (#11507)

Browse Source 
* [cleanup]: various unrelated fixes from `#11493`

* [revert]: too verbose logging `seal`

* fix nit: don't mix from() and into()
This commit is contained in:
Niklas Adolfsson
2020-02-25 15:32:13 +01:00
committed by GitHub
parent ad56eb48b5
commit cd7018007e
12 changed files with 153 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ethcore/verification/src/verification.rs
View File

@@ -163,8 +163,8 @@ fn verify_uncles(block: &PreverifiedBlock, bc: &dyn BlockProvider, engine: &dyn
let mut excluded = HashSet::new();
excluded.insert(header.hash());
let mut hash = header.parent_hash().clone();
excluded.insert(hash.clone());
let mut hash = *header.parent_hash();
excluded.insert(hash);
for _ in 0..MAX_UNCLE_AGE {
match bc.block_details(&hash) {
Some(details) => {
@@ -213,7 +213,7 @@ fn verify_uncles(block: &PreverifiedBlock, bc: &dyn BlockProvider, engine: &dyn
// cB.p^6 -----------/ 6
// cB.p^7 -------------/
// cB.p^8
let mut expected_uncle_parent = header.parent_hash().clone();
let mut expected_uncle_parent = *header.parent_hash();
let uncle_parent = bc.block_header_data(&uncle.parent_hash())
.ok_or_else(|| BlockError::UnknownUncleParent(*uncle.parent_hash()))?;
for _ in 0..depth {
@@ -440,7 +440,6 @@ mod tests {
use keccak_hash::keccak;
use engine::Engine;
use parity_crypto::publickey::{Random, Generator};
use spec;
use ethcore::test_helpers::{
create_test_block_with_data, create_test_block, TestBlockChainClient
};
@@ -449,7 +448,6 @@ mod tests {
errors::BlockError::*,
transaction::{SignedTransaction, Transaction, UnverifiedTransaction, Action},
};
use rlp;
use triehash::ordered_trie_root;
use machine::Machine;
use null_engine::NullEngine;