run black

Author: pacrob

.git-blame-ignore-revs

@@ -1,2 +1,2 @@
 # ignore SHA that added isort
-2f421ce6049dc74a1520280adf8c350c1c567e9f
+e9049224a98439cc27522e322cc09e402503565a

Makefile

@@ -27,6 +27,7 @@ lint:
 
 lint-roll:
 	isort eth tests
+	black eth tests scripts setup.py
 	$(MAKE) lint
 
 test:

docs/conf.py

@@ -15,85 +15,85 @@
 import os
 
 about_fields = [
-    'author',
-    'description',
-    'name',
-    'url',
-    'version',
+    "author",
+    "description",
+    "name",
+    "url",
+    "version",
 ]
 
 about = {}
 
-DIR = os.path.dirname('__file__')
-with open(os.path.join(DIR, '../setup.py'), 'r') as f:
+DIR = os.path.dirname("__file__")
+with open(os.path.join(DIR, "../setup.py"), "r") as f:
     for line in f:
         for field in about_fields:
-            if ' ' + field + '=' in line:
-                about['__%s__' % field] = line.split('\'')[1]
+            if " " + field + "=" in line:
+                about["__%s__" % field] = line.split('"')[1]
 
 
 # -- General configuration ------------------------------------------------
 
 #  Defined in requirements-docs.txt, force another check here.
 #  Note: Only refuses to build if sphinx too **old**.
-needs_sphinx = '1.5'
+needs_sphinx = "1.5"
 
 extensions = [
-    'sphinx.ext.todo',
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinxcontrib.asyncio',
+    "sphinx.ext.todo",
+    "sphinx.ext.autodoc",
+    "sphinx.ext.doctest",
+    "sphinx.ext.intersphinx",
+    "sphinxcontrib.asyncio",
 ]
 
 autodoc_default_options = {
-    'undoc-members': None,
+    "undoc-members": None,
 }
 
-autodoc_member_order = 'groupwise'
+autodoc_member_order = "groupwise"
 autodoc_mock_imports = ["snappy"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = about['__name__']
-copyright = '2017-2018 Ethereum Foundation'
-author = about['__author__']
+project = about["__name__"]
+copyright = "2017-2018 Ethereum Foundation"
+author = about["__author__"]
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 
 # The short X.Y version.
-version = about['__version__']
+version = about["__version__"]
 # The full version, including alpha/beta/rc tags.
-release = about['__version__']
+release = about["__version__"]
 
 # The language for content autogenerated by Sphinx.
-language = 'en'
+language = "en"
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
 exclude_patterns = [
-    '_build',
-    'Thumbs.db',
-    '.DS_Store',
-    'modules.rst',
+    "_build",
+    "Thumbs.db",
+    ".DS_Store",
+    "modules.rst",
 ]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
@@ -103,7 +103,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'sphinx_rtd_theme'
+html_theme = "sphinx_rtd_theme"
 
 # Using Alabaster by default, reference for options is:
 # http://alabaster.readthedocs.io/en/latest/customization.html
@@ -116,22 +116,24 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
+
 
 def setup(app):
     app.add_stylesheet("css/custom.css")
     app.add_javascript("js/matomo.js")
 
+
 # Allows the mod index to function more helpfully (not everything under 'e')
-modindex_common_prefix = ['eth.']
+modindex_common_prefix = ["eth."]
 
 ##
 #  Below be monsters, for now.  You've been warned.
 ##
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'py-evmdoc'
+htmlhelp_basename = "py-evmdoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -140,15 +142,12 @@ def setup(app):
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -158,8 +157,7 @@ def setup(app):
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'py-evm.tex', 'py-evm Documentation',
-     about['__author__'], 'manual'),
+    (master_doc, "py-evm.tex", "py-evm Documentation", about["__author__"], "manual"),
 ]
 
 
@@ -168,8 +166,7 @@ def setup(app):
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, about['__name__'], 'py-evm Documentation',
-     about['__author__'], 1)
+    (master_doc, about["__name__"], "py-evm Documentation", about["__author__"], 1)
 ]
 
 
@@ -179,23 +176,30 @@ def setup(app):
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, about['__name__'], 'py-evm Documentation',
-     about['__author__'], about['__name__'], about['__description__'],
-     'Miscellaneous'),
+    (
+        master_doc,
+        about["__name__"],
+        "py-evm Documentation",
+        about["__author__"],
+        about["__name__"],
+        about["__description__"],
+        "Miscellaneous",
+    ),
 ]
 
 # -- Intersphinx configuration ------------------------------------------------
 
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3.9', None),
-    'eth-typing': ('https://eth-typing.readthedocs.io/en/latest', None),
+    "python": ("https://docs.python.org/3.9", None),
+    "eth-typing": ("https://eth-typing.readthedocs.io/en/latest", None),
 }
 
 # -- Doctest configuration ----------------------------------------
 
 import doctest
 
