diff --git a/crates/concensus/ethash/src/keccak.rs b/crates/concensus/ethash/src/keccak.rs index 187e16b858..d3dbf1be92 100644 --- a/crates/concensus/ethash/src/keccak.rs +++ b/crates/concensus/ethash/src/keccak.rs @@ -29,7 +29,5 @@ pub mod keccak_512 { pub mod keccak_256 { use super::hash; - pub use self::hash::{ - keccak256 as inplace, keccak_256 as write, - }; + pub use self::hash::{keccak256 as inplace, keccak_256 as write}; } diff --git a/crates/ethcore/blockchain/src/blockchain.rs b/crates/ethcore/blockchain/src/blockchain.rs index 548cb64787..b014f92842 100644 --- a/crates/ethcore/blockchain/src/blockchain.rs +++ b/crates/ethcore/blockchain/src/blockchain.rs @@ -1459,9 +1459,20 @@ impl BlockChain { } if let Some((block, blooms)) = update.blocks_blooms { + // we fake the blooms and write ff for all bloom fields. + + let mut fake_blooms = Vec::new(); + + for _ in blooms.iter() { + let fake_bloom = Bloom::repeat_byte(255); + fake_blooms.push(fake_bloom); + } + + warn!(target: "engine", "Block {} writing fake blooms {}?", block, fake_blooms.len()); + self.db .blooms() - .insert_blooms(block, blooms.iter()) + .insert_blooms(block, fake_blooms.iter()) .expect("Low level database error when updating blooms. Some issue with disk?"); } diff --git a/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs b/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs index 26e7a5e2c3..80167b4c08 100644 --- a/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs +++ b/crates/ethcore/src/engines/hbbft/contracts/keygen_history.rs @@ -1,8 +1,5 @@ use client::traits::EngineClient; -use crypto::{ - self, - publickey::{Public}, -}; +use crypto::{self, publickey::Public}; use engines::{ hbbft::{ contracts::validator_set::{get_validator_pubkeys, ValidatorType}, diff --git a/crates/rpc/src/v1/types/mod.rs b/crates/rpc/src/v1/types/mod.rs index 255065a5ae..de7478bba3 100644 --- a/crates/rpc/src/v1/types/mod.rs +++ b/crates/rpc/src/v1/types/mod.rs @@ -40,14 +40,11 @@ pub use self::{ receipt::Receipt, rpc_settings::RpcSettings, secretstore::EncryptedDocumentKey, - sync::{ - ChainStatus, Peers, - SyncInfo, SyncStatus, TransactionStats, - }, + sync::{ChainStatus, Peers, SyncInfo, SyncStatus, TransactionStats}, trace::{LocalizedTrace, TraceResults, TraceResultsWithTransactionHash}, trace_filter::TraceFilter, transaction::{LocalTransactionStatus, RichRawTransaction, Transaction}, - transaction_access_list::{AccessList}, + transaction_access_list::AccessList, transaction_condition::TransactionCondition, transaction_request::TransactionRequest, work::Work,