Add black linting to tests/core (#2551)

* Add black linting to tests/core

* Fix flake8 lint errors introduced by black

* Add newsfragment

newsfragments/2551.misc.rst

@@ -0,0 +1 @@
+Add black linting to the ``tests/core`` directory

tests/core/admin-module/test_admin_addPeer.py

@@ -2,6 +2,6 @@ def test_admin_add_peer(w3, skip_if_testrpc):
     skip_if_testrpc(w3)
 
     result = w3.geth.admin.add_peer(
-        'enode://44826a5d6a55f88a18298bca4773fca5749cdc3a5c9f308aa7d810e9b31123f3e7c5fba0b1d70aac5308426f47df2a128a6747040a3815cc7dd7167d03be320d@127.0.0.1:30304',  # noqa: E501
+        "enode://44826a5d6a55f88a18298bca4773fca5749cdc3a5c9f308aa7d810e9b31123f3e7c5fba0b1d70aac5308426f47df2a128a6747040a3815cc7dd7167d03be320d@127.0.0.1:30304",  # noqa: E501
     )
     assert result is True

tests/core/admin-module/test_admin_nodeInfo.py

@@ -3,5 +3,5 @@ def test_admin_node_info(w3, skip_if_testrpc):
 
     node_info = w3.geth.admin.node_info
 
-    assert 'enode' in node_info
-    assert 'id' in node_info
+    assert "enode" in node_info
+    assert "id" in node_info

tests/core/conftest.py

@@ -16,50 +16,54 @@
 # --- inherit from `web3.module.Module` class --- #
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module1():
     class Module1(Module):
-        a = 'a'
+        a = "a"
 
         @property
         def b(self):
-            return 'b'
+            return "b"
+
     return Module1
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module2():
     class Module2(Module):
-        c = 'c'
+        c = "c"
 
         @staticmethod
         def d():
-            return 'd'
+            return "d"
+
     return Module2
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module3():
     class Module3(Module):
-        e = 'e'
+        e = "e"
+
     return Module3
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module4():
     class Module4(Module):
-        f = 'f'
+        f = "f"
+
     return Module4
 
 
 # --- do not inherit from `web3.module.Module` class --- #
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module1_unique():
     # uses ``Web3`` instance by accepting it as first arg in the ``__init__()`` method
     class Module1:
-        a = 'a'
+        a = "a"
 
         def __init__(self, w3):
             self._b = "b"
@@ -71,57 +75,60 @@ def b(self):
         @property
         def return_eth_chain_id(self):
             return self.w3.eth.chain_id
+
     return Module1
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module2_unique():
     class Module2:
-        c = 'c'
+        c = "c"
 
         @staticmethod
         def d():
-            return 'd'
+            return "d"
+
     return Module2
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module3_unique():
     class Module3:
-        e = 'e'
+        e = "e"
+
     return Module3
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module4_unique():
     class Module4:
-        f = 'f'
+        f = "f"
+
     return Module4
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope="module")
 def module_many_init_args():
     class ModuleManyArgs:
         def __init__(self, a, b):
             self.a = a
             self.b = b
+
     return ModuleManyArgs
 
 
 @pytest_asyncio.fixture()
 async def async_w3():
     provider = AsyncEthereumTesterProvider()
-    w3 = Web3(provider, modules={'eth': [AsyncEth]},
-              middlewares=provider.middlewares)
+    w3 = Web3(provider, modules={"eth": [AsyncEth]}, middlewares=provider.middlewares)
     w3.eth.default_account = await w3.eth.coinbase
     return w3
 
 
 @pytest_asyncio.fixture()
 async def async_w3_strict_abi():
     provider = AsyncEthereumTesterProvider()
-    w3 = Web3(provider, modules={'eth': [AsyncEth]},
-              middlewares=provider.middlewares)
+    w3 = Web3(provider, modules={"eth": [AsyncEth]}, middlewares=provider.middlewares)
     w3.enable_strict_bytes_type_checking()
     w3.eth.default_account = await w3.eth.coinbase
     return w3

tests/core/contracts/_utils.py

