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

Returning number of transactions pending in block not queue

Browse Source
This commit is contained in:
Tomasz Drwięga
2016-03-17 11:19:12 +01:00
parent ecfcc4f3b6
commit 884f2dd873
5 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
miner/src/lib.rs
View File

@@ -108,4 +108,6 @@ pub struct MinerStatus {
pub transaction_queue_pending: usize,
/// Number of transactions in queue with state `future` (not yet ready to be included in block)
pub transaction_queue_future: usize,
/// Number of transactions included in currently mined block
pub block_pending: usize,
}

4
miner/src/miner.rs
View File

@@ -22,7 +22,7 @@ use std::sync::atomic::AtomicBool;
use util::{H256, U256, Address, Bytes, Uint};
use ethcore::views::{BlockView};
use ethcore::client::{BlockChainClient, BlockId};
use ethcore::block::{ClosedBlock};
use ethcore::block::{ClosedBlock, IsBlock};
use ethcore::error::{Error};
use ethcore::transaction::SignedTransaction;
use super::{MinerService, MinerStatus, TransactionQueue};
@@ -104,9 +104,11 @@ impl MinerService for Miner {
fn status(&self) -> MinerStatus {
let status = self.transaction_queue.lock().unwrap().status();
let block = self.sealing_block.lock().unwrap();
MinerStatus {
transaction_queue_pending: status.pending,
transaction_queue_future: status.future,
block_pending: block.as_ref().map_or(0, |b| b.transactions().len()),
}
}