refactored function name: queued_transaction_if_readable to transaction_if_readable

Author: SurfingNerd

crates/ethcore/src/client/client.rs

@@ -2426,7 +2426,7 @@ impl BlockChainClient for Client {
         self.importer.miner.transaction(&hash)
     }
 
-    fn queued_transaction_if_readable(&self, hash: &H256) -> Option<Arc<VerifiedTransaction>> {
+    fn transaction_if_readable(&self, hash: &H256) -> Option<Arc<VerifiedTransaction>> {
         self.importer.miner.transaction_if_readable(&hash)
     }
 

crates/ethcore/src/client/test_client.rs

@@ -1160,6 +1160,10 @@ impl BlockChainClient for TestBlockChainClient {
         self.miner.transaction(tx_hash)
     }
 
+    fn transaction_if_readable(&self, hash: &H256) -> Option<Arc<VerifiedTransaction>> {
+        self.miner.transaction_if_readable(hash)
+    }
+
     /// Returns the devp2p network endpoint IP and Port information that is used to communicate with other peers.
 
     fn reserved_peers_management(&self) -> &Mutex<Option<Box<dyn ReservedPeersManagement>>> {

crates/ethcore/src/client/traits.rs

@@ -353,10 +353,6 @@ pub trait BlockChainClient:
     /// Get pool transaction with a given hash.
     fn queued_transaction(&self, hash: H256) -> Option<Arc<VerifiedTransaction>>;
 
-    /// see queued_transactions(&self).
-    /// Get pool transaction with a given hash, but returns NONE fast, if if cannot acquire a readlock fast.
-    fn queued_transaction_if_readable(&self, hash: &H256) -> Option<Arc<VerifiedTransaction>>;
-
     /// Get uncle with given id.
     fn uncle(&self, id: UncleId) -> Option<encoded::Header>;
 
@@ -427,6 +423,10 @@ pub trait BlockChainClient:
     /// Get verified transaction with specified transaction hash.
     fn transaction(&self, tx_hash: &H256) -> Option<Arc<VerifiedTransaction>>;
 
+    /// see queued_transactions(&self).
+    /// Get pool transaction with a given hash, but returns NONE fast, if if cannot acquire a readlock fast.
+    fn transaction_if_readable(&self, hash: &H256) -> Option<Arc<VerifiedTransaction>>;
+
     /// Sorted list of transaction gas prices from at least last sample_size blocks.
     fn gas_price_corpus(&self, sample_size: usize) -> ::stats::Corpus<U256> {
         let mut h = self.chain_info().best_block_hash;

crates/ethcore/sync/src/chain/handler.rs

@@ -868,7 +868,7 @@ impl SyncHandler {
 
             // if we cant read the pool here, we are asuming we dont know the transaction yet.
             // in the worst case we are refetching a transaction that we already have.
-            if io.chain().queued_transaction_if_readable(&hash).is_none() {
+            if io.chain().transaction_if_readable(&hash).is_none() {
                 sync.peers
                     .get_mut(&peer_id)
                     .map(|peer| peer.unfetched_pooled_transactions.insert(hash));

crates/ethcore/sync/src/chain/supplier.rs

@@ -323,7 +323,7 @@ impl SyncSupplier {
                 // we do not lock here, if we cannot access the memory at this point in time,
                 // we will just skip this transaction, otherwise the other peer might wait to long, resulting in a timeout.
                 // also this solved a potential deadlock situation:
-                if let Some(tx) = io.chain().queued_transaction_if_readable(&hash) {
+                if let Some(tx) = io.chain().transaction_if_readable(&hash) {
                     tx.signed().rlp_append(&mut rlp);
                     added += 1;
                     if rlp.len() > PAYLOAD_SOFT_LIMIT {