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

Merge branch 'master' into ethminer_crate

Browse Source 
Conflicts:
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/lib.rs
This commit is contained in:
Tomasz Drwięga
2016-03-11 10:23:33 +01:00
parent 3bbdc03d0c a207b6a17e
commit 5b204a5ff5
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/src/v1/impls/eth.rs
View File

@@ -18,7 +18,7 @@
use std::collections::HashMap;
use std::sync::{Arc, Weak, Mutex, RwLock};
use std::ops::Deref;
use ethsync::{SyncStatusProvider, SyncState};
use ethsync::{SyncProvider, SyncState};
use ethminer::{MinerService};
use jsonrpc_core::*;
use util::numbers::*;
@@ -36,7 +36,7 @@ use v1::helpers::{PollFilter, PollManager};
/// Eth rpc implementation.
pub struct EthClient<C, S, M>
where C: BlockChainClient,
S: SyncStatusProvider,
S: SyncProvider,
M: MinerService {
client: Weak<C>,
sync: Weak<S>,
@@ -44,8 +44,10 @@ pub struct EthClient<C, S, M>
hashrates: RwLock<HashMap<H256, u64>>,
}
impl<C, S, M> EthClient<C, S, M> where C: BlockChainClient, S: SyncStatusProvider, M: MinerService {
impl<C, S, M> EthClient<C, S, M>
where C: BlockChainClient,
S: SyncProvider,
M: MinerService {
/// Creates new EthClient.
pub fn new(client: &Arc<C>, sync: &Arc<S>, miner: &Arc<M>) -> Self {
EthClient {
@@ -104,7 +106,7 @@ impl<C, S, M> EthClient<C, S, M> where C: BlockChainClient, S: SyncStatusProvide
impl<C, S, M> Eth for EthClient<C, S, M>
where C: BlockChainClient + 'static,
S: SyncStatusProvider + 'static,
S: SyncProvider + 'static,
M: MinerService + 'static {
fn protocol_version(&self, params: Params) -> Result<Value, Error> {
match params {

8
rpc/src/v1/impls/net.rs
View File

@@ -17,15 +17,15 @@
//! Net rpc implementation.
use std::sync::{Arc, Weak};
use jsonrpc_core::*;
use ethsync::SyncStatusProvider;
use ethsync::SyncProvider;
use v1::traits::Net;
/// Net rpc implementation.
pub struct NetClient<S> where S: SyncStatusProvider {
pub struct NetClient<S> where S: SyncProvider {
sync: Weak<S>
}
impl<S> NetClient<S> where S: SyncStatusProvider {
impl<S> NetClient<S> where S: SyncProvider {
/// Creates new NetClient.
pub fn new(sync: &Arc<S>) -> Self {
NetClient {
@@ -34,7 +34,7 @@ impl<S> NetClient<S> where S: SyncStatusProvider {
}
}
impl<S> Net for NetClient<S> where S: SyncStatusProvider + 'static {
impl<S> Net for NetClient<S> where S: SyncProvider + 'static {
fn version(&self, _: Params) -> Result<Value, Error> {
Ok(Value::U64(take_weak!(self.sync).status().protocol_version as u64))
}