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

Merge branch 'master' into canon-cache-size

Browse Source
This commit is contained in:
Robert Habermeier
2016-10-07 12:42:51 +02:00
parent 8a0e98d4cc 4655fd04a5
commit 299ceb8092
13 changed files with 231 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/src/client/client.rs
View File

@@ -1079,7 +1079,7 @@ impl BlockChainClient for Client {
}
fn pending_transactions(&self) -> Vec<SignedTransaction> {
self.miner.pending_transactions()
self.miner.pending_transactions(self.chain.read().best_block_number())
}
}

2
ethcore/src/client/test_client.rs
View File

@@ -602,6 +602,6 @@ impl BlockChainClient for TestBlockChainClient {
}
fn pending_transactions(&self) -> Vec<SignedTransaction> {
self.miner.pending_transactions()
self.miner.pending_transactions(self.chain_info().best_block_number)
}
}