-doctest_default_flags = (0
+doctest_default_flags = (
+    0
     | doctest.DONT_ACCEPT_TRUE_FOR_1
     | doctest.ELLIPSIS
     | doctest.IGNORE_EXCEPTION_DETAIL

eth/_utils/address.py

@@ -13,17 +13,17 @@
 
 def force_bytes_to_address(value: bytes) -> Address:
     trimmed_value = value[-20:]
-    padded_value = trimmed_value.rjust(20, b'\x00')
+    padded_value = trimmed_value.rjust(20, b"\x00")
     return Address(padded_value)
 
 
 def generate_contract_address(address: Address, nonce: int) -> Address:
     return force_bytes_to_address(keccak(rlp.encode([address, nonce])))
 
 
-def generate_safe_contract_address(address: Address,
-                                   salt: int,
-                                   call_data: bytes) -> Address:
+def generate_safe_contract_address(
+    address: Address, salt: int, call_data: bytes
+) -> Address:
     return force_bytes_to_address(
-        keccak(b'\xff' + address + int_to_bytes32(salt) + keccak(call_data))
+        keccak(b"\xff" + address + int_to_bytes32(salt) + keccak(call_data))
     )

eth/_utils/blake2/coders.py

@@ -14,15 +14,18 @@
     TMessageBlock,
 )
 
-TMessage = Tuple[int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int]
+TMessage = Tuple[
+    int, int, int, int, int, int, int, int, int, int, int, int, int, int, int, int
+]
 TFCompressArgs = Tuple[int, TMessageBlock, TMessage, Tuple[int, int], bool]
 
 
 def extract_blake2b_parameters(input_bytes: bytes) -> TFCompressArgs:
     num_bytes = len(input_bytes)
     if num_bytes != 213:
         raise ValidationError(
-            f"input length for Blake2 F precompile should be exactly 213 bytes, got: {num_bytes}"
+            "input length for Blake2 F precompile should be exactly 213 bytes, got: "
+            f"{num_bytes}"
         )
 
     rounds = to_int(input_bytes[:4])
@@ -31,7 +34,9 @@ def extract_blake2b_parameters(input_bytes: bytes) -> TFCompressArgs:
 
     message = cast(TMessage, _get_64_bit_little_endian_words(input_bytes[68:196]))
 
-    t_offset_counters = cast(Tuple[int, int], _get_64_bit_little_endian_words(input_bytes[196:212]))
+    t_offset_counters = cast(
+        Tuple[int, int], _get_64_bit_little_endian_words(input_bytes[196:212])
+    )
 
     final_block_int = to_int(input_bytes[212])
     if final_block_int == 0:
@@ -40,7 +45,8 @@ def extract_blake2b_parameters(input_bytes: bytes) -> TFCompressArgs:
         final_block_flag = True
     else:
         raise ValidationError(
-            f"incorrect final block indicator flag, needed 0 or 1, got: {final_block_int}"
+            "incorrect final block indicator flag, needed 0 or 1, got: "
+            f"{final_block_int}"
         )
 
     return rounds, h_state, message, t_offset_counters, final_block_flag

eth/_utils/blake2/compression.py

@@ -29,7 +29,7 @@
 
 
 class Blake2:
-    """ Blake2 is a base class for Blake2b and Blake2s """
+    """Blake2 is a base class for Blake2b and Blake2s"""
 
     # for more than 10 rounds, the schedule wraps around to the beginning
     sigma_schedule = (
@@ -47,16 +47,19 @@ class Blake2:
 
 
 class Blake2b(Blake2):
-
     WORDBITS = 64
-    MASKBITS = 2 ** WORDBITS - 1
-    WORDFMT = 'Q'
+    MASKBITS = 2**WORDBITS - 1
+    WORDFMT = "Q"
 
     IV = (
-        0x6a09e667f3bcc908, 0xbb67ae8584caa73b,
-        0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1,
-        0x510e527fade682d1, 0x9b05688c2b3e6c1f,
-        0x1f83d9abfb41bd6b, 0x5be0cd19137e2179
+        0x6A09E667F3BCC908,
+        0xBB67AE8584CAA73B,
+        0x3C6EF372FE94F82B,
+        0xA54FF53A5F1D36F1,
+        0x510E527FADE682D1,
+        0x9B05688C2B3E6C1F,
+        0x1F83D9ABFB41BD6B,
+        0x5BE0CD19137E2179,
     )
 
     ROT1 = 32
@@ -69,11 +72,12 @@ class Blake2b(Blake2):
 
 
 def blake2b_compress(
-        num_rounds: int,
-        h_starting_state: TMessageBlock,
-        block: bytes,
-        t_offset_counters: Tuple[int, int],
-        final_block_flag: bool) -> bytes:
+    num_rounds: int,
+    h_starting_state: TMessageBlock,
+    block: bytes,
+    t_offset_counters: Tuple[int, int],
+    final_block_flag: bool,
+) -> bytes:
     """
     'F Compression' from section 3.2 of RFC 7693:
     https://tools.ietf.org/html/rfc7693#section-3.2
@@ -98,10 +102,10 @@ def blake2b_compress(
     sigma_schedule_len = len(sigma_schedule)
 
     # convert block (bytes) into 16 LE words
-    m = struct.unpack_from('<16%s' % Blake2b.WORDFMT, bytes(block))
+    m = struct.unpack_from("<16%s" % Blake2b.WORDFMT, bytes(block))
 
     v = [0] * 16
-    v[0: 8] = h_starting_state
+    v[0:8] = h_starting_state
     v[8:12] = IV[:4]
     v[12] = t_offset_counters[0] ^ IV[4]
     v[13] = t_offset_counters[1] ^ IV[5]
@@ -177,4 +181,4 @@ def G(a: int, b: int, c: int, d: int) -> None:
         G(3, 4, 9, 14)
 
     result_message_words = (h_starting_state[i] ^ v[i] ^ v[i + 8] for i in range(8))
-    return struct.pack(f'<8{Blake2b.WORDFMT}', *result_message_words)
+    return struct.pack(f"<8{Blake2b.WORDFMT}", *result_message_words)