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

Fix nightly warnings (#9080) 

* chore: use 1.28 API for `memory_profiling`

* chore: import a type directly from `ethcore-light`
This commit is contained in:
Andronik Ordian 2018-07-11 09:02:14 +03:00 committed by David
parent da5de4a6ff
commit fe678dcd2f
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parity/lib.rs
View File

@ -17,7 +17,6 @@
//! Ethcore client application.
#![warn(missing_docs)]
#![cfg_attr(feature = "memory_profiling", feature(alloc_system, global_allocator, allocator_api))]
extern crate ansi_term;
extern crate docopt;
@ -93,9 +92,6 @@ extern crate pretty_assertions;
#[cfg(test)]
extern crate tempdir;
#[cfg(feature = "memory_profiling")]
extern crate alloc_system;
mod account;
mod blockchain;
mod cache;
@ -131,7 +127,7 @@ use configuration::{Cmd, Execute};
use deprecated::find_deprecated;
use ethcore_logger::setup_log;
#[cfg(feature = "memory_profiling")]
use alloc_system::System;
use std::alloc::System;
pub use self::configuration::Configuration;
pub use self::run::RunningClient;

9
rpc/src/v1/helpers/light_fetch.rs
View File

@ -20,7 +20,6 @@ use std::sync::Arc;
use ethcore::basic_account::BasicAccount;
use ethcore::encoded;
use ethcore::executed::{Executed, ExecutionError};
use ethcore::ids::BlockId;
use ethcore::filter::Filter as EthcoreFilter;
use ethcore::receipt::Receipt;
@ -33,7 +32,10 @@ use jsonrpc_macros::Trailing;
use light::cache::Cache;
use light::client::LightChainClient;
use light::cht;
use light::on_demand::{request, OnDemand, HeaderRef, Request as OnDemandRequest, Response as OnDemandResponse};
use light::on_demand::{
request, OnDemand, HeaderRef, Request as OnDemandRequest,
Response as OnDemandResponse, ExecutionResult,
};
use light::request::Field;
use sync::LightSync;
@ -86,9 +88,6 @@ pub fn extract_transaction_at_index(block: encoded::Block, index: usize, eip86_t
.map(|tx| Transaction::from_localized(tx, eip86_transition))
}
/// Type alias for convenience.
pub type ExecutionResult = ::std::result::Result<Executed, ExecutionError>;
// extract the header indicated by the given `HeaderRef` from the given responses.
// fails only if they do not correspond.
fn extract_header(res: &[OnDemandResponse], header: HeaderRef) -> Option<encoded::Header> {