@@ -10,7 +10,7 @@ def deploy(w3, Contract, apply_func=identity, args=None):
     deploy_txn = Contract.constructor(*args).transact()
     deploy_receipt = w3.eth.wait_for_transaction_receipt(deploy_txn)
     assert deploy_receipt is not None
-    address = apply_func(deploy_receipt['contractAddress'])
+    address = apply_func(deploy_receipt["contractAddress"])
     contract = Contract(address=address)
     assert contract.address == address
     assert len(w3.eth.get_code(contract.address)) > 0
@@ -22,7 +22,7 @@ async def async_deploy(async_web3, Contract, apply_func=identity, args=None):
     deploy_txn = await Contract.constructor(*args).transact()
     deploy_receipt = await async_web3.eth.wait_for_transaction_receipt(deploy_txn)
     assert deploy_receipt is not None
-    address = apply_func(deploy_receipt['contractAddress'])
+    address = apply_func(deploy_receipt["contractAddress"])
     contract = Contract(address=address)
     assert contract.address == address
     assert len(await async_web3.eth.get_code(contract.address)) > 0

tests/core/contracts/test_args_and_kwargs_merger.py

@@ -20,17 +20,24 @@
 
 def test_error_when_invalid_args_kwargs_combo_provided():
     with pytest.raises(TypeError):
-        merge_args_and_kwargs(GENERATED_FUNCTION_ABI, (1, 2,), {'a': 1, 'b': 2})
+        merge_args_and_kwargs(
+            GENERATED_FUNCTION_ABI,
+            (
+                1,
+                2,
+            ),
+            {"a": 1, "b": 2},
+        )
 
 
 @pytest.mark.parametrize(
-    'args,kwargs,expected_args',
+    "args,kwargs,expected_args",
     (
         ((1, 4, 2, 3), {}, (1, 4, 2, 3)),
-        ((1, 4, 2), {'d': 3}, (1, 4, 2, 3)),
-        ((1, 4), {'d': 3, 'c': 2}, (1, 4, 2, 3)),
-        ((1,), {'d': 3, 'b': 4, 'c': 2}, (1, 4, 2, 3)),
-        (tuple(), {'d': 3, 'b': 4, 'a': 1, 'c': 2}, (1, 4, 2, 3)),
+        ((1, 4, 2), {"d": 3}, (1, 4, 2, 3)),
+        ((1, 4), {"d": 3, "c": 2}, (1, 4, 2, 3)),
+        ((1,), {"d": 3, "b": 4, "c": 2}, (1, 4, 2, 3)),
+        (tuple(), {"d": 3, "b": 4, "a": 1, "c": 2}, (1, 4, 2, 3)),
     ),
 )
 def test_merging_of_args_and_kwargs(args, kwargs, expected_args):
@@ -66,7 +73,7 @@ def test_merging_of_args_and_kwargs_with_no_inputs():
 
 def test_kwargs_is_disallowed_when_merging_with_unnamed_inputs():
     with pytest.raises(TypeError):
-        merge_args_and_kwargs(GENERATED_FUNCTION_ABI, tuple(), {'x': 1, 'y': 2})
+        merge_args_and_kwargs(GENERATED_FUNCTION_ABI, tuple(), {"x": 1, "y": 2})
 
 
 def test_args_works_when_merging_with_unnamed_inputs():
@@ -94,9 +101,9 @@ def test_args_allowed_when_duplicate_named_inputs():
 
 def test_kwargs_not_allowed_for_duplicate_input_names():
     with pytest.raises(TypeError):
-        merge_args_and_kwargs(DUPLICATE_NAMES_FUNCTION_ABI, (1,), {'a': 2, 'b': 3})
+        merge_args_and_kwargs(DUPLICATE_NAMES_FUNCTION_ABI, (1,), {"a": 2, "b": 3})
 
 
 def test_kwargs_allowed_if_no_intersections_with_duplicate_input_names():
     with pytest.raises(TypeError):
-        merge_args_and_kwargs(DUPLICATE_NAMES_FUNCTION_ABI, (1,), {'a': 2, 'b': 3})
+        merge_args_and_kwargs(DUPLICATE_NAMES_FUNCTION_ABI, (1,), {"a": 2, "b": 3})