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

Fixed errors after merge with master

This commit is contained in:
Anton Gavrilov 2017-07-27 19:15:25 +02:00
parent af1fbb39ca
commit b1935340c8
8 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ethcore/src/engines/authority_round/mod.rs
View File

@ -25,8 +25,7 @@ use block::*;
use builtin::Builtin; use builtin::Builtin;
use client::{Client, EngineClient}; use client::{Client, EngineClient};
use engines::{Call, Engine, Seal, EngineError, ConstructedVerifier, CloseOutcome}; use engines::{Call, Engine, Seal, EngineError, ConstructedVerifier, CloseOutcome};
use trace::{Tracer, ExecutiveTracer}; use trace::{Tracer, ExecutiveTracer, RewardType};
use types::trace_types::trace::{RewardType};
use error::{Error, TransactionError, BlockError}; use error::{Error, TransactionError, BlockError};
use ethjson; use ethjson;
use header::{Header, BlockNumber}; use header::{Header, BlockNumber};

3
ethcore/src/engines/null_engine.rs
View File

@ -25,8 +25,7 @@ use evm::Schedule;
use header::BlockNumber; use header::BlockNumber;
use error::Error; use error::Error;
use state::CleanupMode; use state::CleanupMode;
use trace::{Tracer, ExecutiveTracer}; use trace::{Tracer, ExecutiveTracer, RewardType};
use types::trace_types::trace::{RewardType};
/// An engine which does not provide any consensus mechanism and does not seal blocks. /// An engine which does not provide any consensus mechanism and does not seal blocks.
pub struct NullEngine { pub struct NullEngine {

3
ethcore/src/engines/tendermint/mod.rs
View File

@ -38,8 +38,7 @@ use account_provider::AccountProvider;
use block::*; use block::*;
use spec::CommonParams; use spec::CommonParams;
use engines::{Engine, Seal, EngineError, CloseOutcome, ConstructedVerifier}; use engines::{Engine, Seal, EngineError, CloseOutcome, ConstructedVerifier};
use trace::{Tracer, ExecutiveTracer}; use trace::{Tracer, ExecutiveTracer, RewardType};
use types::trace_types::trace::{RewardType};
use state::CleanupMode; use state::CleanupMode;
use io::IoService; use io::IoService;
use super::signer::EngineSigner; use super::signer::EngineSigner;

3
ethcore/src/ethereum/ethash.rs
View File

@ -21,8 +21,7 @@ use block::*;
use builtin::Builtin; use builtin::Builtin;
use evm::env_info::EnvInfo; use evm::env_info::EnvInfo;
use error::{BlockError, Error, TransactionError}; use error::{BlockError, Error, TransactionError};
use trace::{Tracer, ExecutiveTracer}; use trace::{Tracer, ExecutiveTracer,RewardType};
use types::trace_types::trace::{RewardType};
use header::{Header, BlockNumber}; use header::{Header, BlockNumber};
use state::CleanupMode; use state::CleanupMode;
use spec::CommonParams; use spec::CommonParams;

5
ethcore/src/tests/trace.rs
View File

@ -31,9 +31,8 @@ use header::Header;
use miner::Miner; use miner::Miner;
use transaction::{Action, Transaction}; use transaction::{Action, Transaction};
use views::BlockView; use views::BlockView;
use types::trace_types::trace::RewardType; use trace::{RewardType, LocalizedTrace};
use types::trace_types::trace::Action::Reward; use trace::trace::Action::Reward;
use types::trace_types::localized::LocalizedTrace;
#[test] #[test]
fn can_trace_block_and_uncle_reward() { fn can_trace_block_and_uncle_reward() {

3
ethcore/src/trace/types/filter.rs
View File

@ -143,9 +143,8 @@ mod tests {
use util::sha3::Hashable; use util::sha3::Hashable;
use util::bloom::Bloomable; use util::bloom::Bloomable;
use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide, Reward}; use trace::trace::{Action, Call, Res, Create, CreateResult, Suicide, Reward};
use types::trace_types::trace::RewardType;
use trace::flat::FlatTrace; use trace::flat::FlatTrace;
use trace::{Filter, AddressesFilter, TraceError}; use trace::{Filter, AddressesFilter, TraceError, RewardType};
use evm::CallType; use evm::CallType;
#[test] #[test]

2
ethcore/src/trace/types/flat.rs
View File

@ -164,7 +164,7 @@ mod tests {
use super::{FlatBlockTraces, FlatTransactionTraces, FlatTrace}; use super::{FlatBlockTraces, FlatTransactionTraces, FlatTrace};
use trace::trace::{Action, Res, CallResult, Call, Suicide, Reward}; use trace::trace::{Action, Res, CallResult, Call, Suicide, Reward};
use evm::CallType; use evm::CallType;
use types::trace_types::trace::RewardType; use trace::RewardType;
#[test] #[test]
fn encode_flat_transaction_traces() { fn encode_flat_transaction_traces() {

2
rpc/src/v1/types/trace.rs
View File

@ -780,7 +780,7 @@ mod tests {
block_hash: 14.into(), block_hash: 14.into(),
}; };
let serialized = serde_json::to_string(&t).unwrap(); 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] #[test]