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

Enable pending block when there is local transaction pending. (#1005)

Browse Source 
* Enabling sealing while importing own transaction

* Fixing import transaction deadlock

* Checking if there are local transactions in queue

* Updating hyper-mio

* Switching to rust-url#1.0.0
This commit is contained in:
Tomasz Drwięga
2016-04-28 17:36:53 +02:00
committed by Gav Wood
parent d238b5e578
commit ea669ac6b6
5 changed files with 163 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/src/v1/impls/eth.rs
View File

@@ -173,7 +173,7 @@ impl<C, S, A, M, EM> EthClient<C, S, A, M, EM>
let client = take_weak!(self.client);
let miner = take_weak!(self.miner);
miner.import_own_transaction(signed_transaction, |a: &Address| {
miner.import_own_transaction(client.deref(), signed_transaction, |a: &Address| {
AccountDetails {
nonce: client.nonce(&a),
balance: client.balance(&a),

2
rpc/src/v1/tests/helpers/miner_service.rs
View File

@@ -124,7 +124,7 @@ impl MinerService for TestMinerService {
}
/// Imports transactions to transaction queue.
fn import_own_transaction<T>(&self, transaction: SignedTransaction, _fetch_account: T) ->
fn import_own_transaction<T>(&self, _chain: &BlockChainClient, transaction: SignedTransaction, _fetch_account: T) ->
Result<TransactionImportResult, Error>
where T: Fn(&Address) -> AccountDetails {
// lets assume that all txs are valid