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

Revert "fixed master (#6465)"

Browse Source 
This reverts commit 899538ae25.
This commit is contained in:
Robert Habermeier
2017-09-05 17:54:05 +02:00
parent 7e3c081007
commit ad39446e87
41 changed files with 1268 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rpc/src/v1/impls/light/eth.rs
View File

@@ -25,7 +25,7 @@ use jsonrpc_core::Error;
use jsonrpc_macros::Trailing;
use light::cache::Cache as LightDataCache;
use light::client::{Client as LightClient, LightChainClient};
use light::client::LightChainClient;
use light::{cht, TransactionQueue};
use light::on_demand::{request, OnDemand};
@@ -63,9 +63,9 @@ use util::Address;
const NO_INVALID_BACK_REFS: &'static str = "Fails only on invalid back-references; back-references here known to be valid; qed";
/// Light client `ETH` (and filter) RPC.
pub struct EthClient {
pub struct EthClient<T> {
sync: Arc<LightSync>,
client: Arc<LightClient>,
client: Arc<T>,
on_demand: Arc<OnDemand>,
transaction_queue: Arc<RwLock<TransactionQueue>>,
accounts: Arc<AccountProvider>,
@@ -73,7 +73,7 @@ pub struct EthClient {
polls: Mutex<PollManager<PollFilter>>,
}
impl Clone for EthClient {
impl<T> Clone for EthClient<T> {
fn clone(&self) -> Self {
// each instance should have its own poll manager.
EthClient {
@@ -89,12 +89,12 @@ impl Clone for EthClient {
}
impl EthClient {
impl<T: LightChainClient + 'static> EthClient<T> {
/// Create a new `EthClient` with a handle to the light sync instance, client,
/// and on-demand request service, which is assumed to be attached as a handler.
pub fn new(
sync: Arc<LightSync>,
client: Arc<LightClient>,
client: Arc<T>,
on_demand: Arc<OnDemand>,
transaction_queue: Arc<RwLock<TransactionQueue>>,
accounts: Arc<AccountProvider>,
@@ -209,7 +209,7 @@ impl EthClient {
}
}
impl Eth for EthClient {
impl<T: LightChainClient + 'static> Eth for EthClient<T> {
type Metadata = Metadata;
fn protocol_version(&self) -> Result<String, Error> {
@@ -466,7 +466,7 @@ impl Eth for EthClient {
}
// This trait implementation triggers a blanked impl of `EthFilter`.
impl Filterable for EthClient {
impl<T: LightChainClient + 'static> Filterable for EthClient<T> {
fn best_block_number(&self) -> u64 { self.client.chain_info().best_block_number }
fn block_hash(&self, id: BlockId) -> Option<RpcH256> {