Client::transaction -> Client::block_transaction

openethereum · Apr 24, 2020 · b2ea4b7 · b2ea4b7
1 parent f8b22e2
commit b2ea4b7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ethcore/client-traits/src/lib.rs b/ethcore/client-traits/src/lib.rs
@@ -285,7 +285,7 @@ pub trait BlockChainClient:
  fn list_storage(&self, id: BlockId, account: &Address, after: Option<&H256>, count: Option<u64>) -> Option<Vec<H256>>;
 
  /// Get transaction with given hash.
- fn transaction(&self, id: TransactionId) -> Option<LocalizedTransaction>;
+ fn block_transaction(&self, id: TransactionId) -> Option<LocalizedTransaction>;
 
  /// Get pool transaction with a given hash.
  fn pooled_transaction(&self, hash: H256) -> Option<Arc<VerifiedTransaction>>;

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -1885,7 +1885,7 @@ impl BlockChainClient for Client {
  Some(keys)
  }
 
- fn transaction(&self, id: TransactionId) -> Option<LocalizedTransaction> {
+ fn block_transaction(&self, id: TransactionId) -> Option<LocalizedTransaction> {
  self.transaction_address(id).and_then(|address| self.chain.read().transaction(&address))
  }
 

diff --git a/ethcore/src/test_helpers/test_client.rs b/ethcore/src/test_helpers/test_client.rs
@@ -738,7 +738,7 @@ impl BlockChainClient for TestBlockChainClient {
  fn list_storage(&self, _id: BlockId, _account: &Address, _after: Option<&H256>, _count: Option<u64>) -> Option<Vec<H256>> {
  None
  }
- fn transaction(&self, _id: TransactionId) -> Option<LocalizedTransaction> {
+ fn block_transaction(&self, _id: TransactionId) -> Option<LocalizedTransaction> {
  None // Simple default.
  }
  fn pooled_transaction(&self, _hash: H256) -> Option<Arc<VerifiedTransaction>> {

diff --git a/rpc/src/v1/impls/eth.rs b/rpc/src/v1/impls/eth.rs
@@ -309,7 +309,7 @@ impl<C, SN: ?Sized, S: ?Sized, M, EM, T> EthClient<C, SN, S, M, EM> where
  }
 
  fn transaction(&self, id: PendingTransactionId) -> Result<Option<Transaction>> {
- let client_transaction = |id| match self.client.transaction(id) {
+ let client_transaction = |id| match self.client.block_transaction(id) {
  Some(t) => Ok(Some(Transaction::from_localized(t))),
  None => Ok(None),
  };