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

remove let inner pattern with take_weakf and try_bf

Browse Source
This commit is contained in:
Robert Habermeier 2017-02-09 20:38:43 +01:00
parent c83d27420c
commit 0d09a473a7
3 changed files with 101 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
rpc/src/v1/helpers/dispatch.rs
View File

@ -92,57 +92,50 @@ impl<C: MiningBlockChainClient, M: MinerService> Dispatcher for FullDispatcher<C
fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address) fn fill_optional_fields(&self, request: TransactionRequest, default_sender: Address)
-> BoxFuture<FilledTransactionRequest, Error> -> BoxFuture<FilledTransactionRequest, Error>
{ {
let inner = move || { let (client, miner) = (take_weakf!(self.client), take_weakf!(self.miner));
let (client, miner) = (take_weak!(self.client), take_weak!(self.miner)); let request = request;
let request = request; future::ok(FilledTransactionRequest {
Ok(FilledTransactionRequest { from: request.from.unwrap_or(default_sender),
from: request.from.unwrap_or(default_sender), used_default_from: request.from.is_none(),
used_default_from: request.from.is_none(), to: request.to,
to: request.to, nonce: request.nonce,
nonce: request.nonce, gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(&*client, &*miner)),
gas_price: request.gas_price.unwrap_or_else(|| default_gas_price(&*client, &*miner)), gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()),
gas: request.gas.unwrap_or_else(|| miner.sensible_gas_limit()), value: request.value.unwrap_or_else(|| 0.into()),
value: request.value.unwrap_or_else(|| 0.into()), data: request.data.unwrap_or_else(Vec::new),
data: request.data.unwrap_or_else(Vec::new), condition: request.condition,
condition: request.condition, }).boxed()
})
};
future::done(inner()).boxed()
} }
fn sign(&self, accounts: &AccountProvider, filled: FilledTransactionRequest, password: SignWith) fn sign(&self, accounts: &AccountProvider, filled: FilledTransactionRequest, password: SignWith)
-> BoxFuture<WithToken<SignedTransaction>, Error> -> BoxFuture<WithToken<SignedTransaction>, Error>
{ {
let inner = move || { let (client, miner) = (take_weakf!(self.client), take_weakf!(self.miner));
let (client, miner) = (take_weak!(self.client), take_weak!(self.miner)); let network_id = client.signing_network_id();
let network_id = client.signing_network_id(); let address = filled.from;
let address = filled.from; future::ok({
let signed_transaction = { let t = Transaction {
let t = Transaction { nonce: filled.nonce
nonce: filled.nonce .or_else(|| miner
.or_else(|| miner .last_nonce(&filled.from)
.last_nonce(&filled.from) .map(|nonce| nonce + U256::one()))
.map(|nonce| nonce + U256::one())) .unwrap_or_else(|| client.latest_nonce(&filled.from)),
.unwrap_or_else(|| client.latest_nonce(&filled.from)),
action: filled.to.map_or(Action::Create, Action::Call), action: filled.to.map_or(Action::Create, Action::Call),
gas: filled.gas, gas: filled.gas,
gas_price: filled.gas_price, gas_price: filled.gas_price,
value: filled.value, value: filled.value,
data: filled.data, data: filled.data,
};
let hash = t.hash(network_id);
let signature = signature(accounts, address, hash, password)?;
signature.map(|sig| {
SignedTransaction::new(t.with_signature(sig, network_id))
.expect("Transaction was signed by AccountsProvider; it never produces invalid signatures; qed")
})
}; };
Ok(signed_transaction)
};
future::done(inner()).boxed() let hash = t.hash(network_id);
let signature = try_bf!(signature(accounts, address, hash, password));
signature.map(|sig| {
SignedTransaction::new(t.with_signature(sig, network_id))
.expect("Transaction was signed by AccountsProvider; it never produces invalid signatures; qed")
})
}).boxed()
} }
fn dispatch_transaction(&self, signed_transaction: PendingTransaction) -> Result<H256, Error> { fn dispatch_transaction(&self, signed_transaction: PendingTransaction) -> Result<H256, Error> {

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

@ -359,133 +359,108 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM> Eth for EthClient<C, SN, S, M, EM> where
fn balance(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> { fn balance(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
let address = address.into(); let address = address.into();
let inner = || { let res = match num.0.clone() {
match num.0.clone() { BlockNumber::Pending => Ok(take_weakf!(self.miner).balance(&*take_weakf!(self.client), &address).into()),
BlockNumber::Pending => Ok(take_weak!(self.miner).balance(&*take_weak!(self.client), &address).into()), id => {
id => { let client = take_weakf!(self.client);
let client = take_weak!(self.client);
check_known(&*client, id.clone())?; try_bf!(check_known(&*client, id.clone()));
match client.balance(&address, id.into()) { match client.balance(&address, id.into()) {
Some(balance) => Ok(balance.into()), Some(balance) => Ok(balance.into()),
None => Err(errors::state_pruned()), None => Err(errors::state_pruned()),
}
} }
} }
}; };
future::done(inner()).boxed() future::done(res).boxed()
} }
fn storage_at(&self, address: RpcH160, pos: RpcU256, num: Trailing<BlockNumber>) -> BoxFuture<RpcH256, Error> { fn storage_at(&self, address: RpcH160, pos: RpcU256, num: Trailing<BlockNumber>) -> BoxFuture<RpcH256, Error> {
let address: Address = RpcH160::into(address); let address: Address = RpcH160::into(address);
let position: U256 = RpcU256::into(pos); let position: U256 = RpcU256::into(pos);
let inner = || { let res = match num.0.clone() {
match num.0.clone() { BlockNumber::Pending => Ok(take_weakf!(self.miner).storage_at(&*take_weakf!(self.client), &address, &H256::from(position)).into()),
BlockNumber::Pending => Ok(take_weak!(self.miner).storage_at(&*take_weak!(self.client), &address, &H256::from(position)).into()), id => {
id => { let client = take_weakf!(self.client);
let client = take_weak!(self.client);
check_known(&*client, id.clone())?; try_bf!(check_known(&*client, id.clone()));
match client.storage_at(&address, &H256::from(position), id.into()) { match client.storage_at(&address, &H256::from(position), id.into()) {
Some(s) => Ok(s.into()), Some(s) => Ok(s.into()),
None => Err(errors::state_pruned()), None => Err(errors::state_pruned()),
}
} }
} }
}; };
future::done(inner()).boxed() future::done(res).boxed()
} }
fn transaction_count(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> { fn transaction_count(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<RpcU256, Error> {
let address: Address = RpcH160::into(address); let address: Address = RpcH160::into(address);
let inner = move || { let res = match num.0.clone() {
match num.0.clone() { BlockNumber::Pending => Ok(take_weakf!(self.miner).nonce(&*take_weakf!(self.client), &address).into()),
BlockNumber::Pending => Ok(take_weak!(self.miner).nonce(&*take_weak!(self.client), &address).into()), id => {
id => { let client = take_weakf!(self.client);
let client = take_weak!(self.client);
check_known(&*client, id.clone())?; try_bf!(check_known(&*client, id.clone()));
match client.nonce(&address, id.into()) { match client.nonce(&address, id.into()) {
Some(nonce) => Ok(nonce.into()), Some(nonce) => Ok(nonce.into()),
None => Err(errors::state_pruned()), None => Err(errors::state_pruned()),
}
} }
} }
}; };
future::done(inner()).boxed() future::done(res).boxed()
} }
fn block_transaction_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> { fn block_transaction_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> {
let inner = || { future::ok(take_weakf!(self.client).block(BlockId::Hash(hash.into()))
Ok(take_weak!(self.client).block(BlockId::Hash(hash.into())) .map(|block| block.transactions_count().into())).boxed()
.map(|block| block.transactions_count().into()))
};
future::done(inner()).boxed()
} }
fn block_transaction_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> { fn block_transaction_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> {
let inner = || { future::ok(match num {
match num { BlockNumber::Pending => Some(
BlockNumber::Pending => Ok(Some( take_weakf!(self.miner).status().transactions_in_pending_block.into()
take_weak!(self.miner).status().transactions_in_pending_block.into() ),
)), _ =>
_ => Ok( take_weakf!(self.client).block(num.into())
take_weak!(self.client).block(num.into()) .map(|block| block.transactions_count().into())
.map(|block| block.transactions_count().into()) }).boxed()
)
}
};
future::done(inner()).boxed()
} }
fn block_uncles_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> { fn block_uncles_count_by_hash(&self, hash: RpcH256) -> BoxFuture<Option<RpcU256>, Error> {
let inner = || { future::ok(take_weakf!(self.client).block(BlockId::Hash(hash.into()))
Ok(take_weak!(self.client).block(BlockId::Hash(hash.into()))
.map(|block| block.uncles_count().into())) .map(|block| block.uncles_count().into()))
}; .boxed()
future::done(inner()).boxed()
} }
fn block_uncles_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> { fn block_uncles_count_by_number(&self, num: BlockNumber) -> BoxFuture<Option<RpcU256>, Error> {
let inner = || { future::ok(match num {
match num { BlockNumber::Pending => Some(0.into()),
BlockNumber::Pending => Ok(Some(0.into())), _ => take_weakf!(self.client).block(num.into())
_ => Ok( .map(|block| block.uncles_count().into()
take_weak!(self.client).block(num.into()) ),
.map(|block| block.uncles_count().into()) }).boxed()
),
}
};
future::done(inner()).boxed()
} }
fn code_at(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<Bytes, Error> { fn code_at(&self, address: RpcH160, num: Trailing<BlockNumber>) -> BoxFuture<Bytes, Error> {
let address: Address = RpcH160::into(address); let address: Address = RpcH160::into(address);
let inner = || { let res = match num.0.clone() {
match num.0.clone() { BlockNumber::Pending => Ok(take_weakf!(self.miner).code(&*take_weakf!(self.client), &address).map_or_else(Bytes::default, Bytes::new)),
BlockNumber::Pending => Ok(take_weak!(self.miner).code(&*take_weak!(self.client), &address).map_or_else(Bytes::default, Bytes::new)), id => {
id => { let client = take_weakf!(self.client);
let client = take_weak!(self.client);
check_known(&*client, id.clone())?; try_bf!(check_known(&*client, id.clone()));
match client.code(&address, id.into()) { match client.code(&address, id.into()) {
Some(code) => Ok(code.map_or_else(Bytes::default, Bytes::new)), Some(code) => Ok(code.map_or_else(Bytes::default, Bytes::new)),
None => Err(errors::state_pruned()), None => Err(errors::state_pruned()),
}
} }
} }
}; };
future::done(inner()).boxed() future::done(res).boxed()
} }
fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> BoxFuture<Option<RichBlock>, Error> { fn block_by_hash(&self, hash: RpcH256, include_txs: bool) -> BoxFuture<Option<RichBlock>, Error> {

11
rpc/src/v1/mod.rs
View File

@ -38,6 +38,17 @@ macro_rules! take_weakf {
} }
} }
// short for "try_boxfuture"
// unwrap a result, returning a BoxFuture<_, Err> on failure.
macro_rules! try_bf {
($res: expr) => {
match $res {
Ok(val) => val,
Err(e) => return ::futures::future::err(e.into()).boxed(),
}
}
}
#[macro_use] #[macro_use]
mod helpers; mod helpers;
mod impls; mod impls;