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

address grumble

Browse Source
This commit is contained in:
Robert Habermeier 2017-04-10 18:06:36 +02:00
parent 5b65f10828
commit cc6cf8d7ce
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ use light::on_demand::{OnDemand, request};
use ethsync::LightSync; use ethsync::LightSync;
use util::{Address, Mutex, Uint, U256}; use util::{Address, Mutex, Uint, U256};
use v1::helpers::{CallRequest as CRequest, errors, dispatch}; use v1::helpers::{CallRequest as CallRequestHelper, errors, dispatch};
use v1::types::{BlockNumber, CallRequest}; use v1::types::{BlockNumber, CallRequest};
/// Helper for fetching blockchain data either from the light client or the network /// Helper for fetching blockchain data either from the light client or the network
@ -130,7 +130,7 @@ impl LightFetch {
const DEFAULT_GAS_PRICE: U256 = U256([0, 0, 0, 21_000_000]); const DEFAULT_GAS_PRICE: U256 = U256([0, 0, 0, 21_000_000]);
let (sync, on_demand, client) = (self.sync.clone(), self.on_demand.clone(), self.client.clone()); let (sync, on_demand, client) = (self.sync.clone(), self.on_demand.clone(), self.client.clone());
let req: CRequest = req.into(); let req: CallRequestHelper = req.into();
let id = num.0.into(); let id = num.0.into();
let from = req.from.unwrap_or(Address::zero()); let from = req.from.unwrap_or(Address::zero());

1
rpc/src/v1/impls/parity.rs
View File

@ -427,6 +427,7 @@ impl<C, M, S: ?Sized, U> Parity for ParityClient<C, M, S, U> where
}, },
extra_info: client.block_extra_info(id).expect(EXTRA_INFO_PROOF), extra_info: client.block_extra_info(id).expect(EXTRA_INFO_PROOF),
})).boxed() })).boxed()
}
fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> { fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> {
ipfs::cid(content) ipfs::cid(content)