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

Merge branch 'fo-6418-dont-export-bigint' of github.com:paritytech/parity into util_error_chain

Browse Source
This commit is contained in:
debris 2017-09-05 12:15:39 +02:00
commit 3497eab26c
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/evm/src/interpreter/informant.rs
View File

@ -43,7 +43,7 @@ mod inner {
use evm::instructions::{Instruction, InstructionInfo, INSTRUCTIONS}; use evm::instructions::{Instruction, InstructionInfo, INSTRUCTIONS};
use evm::{CostType}; use evm::{CostType};
use util::U256; use bigint::prelude::U256;
macro_rules! evm_debug { macro_rules! evm_debug {
($x: expr) => { ($x: expr) => {

2
ethcore/light/src/client/fetch.rs
View File

@ -23,7 +23,7 @@ use ethcore::engines::{Engine, StateDependentProof};
use ethcore::header::Header; use ethcore::header::Header;
use ethcore::receipt::Receipt; use ethcore::receipt::Receipt;
use futures::future::IntoFuture; use futures::future::IntoFuture;
use util::H256; use bigint::hash::H256;
/// Provides full chain data. /// Provides full chain data.
pub trait ChainDataFetcher: Send + Sync + 'static { pub trait ChainDataFetcher: Send + Sync + 'static {

3
ethcore/light/src/types/request/mod.rs
View File

@ -1540,7 +1540,8 @@ pub mod execution {
pub mod epoch_signal { pub mod epoch_signal {
use super::{Field, NoSuchOutput, OutputKind, Output}; use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp}; use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use util::{Bytes, H256}; use bigint::hash::H256;
use util::Bytes;
/// Potentially incomplete epoch signal request. /// Potentially incomplete epoch signal request.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]

3
evmbin/benches/mod.rs
View File

@ -26,13 +26,14 @@ extern crate test;
extern crate ethcore; extern crate ethcore;
extern crate evm; extern crate evm;
extern crate ethcore_util; extern crate ethcore_util;
extern crate ethcore_bigint;
extern crate rustc_hex; extern crate rustc_hex;
use self::test::{Bencher, black_box}; use self::test::{Bencher, black_box};
use evm::run_vm; use evm::run_vm;
use ethcore::vm::ActionParams; use ethcore::vm::ActionParams;
use ethcore_util::U256; use ethcore_bigint::prelude::U256;
use rustc_hex::FromHex; use rustc_hex::FromHex;
#[bench] #[bench]

2
parity/light_helpers/epoch_fetch.rs
View File

@ -28,7 +28,7 @@ use light::client::fetch::ChainDataFetcher;
use light::on_demand::{request, OnDemand}; use light::on_demand::{request, OnDemand};
use parking_lot::RwLock; use parking_lot::RwLock;
use util::H256; use bigint::hash::H256;
const ALL_VALID_BACKREFS: &str = "no back-references, therefore all back-references valid; qed"; const ALL_VALID_BACKREFS: &str = "no back-references, therefore all back-references valid; qed";