From 7dcbcb5c313916f4b293534d27a73640bca9a606 Mon Sep 17 00:00:00 2001 From: debris Date: Thu, 6 Jul 2017 10:18:48 +0200 Subject: [PATCH] fixed missing FromHex import in ethcore tests --- ethcore/src/engines/tendermint/mod.rs | 1 + ethcore/src/engines/validator_set/contract.rs | 1 + ethcore/src/engines/validator_set/safe_contract.rs | 1 + ethcore/src/evm/interpreter/shared_cache.rs | 2 +- ethcore/src/evm/tests.rs | 3 ++- ethcore/src/executive.rs | 3 ++- ethcore/src/miner/banning_queue.rs | 3 ++- ethcore/src/miner/miner.rs | 3 ++- ethcore/src/miner/transaction_queue.rs | 1 + ethcore/src/state/mod.rs | 1 + ethcore/src/views/body.rs | 2 +- 11 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs index 70d4e0ced..e7d0dab86 100644 --- a/ethcore/src/engines/tendermint/mod.rs +++ b/ethcore/src/engines/tendermint/mod.rs @@ -651,6 +651,7 @@ impl Engine for Tendermint { #[cfg(test)] mod tests { + use rustc_hex::FromHex; use util::*; use block::*; use error::{Error, BlockError}; diff --git a/ethcore/src/engines/validator_set/contract.rs b/ethcore/src/engines/validator_set/contract.rs index c2d3fd064..46f5c8512 100644 --- a/ethcore/src/engines/validator_set/contract.rs +++ b/ethcore/src/engines/validator_set/contract.rs @@ -126,6 +126,7 @@ impl ValidatorSet for ValidatorContract { #[cfg(test)] mod tests { + use rustc_hex::FromHex; use util::*; use rlp::encode; use spec::Spec; diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs index de8d16ddc..e999439ee 100644 --- a/ethcore/src/engines/validator_set/safe_contract.rs +++ b/ethcore/src/engines/validator_set/safe_contract.rs @@ -420,6 +420,7 @@ impl ValidatorSet for ValidatorSafeContract { #[cfg(test)] mod tests { + use rustc_hex::FromHex; use util::*; use types::ids::BlockId; use spec::Spec; diff --git a/ethcore/src/evm/interpreter/shared_cache.rs b/ethcore/src/evm/interpreter/shared_cache.rs index ed3b59340..a93afa79a 100644 --- a/ethcore/src/evm/interpreter/shared_cache.rs +++ b/ethcore/src/evm/interpreter/shared_cache.rs @@ -92,7 +92,7 @@ impl Default for SharedCache { #[test] fn test_find_jump_destinations() { - use util::FromHex; + use rustc_hex::FromHex; // given let code = "7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b01600055".from_hex().unwrap(); diff --git a/ethcore/src/evm/tests.rs b/ethcore/src/evm/tests.rs index 7f3cf0e1c..f7d82daa4 100644 --- a/ethcore/src/evm/tests.rs +++ b/ethcore/src/evm/tests.rs @@ -14,12 +14,13 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . +use std::fmt::Debug; +use rustc_hex::FromHex; use util::*; use action_params::{ActionParams, ActionValue}; use env_info::EnvInfo; use types::executed::CallType; use evm::{self, Ext, Schedule, Factory, GasLeft, VMType, ContractCreateResult, MessageCallResult, CreateContractAddress, ReturnData}; -use std::fmt::Debug; use tests::helpers::*; use types::transaction::SYSTEM_ADDRESS; use executive::Executive; diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs index b486aa8d4..4038fe30d 100644 --- a/ethcore/src/executive.rs +++ b/ethcore/src/executive.rs @@ -578,9 +578,10 @@ impl<'a, B: 'a + StateBackend, E: Engine + ?Sized> Executive<'a, B, E> { #[allow(dead_code)] mod tests { use std::sync::Arc; + use rustc_hex::FromHex; use ethkey::{Generator, Random}; use super::*; - use util::{H256, U256, U512, Address, FromHex, FromStr}; + use util::{H256, U256, U512, Address, FromStr}; use util::bytes::BytesRef; use action_params::{ActionParams, ActionValue}; use env_info::EnvInfo; diff --git a/ethcore/src/miner/banning_queue.rs b/ethcore/src/miner/banning_queue.rs index 20b46d760..46d7e7cf8 100644 --- a/ethcore/src/miner/banning_queue.rs +++ b/ethcore/src/miner/banning_queue.rs @@ -209,13 +209,14 @@ impl DerefMut for BanningTransactionQueue { #[cfg(test)] mod tests { use std::time::Duration; + use rustc_hex::FromHex; use super::{BanningTransactionQueue, Threshold}; use ethkey::{Random, Generator}; use transaction::{Transaction, SignedTransaction, Action}; use error::{Error, TransactionError}; use client::TransactionImportResult; use miner::{TransactionQueue, TransactionOrigin}; - use util::{U256, Address, FromHex, Hashable}; + use util::{U256, Address, Hashable}; use miner::transaction_queue::test::DummyTransactionDetailsProvider; fn queue() -> BanningTransactionQueue { diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs index c772490ba..208c778bc 100644 --- a/ethcore/src/miner/miner.rs +++ b/ethcore/src/miner/miner.rs @@ -1261,10 +1261,11 @@ mod tests { use std::sync::Arc; use std::time::Duration; + use rustc_hex::FromHex; use super::super::{MinerService, PrioritizationStrategy}; use super::*; use block::IsBlock; - use util::{U256, FromHex}; + use util::U256; use ethkey::{Generator, Random}; use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult}; use header::BlockNumber; diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs index 4e559df2e..8da9f7150 100644 --- a/ethcore/src/miner/transaction_queue.rs +++ b/ethcore/src/miner/transaction_queue.rs @@ -1422,6 +1422,7 @@ fn check_if_removed(sender: &Address, nonce: &U256, dropped: Option BodyView<'a> { #[cfg(test)] mod tests { - use util::*; + use rustc_hex::FromHex; use super::BodyView; use blockchain::BlockChain;