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

Fix nightly warnings (#9080)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

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> {