Renaming status fields to something more descriptive.

This commit is contained in:
Tomasz Drwięga
2016-03-17 11:19:12 +01:00
parent 884f2dd873
commit e1c3ab1846
5 changed files with 18 additions and 16 deletions

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().block_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())))
})

View File

@@ -29,9 +29,9 @@ impl MinerService for TestMinerService {
/// Returns miner's status.
fn status(&self) -> MinerStatus {
MinerStatus {
transaction_queue_pending: 0,
transaction_queue_future: 0,
block_pending: 1
transactions_in_pending_queue: 0,
transactions_in_future_queue: 0,
transactions_in_pending_block: 1
}
}