From 6f772a28e2e44d1d5f49aa4cc83020599ecae3bf Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Tue, 27 Sep 2016 12:16:42 +0200
Subject: [PATCH] Reorder transaction_by_hash to favour canon search (#2331)

* Reorder transaction_by_hash to favour canon search

* Fix test.
---
 ethcore/src/client/test_client.rs |  4 ++--
 rpc/src/v1/impls/eth.rs           | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs
index 212dead9a..6f96c71b1 100644
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -348,11 +348,11 @@ impl BlockChainClient for TestBlockChainClient {
 	}
 
 	fn transaction(&self, _id: TransactionID) -> Option<LocalizedTransaction> {
-		unimplemented!();
+		None
 	}
 
 	fn uncle(&self, _id: UncleID) -> Option<Bytes> {
-		unimplemented!();
+		None
 	}
 
 	fn transaction_receipt(&self, id: TransactionID) -> Option<LocalizedReceipt> {
diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
index fa5ee459e..5aced9d0c 100644
--- a/rpc/src/v1/impls/eth.rs
+++ b/rpc/src/v1/impls/eth.rs
@@ -433,11 +433,14 @@ impl<C, S: ?Sized, M, EM> Eth for EthClient<C, S, M, EM> where
 		try!(self.active());
 		from_params::<(RpcH256,)>(params)
 			.and_then(|(hash,)| {
-				let miner = take_weak!(self.miner);
 				let hash: H256 = hash.into();
-				match miner.transaction(&hash) {
-					Some(pending_tx) => to_value(&Transaction::from(pending_tx)),
-					None => self.transaction(TransactionID::Hash(hash))
+				let miner = take_weak!(self.miner);
+				let client = take_weak!(self.client);
+				let maybe_tx = client.transaction(TransactionID::Hash(hash)).map(Transaction::from)
+					.or_else(|| miner.transaction(&hash).map(Transaction::from));
+				match maybe_tx {
+					Some(t) => to_value(&t),
+					None => Ok(Value::Null),
 				}
 			})
 	}