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

Merge pull request #750 from ethcore/tx_block_pending

Browse Source 
Returning number of transactions pending in block not queue
This commit is contained in:
Gav Wood
2016-03-17 13:21:06 +01:00
parent cd26ccba6b caedb64ade
commit c88601a376
6 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,9 @@ impl<C, S, A, M, EM> Eth for EthClient<C, S, A, M, EM>
fn block_transaction_count_by_number(&self, params: Params) -> Result<Value, Error> {
from_params::<(BlockNumber,)>(params)
.and_then(|(block_number,)| match block_number {
BlockNumber::Pending => to_value(&U256::from(take_weak!(self.miner).status().transaction_queue_pending)),
BlockNumber::Pending => to_value(
&U256::from(take_weak!(self.miner).status().transactions_in_pending_block)
),
_ => to_value(&take_weak!(self.client).block(block_number.into())
.map_or_else(U256::zero, |bytes| U256::from(BlockView::new(&bytes).transactions_count())))
})