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

Refactoring removing invalid transactions from queue

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-03-17 15:30:03 +01:00
parent c4021a77ca
commit fece330ca4
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
miner/src/miner.rs
View File

@ -133,19 +133,14 @@ impl MinerService for Miner {
transactions, transactions,
); );
match b { *self.sealing_block.lock().unwrap() = b.map(|(block, invalid_transactions)| {
None => {
*self.sealing_block.lock().unwrap() = None
},
Some((block, invalid_transactions)) => {
let mut queue = self.transaction_queue.lock().unwrap(); let mut queue = self.transaction_queue.lock().unwrap();
queue.remove_all( queue.remove_all(
&invalid_transactions.into_iter().collect::<Vec<H256>>(), &invalid_transactions.into_iter().collect::<Vec<H256>>(),
|a: &Address| chain.nonce(a) |a: &Address| chain.nonce(a)
); );
*self.sealing_block.lock().unwrap() = Some(block) block
} });
}
} }
fn sealing_block(&self, chain: &BlockChainClient) -> &Mutex<Option<ClosedBlock>> { fn sealing_block(&self, chain: &BlockChainClient) -> &Mutex<Option<ClosedBlock>> {