removing differences

Author: vporton

Cargo.lock

@@ -23,7 +23,6 @@ use ethereum_types::{H256, H264, U256};
 use heapsize::HeapSizeOf;
 use kvdb::PREFIX_LEN as DB_PREFIX_LEN;
 use rlp;
-
 use rlp_derive::{RlpDecodable, RlpDecodableWrapper, RlpEncodable, RlpEncodableWrapper};
 
 use crate::db::Key;

ethcore/db/src/keys.rs

@@ -31,7 +31,6 @@ extern crate vm;
 
 use criterion::{black_box, Bencher, Criterion};
 use ethereum_types::{Address, U256};
-
 use evm::Factory;
 use rustc_hex::FromHex;
 use std::{str::FromStr, sync::Arc};

ethcore/evm/benches/basic.rs

@@ -15,7 +15,6 @@
 // along with OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use ethereum_types::U256;
-
 use vm::ReturnData;
 
 const MAX_RETURN_WASTE_BYTES: usize = 16384;

ethcore/evm/src/interpreter/memory.rs

@@ -28,6 +28,7 @@ use bytes::Bytes;
 use ethereum_types::{Address, H256, U256};
 use hash::keccak;
 use num_bigint::BigUint;
+use std::{cmp, marker::PhantomData, mem, sync::Arc};
 
 use evm::CostType;
 use instructions::{self, Instruction, InstructionInfo};
@@ -36,6 +37,9 @@ use vm::{
     GasLeft, MessageCallResult, ParamsType, ReturnData, Schedule, TrapError, TrapKind,
 };
 
+use evm::CostType;
+use instructions::{self, Instruction, InstructionInfo};
+
 pub use self::shared_cache::SharedCache;
 use self::{
     gasometer::Gasometer,

ethcore/evm/src/interpreter/mod.rs

@@ -14,16 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::sync::Arc;
-
+use super::super::instructions::{self, Instruction};
 use bit_set::BitSet;
 use ethereum_types::H256;
 use hash::KECCAK_EMPTY;
 use heapsize::HeapSizeOf;
 use memory_cache::MemoryLruCache;
 use parking_lot::Mutex;
-
-use super::super::instructions::{self, Instruction};
+use std::sync::Arc;
 
 const DEFAULT_CACHE_SIZE: usize = 4 * 1024 * 1024;
 

ethcore/evm/src/interpreter/shared_cache.rs

@@ -14,8 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
 
-
+use super::interpreter::MAX_SUB_STACK_SIZE;
 use ethereum_types::{Address, H256, U256};
+use factory::Factory;
 use hex_literal::hex;
 use rustc_hex::FromHex;
 

ethcore/evm/src/tests.rs

@@ -157,7 +157,7 @@ impl VoteType {
 
 /// Clique Engine implementation
 // block_state_by_hash -> block state indexed by header hash.
-// #[cfg(not(test))]
+#[cfg(not(test))]
 pub struct Clique {
     epoch_length: u64,
     period: u64,
@@ -168,17 +168,17 @@ pub struct Clique {
     signer: RwLock<Option<Box<dyn EngineSigner>>>,
 }
 
-// #[cfg(test)]
-// /// Test version of `CliqueEngine` to make all fields public
-// pub struct Clique {
-//     pub epoch_length: u64,
-//     pub period: u64,
-//     pub machine: EthereumMachine,
-//     pub client: RwLock<Option<Weak<dyn EngineClient>>>,
-//     pub block_state_by_hash: RwLock<LruCache<H256, CliqueBlockState>>,
-//     pub proposals: RwLock<HashMap<Address, VoteType>>,
-//     pub signer: RwLock<Option<Box<dyn EngineSigner>>>,
-// }
+#[cfg(test)]
+/// Test version of `CliqueEngine` to make all fields public
+pub struct Clique {
+    pub epoch_length: u64,
+    pub period: u64,
+    pub machine: EthereumMachine,
+    pub client: RwLock<Option<Weak<dyn EngineClient>>>,
+    pub block_state_by_hash: RwLock<LruCache<H256, CliqueBlockState>>,
+    pub proposals: RwLock<HashMap<Address, VoteType>>,
+    pub signer: RwLock<Option<Box<dyn EngineSigner>>>,
+}
 
 impl Clique {
     /// Initialize Clique engine from empty state.

ethcore/src/engines/clique/mod.rs

@@ -15,7 +15,7 @@
 // along with OpenEthereum.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Consensus engine specification and basic implementations.
-#![allow(missing_docs)]
+
 mod authority_round;
 mod basic_authority;
 mod clique;
@@ -185,7 +185,6 @@ impl fmt::Display for EngineError {
             ParliaFutureBlock => format!("Receiving future block"),
 
             CliqueCheckpointNoSigner => format!("Checkpoint block list of signers was empty"),
-
             CliqueInvalidNonce(ref mis) => format!(
                 "Unexpected nonce {} expected {} or {}",
                 mis,

ethcore/src/engines/mod.rs

@@ -60,6 +60,8 @@ use client::{
 };
 use engines::{EngineSigner, EthEngine, Seal};
 use error::{Error, ErrorKind};
+use executed::ExecutionError;
+use executive::contract_address;
 use spec::Spec;
 use state::State;
 
@@ -1496,11 +1498,12 @@ mod tests {
     use ethkey::{Generator, Random};
     use hash::keccak;
     use rustc_hex::FromHex;
+    use types::BlockNumber;
 
     use client::{ChainInfo, EachBlockWith, ImportSealedBlock, TestBlockChainClient};
     use miner::{MinerService, PendingOrdering};
     use test_helpers::{generate_dummy_client, generate_dummy_client_with_spec};
-    use types::{transaction::Transaction, BlockNumber};
+    use types::transaction::Transaction;
 
     #[test]
     fn should_prepare_block_to_seal() {

ethcore/src/miner/miner.rs

@@ -26,7 +26,7 @@ pub mod pool_client;
 pub mod stratum;
 
 pub use self::miner::{Author, AuthoringParams, Miner, MinerOptions, Penalization, PendingSet};
-
+pub use ethcore_miner::{local_accounts::LocalAccounts, pool::PendingOrdering};
 
 use std::{
     collections::{BTreeMap, BTreeSet},

ethcore/src/miner/mod.rs

@@ -50,6 +50,8 @@ use spec::{seal::Generic as GenericSeal, Genesis};
 use state::{backend::Basic as BasicBackend, Backend, State, Substate};
 use trace::{NoopTracer, NoopVMTracer};
 
+pub use ethash::OptimizeFor;
+
 const MAX_TRANSACTION_SIZE: usize = 300 * 1024;
 
 // helper for formatting errors.

ethcore/src/spec/spec.rs

@@ -28,14 +28,15 @@ use lru_cache::LruCache;
 use pod_account::*;
 use rlp::{encode, RlpStream};
 use std::{
-    cell::{Cell, RefCell},
-	collections::{BTreeMap, HashMap},
+    collections::{BTreeMap, HashMap},
     fmt,
     sync::Arc,
 };
 use trie::{Recorder, Trie};
 use types::basic_account::BasicAccount;
 
+use std::cell::{Cell, RefCell};
+
 const STORAGE_CACHE_ITEMS: usize = 8192;
 
 /// Boolean type for clean/dirty status.

ethcore/src/state/account.rs

@@ -59,6 +59,8 @@ mod substate;
 
 pub mod backend;
 
+pub use self::{account::Account, backend::Backend, substate::Substate};
+
 /// Used to return information about an `State::apply` operation.
 pub struct ApplyOutcome<T, V> {
     /// The receipt for the applied transaction.