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

Renaming status fields to something more descriptive.

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

8
miner/src/lib.rs
View File

@@ -42,7 +42,7 @@
//!
//! let miner: Miner = Miner::default();
//! // get status
//! assert_eq!(miner.status().transaction_queue_pending, 0);
//! assert_eq!(miner.status().transactions_in_pending_queue, 0);
//!
//! // Check block for sealing
//! miner.prepare_sealing(client.deref());
@@ -105,9 +105,9 @@ pub trait MinerService : Send + Sync {
/// Mining status
pub struct MinerStatus {
/// Number of transactions in queue with state `pending` (ready to be included in block)
pub transaction_queue_pending: usize,
pub transactions_in_pending_queue: usize,
/// Number of transactions in queue with state `future` (not yet ready to be included in block)
pub transaction_queue_future: usize,
pub transactions_in_future_queue: usize,
/// Number of transactions included in currently mined block
pub block_pending: usize,
pub transactions_in_pending_block: usize,
}

6
miner/src/miner.rs
View File

@@ -106,9 +106,9 @@ impl MinerService for Miner {
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()),
transactions_in_pending_queue: status.pending,
transactions_in_future_queue: status.future,
transactions_in_pending_block: block.as_ref().map_or(0, |b| b.transactions().len()),
}
}