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

Merge pull request #1123 from ethcore/fixstyling

Browse Source 
Fix styling - don't mix spaces with tabs!!!
This commit is contained in:
Arkadiy Paronyan 2016-05-22 13:41:41 +02:00
commit f738f5e032
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,12 +41,13 @@ use util::keys::store::AccountProvider;
use serde; use serde;
/// Eth rpc implementation. /// Eth rpc implementation.
pub struct EthClient<C, S, A, M, EM> pub struct EthClient<C, S, A, M, EM> where
where C: BlockChainClient, C: BlockChainClient,
S: SyncProvider, S: SyncProvider,
A: AccountProvider, A: AccountProvider,
M: MinerService, M: MinerService,
EM: ExternalMinerService { EM: ExternalMinerService {
client: Weak<C>, client: Weak<C>,
sync: Weak<S>, sync: Weak<S>,
accounts: Weak<A>, accounts: Weak<A>,
@ -55,12 +56,12 @@ pub struct EthClient<C, S, A, M, EM>
seed_compute: Mutex<SeedHashCompute>, seed_compute: Mutex<SeedHashCompute>,
} }
impl<C, S, A, M, EM> EthClient<C, S, A, M, EM> impl<C, S, A, M, EM> EthClient<C, S, A, M, EM> where
where C: BlockChainClient, C: BlockChainClient,
S: SyncProvider, S: SyncProvider,
A: AccountProvider, A: AccountProvider,
M: MinerService, M: MinerService,
EM: ExternalMinerService { EM: ExternalMinerService {
/// Creates new EthClient. /// Creates new EthClient.
pub fn new(client: &Arc<C>, sync: &Arc<S>, accounts: &Arc<A>, miner: &Arc<M>, em: &Arc<EM>) pub fn new(client: &Arc<C>, sync: &Arc<S>, accounts: &Arc<A>, miner: &Arc<M>, em: &Arc<EM>)
@ -214,12 +215,12 @@ fn from_params_default_third<F1, F2>(params: Params) -> Result<(F1, F2, BlockNum
} }
} }
impl<C, S, A, M, EM> Eth for EthClient<C, S, A, M, EM> impl<C, S, A, M, EM> Eth for EthClient<C, S, A, M, EM> where
where C: BlockChainClient + 'static, C: BlockChainClient + 'static,
S: SyncProvider + 'static, S: SyncProvider + 'static,
A: AccountProvider + 'static, A: AccountProvider + 'static,
M: MinerService + 'static, M: MinerService + 'static,
EM: ExternalMinerService + 'static { EM: ExternalMinerService + 'static {
fn protocol_version(&self, params: Params) -> Result<Value, Error> { fn protocol_version(&self, params: Params) -> Result<Value, Error> {
match params { match params {
@ -252,7 +253,6 @@ impl<C, S, A, M, EM> Eth for EthClient<C, S, A, M, EM>
} }
} }
// TODO: do not hardcode author.
fn author(&self, params: Params) -> Result<Value, Error> { fn author(&self, params: Params) -> Result<Value, Error> {
match params { match params {
Params::None => to_value(&take_weak!(self.miner).author()), Params::None => to_value(&take_weak!(self.miner).author()),
@ -260,7 +260,6 @@ impl<C, S, A, M, EM> Eth for EthClient<C, S, A, M, EM>
} }
} }
// TODO: return real value of mining once it's implemented.
fn is_mining(&self, params: Params) -> Result<Value, Error> { fn is_mining(&self, params: Params) -> Result<Value, Error> {
match params { match params {
Params::None => to_value(&self.external_miner.is_mining()), Params::None => to_value(&self.external_miner.is_mining()),
@ -268,7 +267,6 @@ impl<C, S, A, M, EM> Eth for EthClient<C, S, A, M, EM>
} }
} }
// TODO: return real hashrate once we have mining
fn hashrate(&self, params: Params) -> Result<Value, Error> { fn hashrate(&self, params: Params) -> Result<Value, Error> {
match params { match params {
Params::None => to_value(&self.external_miner.hashrate()), Params::None => to_value(&self.external_miner.hashrate()),
@ -550,18 +548,18 @@ impl<C, S, A, M, EM> Eth for EthClient<C, S, A, M, EM>
} }
/// Eth filter rpc implementation. /// Eth filter rpc implementation.
pub struct EthFilterClient<C, M> pub struct EthFilterClient<C, M> where
where C: BlockChainClient, C: BlockChainClient,
M: MinerService { M: MinerService {
client: Weak<C>, client: Weak<C>,
miner: Weak<M>, miner: Weak<M>,
polls: Mutex<PollManager<PollFilter>>, polls: Mutex<PollManager<PollFilter>>,
} }
impl<C, M> EthFilterClient<C, M> impl<C, M> EthFilterClient<C, M> where
where C: BlockChainClient, C: BlockChainClient,
M: MinerService { M: MinerService {
/// Creates new Eth filter client. /// Creates new Eth filter client.
pub fn new(client: &Arc<C>, miner: &Arc<M>) -> Self { pub fn new(client: &Arc<C>, miner: &Arc<M>) -> Self {
@ -573,9 +571,9 @@ impl<C, M> EthFilterClient<C, M>
} }
} }
impl<C, M> EthFilter for EthFilterClient<C, M> impl<C, M> EthFilter for EthFilterClient<C, M> where
where C: BlockChainClient + 'static, C: BlockChainClient + 'static,
M: MinerService + 'static { M: MinerService + 'static {
fn new_filter(&self, params: Params) -> Result<Value, Error> { fn new_filter(&self, params: Params) -> Result<Value, Error> {
from_params::<(Filter,)>(params) from_params::<(Filter,)>(params)