fix lint and integration tests

broper2 · Feb 1, 2022 · 8c3c7a4 · 8c3c7a4
1 parent cf47f0c
commit 8c3c7a4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/tests/integration/test_ethereum_tester.py b/tests/integration/test_ethereum_tester.py
@@ -7,6 +7,9 @@
 from eth_tester.exceptions import (
     TransactionFailed,
 )
+from eth_typing import (
+    BlockNumber,
+)
 from eth_utils import (
     is_checksum_address,
     is_dict,
@@ -292,15 +295,12 @@ def test_eth_getBlockByHash_pending(
         block = web3.eth.get_block('pending')
         assert block['hash'] is not None
 
-    @pytest.mark.xfail(reason='eth_feeHistory is not implemented on eth-tester')
     def test_eth_fee_history(self, web3: "Web3"):
         super().test_eth_fee_history(web3)
 
-    @pytest.mark.xfail(reason='eth_feeHistory is not implemented on eth-tester')
     def test_eth_fee_history_with_integer(self, web3: "Web3"):
-        super().test_eth_fee_history_with_integer(web3)
+        super().test_eth_fee_history_with_integer(web3, BlockData(number=BlockNumber(1)))
 
-    @pytest.mark.xfail(reason='eth_feeHistory is not implemented on eth-tester')
     def test_eth_fee_history_no_reward_percentiles(self, web3: "Web3"):
         super().test_eth_fee_history_no_reward_percentiles(web3)
 

diff --git a/web3/eth.py b/web3/eth.py
@@ -359,7 +359,7 @@ async def max_priority_fee(self) -> Wei:
         fee_history = await self.fee_history(20, 'pending', [float(1)])
         priority_fees_per_gas = fee_history['reward']
         fees_sum = sum([fee[0] for fee in priority_fees_per_gas])
-        max_priority_fee_estimate = round(fees_sum/len(priority_fees_per_gas))
+        max_priority_fee_estimate = round(fees_sum / len(priority_fees_per_gas))
         return Wei(max_priority_fee_estimate)
 
     @property
@@ -611,7 +611,7 @@ def max_priority_fee(self) -> Wei:
         fee_history = self.fee_history(20, 'pending', [float(1)])
         priority_fees_per_gas = fee_history['reward']
         fees_sum = sum([fee[0] for fee in priority_fees_per_gas])
-        max_priority_fee_estimate = round(fees_sum/len(priority_fees_per_gas))
+        max_priority_fee_estimate = round(fees_sum / len(priority_fees_per_gas))
         return Wei(max_priority_fee_estimate)
 
     def get_storage_at_munger(

diff --git a/web3/providers/eth_tester/defaults.py b/web3/providers/eth_tester/defaults.py
@@ -214,8 +214,11 @@ def personal_send_transaction(eth_tester: "EthereumTester", params: Any) -> HexS
         'hashrate': static_return(0),
         'chainId': static_return('0x3d'),
         'feeHistory': static_return(
-            {'baseFeePerGas': [134919017071, 134775902021, 117928914269], 'gasUsedRatio': [0.4957570088140204, 0.0],
-             'oldestBlock': 13865084, 'reward': [[2500000000], [1500000000]]}),
+            {'baseFeePerGas': [134919017071, 134775902021, 117928914269],
+             'gasUsedRatio': [0.4957570088140204, 0.0],
+             'oldestBlock': 13865084,
+             'reward': [[2500000000], [1500000000]]}
+        ),
         'maxPriorityFeePerGas': static_return(10 ** 9),
         'gasPrice': static_return(10 ** 9),  # must be >= base fee post-London
         'accounts': call_eth_tester('get_accounts'),