diff --git a/ethcore/client-traits/src/lib.rs b/ethcore/client-traits/src/lib.rs index 6d8d0011907..b05b05ea601 100644 --- a/ethcore/client-traits/src/lib.rs +++ b/ethcore/client-traits/src/lib.rs @@ -288,7 +288,7 @@ pub trait BlockChainClient: fn block_transaction(&self, id: TransactionId) -> Option; /// Get pool transaction with a given hash. - fn pooled_transaction(&self, hash: H256) -> Option>; + fn queued_transaction(&self, hash: H256) -> Option>; /// Get uncle with given id. fn uncle(&self, id: UncleId) -> Option; diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index abbddfc6842..050d521813c 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -1889,7 +1889,7 @@ impl BlockChainClient for Client { self.transaction_address(id).and_then(|address| self.chain.read().transaction(&address)) } - fn pooled_transaction(&self, hash: H256) -> Option> { + fn queued_transaction(&self, hash: H256) -> Option> { self.importer.miner.transaction(&hash) } diff --git a/ethcore/src/test_helpers/test_client.rs b/ethcore/src/test_helpers/test_client.rs index 74c605a4bfe..f4fe18756da 100644 --- a/ethcore/src/test_helpers/test_client.rs +++ b/ethcore/src/test_helpers/test_client.rs @@ -741,7 +741,7 @@ impl BlockChainClient for TestBlockChainClient { fn block_transaction(&self, _id: TransactionId) -> Option { None // Simple default. } - fn pooled_transaction(&self, _hash: H256) -> Option> { + fn queued_transaction(&self, _hash: H256) -> Option> { None } diff --git a/ethcore/sync/src/chain/handler.rs b/ethcore/sync/src/chain/handler.rs index b534c25210c..2c15c64a25d 100644 --- a/ethcore/sync/src/chain/handler.rs +++ b/ethcore/sync/src/chain/handler.rs @@ -706,7 +706,7 @@ impl SyncHandler { for item in tx_rlp { let hash = item.as_val::().map_err(|_| DownloaderImportError::Invalid)?; - if io.chain().pooled_transaction(hash).is_none() { + if io.chain().queued_transaction(hash).is_none() { let unfetched = sync.unfetched_pooled_transactions.entry(hash).or_insert_with(|| super::UnfetchedTransaction { announcer: peer_id, next_fetch: Instant::now(), diff --git a/ethcore/sync/src/chain/supplier.rs b/ethcore/sync/src/chain/supplier.rs index c6a95056604..f3a27ef9cbc 100644 --- a/ethcore/sync/src/chain/supplier.rs +++ b/ethcore/sync/src/chain/supplier.rs @@ -224,7 +224,7 @@ impl SyncSupplier { const LIMIT: usize = 256; let transactions = r.iter().take(LIMIT).filter_map(|v| { - v.as_val::().ok().and_then(|hash| io.chain().pooled_transaction(hash)) + v.as_val::().ok().and_then(|hash| io.chain().queued_transaction(hash)) }).collect::>(); let added = transactions.len();