diff --git a/crates/ethcore/src/miner/miner.rs b/crates/ethcore/src/miner/miner.rs index 42d4d3b35f..742d3bd6d1 100644 --- a/crates/ethcore/src/miner/miner.rs +++ b/crates/ethcore/src/miner/miner.rs @@ -1072,11 +1072,6 @@ impl Miner { } } } - - /// Return all transactions currently in the transaction queue. - pub fn all_transactions(&self) -> Vec> { - self.transaction_queue.all_transactions() - } } const SEALING_TIMEOUT_IN_BLOCKS: u64 = 5; @@ -1292,6 +1287,11 @@ impl miner::MinerService for Miner { ) } + /// Return all transactions currently in the transaction queue. + fn all_transactions(&self) -> Vec> { + self.transaction_queue.all_transactions() + } + fn queued_transaction_hashes(&self) -> Vec { self.transaction_queue.all_transaction_hashes() } diff --git a/crates/ethcore/src/miner/mod.rs b/crates/ethcore/src/miner/mod.rs index 52d8ddee27..24967d89a7 100644 --- a/crates/ethcore/src/miner/mod.rs +++ b/crates/ethcore/src/miner/mod.rs @@ -242,11 +242,14 @@ pub trait MinerService: Send + Sync { self.ready_transactions_filtered(chain, max_len, None, ordering) } - /// Get a list of all transactions in the pool (some of them might not be ready for inclusion yet). + /// Get a list of queued transactions in the pool (some of them might not be ready for inclusion yet). fn queued_transactions(&self, chain: &C) -> Vec> where C: BlockChain + CallContract + Nonce + Sync; + /// Get a list of all transactions in the pool (some of them might not be ready for inclusion yet). + fn all_transactions(&self) -> Vec>; + /// Get a list of all transaction hashes in the pool (some of them might not be ready for inclusion yet). fn queued_transaction_hashes(&self) -> Vec; diff --git a/crates/rpc/src/v1/impls/parity.rs b/crates/rpc/src/v1/impls/parity.rs index a41ae0a370..01dda931ab 100644 --- a/crates/rpc/src/v1/impls/parity.rs +++ b/crates/rpc/src/v1/impls/parity.rs @@ -283,7 +283,7 @@ where } fn all_transactions(&self) -> Result> { - let all_transactions = self.miner.queued_transactions(); + let all_transactions = self.miner.all_transactions(); Ok(all_transactions .into_iter()