Fixed errors after merge with master
This commit is contained in:
parent
f2d12aebef
commit
45043c3f52
@ -25,8 +25,7 @@ use block::*;
|
||||
use builtin::Builtin;
|
||||
use client::{Client, EngineClient};
|
||||
use engines::{Call, Engine, Seal, EngineError, ConstructedVerifier, CloseOutcome};
|
||||
use trace::{Tracer, ExecutiveTracer};
|
||||
use types::trace_types::trace::{RewardType};
|
||||
use trace::{Tracer, ExecutiveTracer, RewardType};
|
||||
use error::{Error, TransactionError, BlockError};
|
||||
use ethjson;
|
||||
use header::{Header, BlockNumber};
|
||||
|
@ -25,8 +25,7 @@ use evm::Schedule;
|
||||
use header::BlockNumber;
|
||||
use error::Error;
|
||||
use state::CleanupMode;
|
||||
use trace::{Tracer, ExecutiveTracer};
|
||||
use types::trace_types::trace::{RewardType};
|
||||
use trace::{Tracer, ExecutiveTracer, RewardType};
|
||||
|
||||
/// An engine which does not provide any consensus mechanism and does not seal blocks.
|
||||
pub struct NullEngine {
|
||||
|
@ -38,8 +38,7 @@ use account_provider::AccountProvider;
|
||||
use block::*;
|
||||
use spec::CommonParams;
|
||||
use engines::{Engine, Seal, EngineError, CloseOutcome, ConstructedVerifier};
|
||||
use trace::{Tracer, ExecutiveTracer};
|
||||
use types::trace_types::trace::{RewardType};
|
||||
use trace::{Tracer, ExecutiveTracer, RewardType};
|
||||
use state::CleanupMode;
|
||||
use io::IoService;
|
||||
use super::signer::EngineSigner;
|
||||
|
@ -21,8 +21,7 @@ use block::*;
|
||||
use builtin::Builtin;
|
||||
use evm::env_info::EnvInfo;
|
||||
use error::{BlockError, Error, TransactionError};
|
||||
use trace::{Tracer, ExecutiveTracer};
|
||||
use types::trace_types::trace::{RewardType};
|
||||
use trace::{Tracer, ExecutiveTracer,RewardType};
|
||||
use header::{Header, BlockNumber};
|
||||
use state::CleanupMode;
|
||||
use spec::CommonParams;
|
||||
|
@ -31,9 +31,8 @@ use header::Header;
|
||||
use miner::Miner;
|
||||
use transaction::{Action, Transaction};
|
||||
use views::BlockView;
|
||||
use types::trace_types::trace::RewardType;
|
||||
use types::trace_types::trace::Action::Reward;
|
||||
use types::trace_types::localized::LocalizedTrace;
|
||||
use trace::{RewardType, LocalizedTrace};
|
||||
use trace::trace::Action::Reward;
|
||||
|
||||
#[test]
|
||||
fn can_trace_block_and_uncle_reward() {
|
||||
|
@ -143,9 +143,8 @@ mod tests {
|
||||
use util::sha3::Hashable;
|
||||
use util::bloom::Bloomable;
|
||||
use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide, Reward};
|
||||
use types::trace_types::trace::RewardType;
|
||||
use trace::flat::FlatTrace;
|
||||
use trace::{Filter, AddressesFilter, TraceError};
|
||||
use trace::{Filter, AddressesFilter, TraceError, RewardType};
|
||||
use evm::CallType;
|
||||
|
||||
#[test]
|
||||
|
@ -164,7 +164,7 @@ mod tests {
|
||||
use super::{FlatBlockTraces, FlatTransactionTraces, FlatTrace};
|
||||
use trace::trace::{Action, Res, CallResult, Call, Suicide, Reward};
|
||||
use evm::CallType;
|
||||
use types::trace_types::trace::RewardType;
|
||||
use trace::RewardType;
|
||||
|
||||
#[test]
|
||||
fn encode_flat_transaction_traces() {
|
||||
|
@ -780,7 +780,7 @@ mod tests {
|
||||
block_hash: 14.into(),
|
||||
};
|
||||
let serialized = serde_json::to_string(&t).unwrap();
|
||||
assert_eq!(serialized, r#"{"type":"reward","action":{"miner":"0x0000000000000000000000000000000000000004","value":"0x0000000000000000000000000000000000000006","rewardType":"block"},"result":null,"traceAddress":[10],"subtraces":1,"transactionPosition":11,"transactionHash":"0x000000000000000000000000000000000000000000000000000000000000000c","blockNumber":13,"blockHash":"0x000000000000000000000000000000000000000000000000000000000000000e"}"#);
|
||||
assert_eq!(serialized, r#"{"type":"reward","action":{"miner":"0x0000000000000000000000000000000000000004","value":"0x6","rewardType":"block"},"result":null,"traceAddress":[10],"subtraces":1,"transactionPosition":11,"transactionHash":"0x000000000000000000000000000000000000000000000000000000000000000c","blockNumber":13,"blockHash":"0x000000000000000000000000000000000000000000000000000000000000000e"}"#);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
Loading…
Reference in New Issue
Block a user