Added more tests and moved implementation to getTransactionByBlock

Author: ankitchiplunkar

web3/eth.py

@@ -196,6 +196,13 @@ def getTransaction(self, transaction_hash):
         )
 
     def getTransactionFromBlock(self, block_identifier, transaction_index):
+        """
+        Alias for the method getTransactionByBlock
+        Depreceated to maintain naming consistency with the json-rpc API
+        """
+        return self.getTransactionByBlock(block_identifier, transaction_index)
+
+    def getTransactionByBlock(self, block_identifier, transaction_index):
         """
         `eth_getTransactionByBlockHashAndIndex`
         `eth_getTransactionByBlockNumberAndIndex`
@@ -211,13 +218,6 @@ def getTransactionFromBlock(self, block_identifier, transaction_index):
             [block_identifier, transaction_index],
         )
 
-    def getTransactionByBlock(self, block_identifier, transaction_index):
-        """
-        Alias for the method getTransactionFromBlock
-        More details here: https://github.com/ethereum/web3.py/pull/857
-        """
-        return self.getTransactionFromBlock(block_identifier, transaction_index)
-
     def waitForTransactionReceipt(self, transaction_hash, timeout=120):
         return wait_for_transaction_receipt(self.web3, transaction_hash, timeout)
 

web3/utils/module_testing/eth_module.py

@@ -511,6 +511,11 @@ def test_eth_getTransactionFromBlockNumberAndIndex(self, web3, block_with_txn, m
         assert is_dict(transaction)
         assert transaction['hash'] == HexBytes(mined_txn_hash)
 
+    def test_eth_getTransactionByBlockHashAndIndex(self, web3, block_with_txn, mined_txn_hash):
+        transaction = web3.eth.getTransactionByBlock(block_with_txn['hash'], 0)
+        assert is_dict(transaction)
+        assert transaction['hash'] == HexBytes(mined_txn_hash)
+
     def test_eth_getTransactionByBlockNumberAndIndex(self, web3, block_with_txn, mined_txn_hash):
         transaction = web3.eth.getTransactionByBlock(block_with_txn['number'], 0)
         assert is_dict(transaction)