Update blackify version (#142)

Also tweak imports and testing dependency installation

Author: mflaxman

.github/workflows/python.yml

@@ -64,10 +64,9 @@ jobs:
     - uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    # HACK: Since unit tests are super slow, we only install pytest and not the rest of the testing dependencies
-    - name: Install pytest
+    - name: Install python testing dependencies
       run: |
-        python -m pip install pytest==6.2.5
+        pip install -r requirements-test.txt
     - name: pytest unit tests
       run: |
         pytest -v buidl/test

buidl/bech32.py

@@ -12,12 +12,12 @@
 BECH32M_CONSTANT = 0x2BC830A3
 
 PREFIX = {
-    'mainnet': 'bc',
-    'testnet': 'tb',
-    'regtest': 'bcrt',
-    'signet': 'tb',
+    "mainnet": "bc",
+    "testnet": "tb",
+    "regtest": "bcrt",
+    "signet": "tb",
 }
-NET_FOR_PREFIX = {v: k for k, v in PREFIX.items() if k != 'signet'}
+NET_FOR_PREFIX = {v: k for k, v in PREFIX.items() if k != "signet"}
 
 
 def uses_only_bech32_chars(string):
@@ -188,7 +188,7 @@ def encode_bech32_checksum(s, network="mainnet"):
 
 def decode_bech32(s):
     """Returns network, segwit version and the hash from the bech32 address"""
-    regtest_prefix = PREFIX['regtest']
+    regtest_prefix = PREFIX["regtest"]
     if s.startswith(regtest_prefix):
         hrp, raw_data = regtest_prefix, s[5:]
     else:

buidl/blinding.py

@@ -30,7 +30,7 @@ def secure_secret_path(depth=4):
     to_return = ["m"]
     for _ in range(depth):
         # https://bitcoin.stackexchange.com/questions/92056/what-is-the-max-allowed-depth-for-bip32-derivation-paths#comment105756_92057
-        rand_int = randbelow(2 ** 31 - 1)
+        rand_int = randbelow(2**31 - 1)
         to_return.append(str(rand_int))
     return "/".join(to_return)
 

buidl/cecc.py

@@ -19,7 +19,7 @@
     ),
     lib.secp256k1_context_destroy,
 )
-P = 2 ** 256 - 2 ** 32 - 977
+P = 2**256 - 2**32 - 977
 N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
 
 

buidl/compactfilter.py

@@ -12,7 +12,7 @@
 
 BASIC_FILTER_TYPE = 0
 GOLOMB_P = 19
-GOLOMB_M = int(round(1.497137 * 2 ** GOLOMB_P))
+GOLOMB_M = int(round(1.497137 * 2**GOLOMB_P))
 
 
 def _siphash(key, value):

buidl/hd.py

@@ -779,7 +779,7 @@ def is_valid_bip32_path(path):
             return False
         if int(sub_path) < 0:
             return False
-        if int(sub_path) >= 2 ** 31:
+        if int(sub_path) >= 2**31:
             # https://bitcoin.stackexchange.com/a/92057
             return False
 

buidl/helper.py

@@ -13,7 +13,6 @@ def _siphash(key, value):
             raise ValueError("Key should be 16 bytes")
         return little_endian_to_int(siphash24(key, value))
 
-
 except ModuleNotFoundError:
     from buidl.siphash import SipHash_2_4
 
@@ -33,7 +32,7 @@ def _siphash(key, value):
 BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
 PBKDF2_ROUNDS = 2048
 GOLOMB_P = 19
-GOLOMB_M = int(round(1.497137 * 2 ** GOLOMB_P))
+GOLOMB_M = int(round(1.497137 * 2**GOLOMB_P))
 TWO_WEEKS = 60 * 60 * 24 * 14
 MAX_TARGET = 0xFFFF * 256 ** (0x1D - 3)
 

buidl/network.py

@@ -125,7 +125,7 @@ def __init__(
         self.sender_ip = sender_ip
         self.sender_port = sender_port
         if nonce is None:
-            self.nonce = int_to_little_endian(randint(0, 2 ** 64), 8)
+            self.nonce = int_to_little_endian(randint(0, 2**64), 8)
         else:
             self.nonce = nonce
         self.user_agent = user_agent

buidl/pecc.py

@@ -113,7 +113,7 @@ def __init__(self, x, y, a, b):
             return
         # make sure that the elliptic curve equation is satisfied
         # y**2 == x**3 + a*x + b
-        if self.y ** 2 != self.x ** 3 + a * x + b:
+        if self.y**2 != self.x**3 + a * x + b:
             # if not, raise a ValueError
             raise ValueError(f"({self.x}, {self.y}) is not on the curve")
 
@@ -158,7 +158,7 @@ def __add__(self, other):
             # s=(y2-y1)/(x2-x1)
             s = (other.y - self.y) / (other.x - self.x)
             # x3=s**2-x1-x2
-            x = s ** 2 - self.x - other.x
+            x = s**2 - self.x - other.x
             # y3=s*(x1-x3)-y1
             y = s * (self.x - x) - self.y
             return self.__class__(x, y, self.a, self.b)
@@ -167,9 +167,9 @@ def __add__(self, other):
         else:
             # Formula (x3,y3)=(x1,y1)+(x1,y1)
             # s=(3*x1**2+a)/(2*y1)
-            s = (3 * self.x ** 2 + self.a) / (2 * self.y)
+            s = (3 * self.x**2 + self.a) / (2 * self.y)
             # x3=s**2-2*x1
-            x = s ** 2 - 2 * self.x
+            x = s**2 - 2 * self.x
             # y3=s*(x1-x3)-y1
             y = s * (self.x - x) - self.y
             return self.__class__(x, y, self.a, self.b)
@@ -192,7 +192,7 @@ def __rmul__(self, coefficient):
 
 A = 0
 B = 7
-P = 2 ** 256 - 2 ** 32 - 977
+P = 2**256 - 2**32 - 977
 N = 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141
 
 
@@ -384,7 +384,7 @@ def parse_sec(cls, sec_bin):
         is_even = sec_bin[0] == 2
         x = S256Field(int(sec_bin[1:].hex(), 16))
         # right side of the equation y^2 = x^3 + 7
-        alpha = x ** 3 + S256Field(B)
+        alpha = x**3 + S256Field(B)
         # solve for left side
         beta = alpha.sqrt()
         if beta.num % 2 == 0:
@@ -407,7 +407,7 @@ def parse_bip340(cls, bip340_bin):
             return cls(None, None)
         x = S256Field(n)
         # right side of the equation y^2 = x^3 + 7
-        alpha = x ** 3 + S256Field(B)
+        alpha = x**3 + S256Field(B)
         # solve for left side
         beta = alpha.sqrt()
         if beta.num % 2 == 1:

buidl/test/test_ecc.py

@@ -22,11 +22,11 @@ def test_pubpoint(self):
                 "04C982196A7466FBBBB0E27A940B6AF926C1A74D5AD07128C82824A11B5398AFDA7A91F9EAE64438AFB9CE6448A1C133DB2D8FB9254E4546B6F001637D50901F55",
             ),
             (
-                2 ** 128,
+                2**128,
                 "048F68B9D2F63B5F339239C1AD981F162EE88C5678723EA3351B7B444C9EC4C0DA662A9F2DBA063986DE1D90C2B6BE215DBBEA2CFE95510BFDF23CBF79501FFF82",
             ),
             (
-                2 ** 240 + 2 ** 31,
+                2**240 + 2**31,
                 "049577FF57C8234558F293DF502CA4F09CBC65A6572C842B39B366F2171794511610B49C67FA9365AD7B90DAB070BE339A1DAF9052373EC30FFAE4F72D5E66D053",
             ),
         )
@@ -45,7 +45,7 @@ def test_pubpoint(self):
         self.assertEqual(sum_secrets * G, S256Point.combine(point_objects))
 
     def test_sec(self):
-        coefficient = 999 ** 3
+        coefficient = 999**3
         uncompressed = "049d5ca49670cbe4c3bfa84c96a8c87df086c6ea6a24ba6b809c9de234496808d56fa15cc7f3d38cda98dee2419f415b7513dde1301f8643cd9245aea7f3f911f9"
         compressed = (
             "039d5ca49670cbe4c3bfa84c96a8c87df086c6ea6a24ba6b809c9de234496808d5"
@@ -73,7 +73,7 @@ def test_sec(self):
     def test_address(self):
         tests = (
             (
-                888 ** 3,
+                888**3,
                 "148dY81A9BmdpMhvYEVznrM45kWN32vSCN",
                 "mnabU9NCcRE5zcNZ2C16CnvKPELrFvisn3",
             ),
@@ -101,7 +101,7 @@ def test_address(self):
     def test_p2wpkh_address(self):
         tests = (
             (
-                888 ** 3,
+                888**3,
                 "bc1qyfvunnpszmjwcqgfk9dsne6j4edq3fglx9y5x7",
                 "tb1qyfvunnpszmjwcqgfk9dsne6j4edq3fglvrl8ad",
             ),
@@ -126,7 +126,7 @@ def test_p2wpkh_address(self):
     def test_p2sh_p2wpkh_address(self):
         tests = (
             (
-                888 ** 3,
+                888**3,
                 "32cE3VHX5k1Z4gDCJBXMSLgd1akUzvqNvH",
                 "2MtAS7EDYhCWuGTqjyK9E4HftDvxek7ELQn",
             ),

buidl/test/test_mnemonic.py

@@ -30,9 +30,9 @@ def test_secure_mnemonic_extra_entropy(self):
             # num_bits, num_words, extra_entropy
             (128, 12, 0),
             (160, 15, 1),
-            (192, 18, 2 ** 128),
-            (224, 21, 2 ** 256),
-            (256, 24, 2 ** 512),
+            (192, 18, 2**128),
+            (224, 21, 2**256),
+            (256, 24, 2**512),
         )
 
         for num_bits, num_words, extra_entropy in tests:

buidl/test/test_network.py

@@ -1,8 +1,6 @@
-from unittest import TestCase
-import unittest  # for skipunless
-
 from io import BytesIO
 from os import getenv
+from unittest import TestCase, skipUnless
 
 from buidl.block import Block
 from buidl.bloomfilter import BloomFilter
@@ -100,9 +98,9 @@ def test_serialize(self):
         self.assertEqual(get_data.serialize().hex(), hex_msg)
 
 
-@unittest.skipUnless(
+@skipUnless(
     getenv("INCLUDE_NETWORK_TESTS"),
-    reason="Requires network connection, so may not be unreliable",
+    reason="Requires (unreliable) network connection",
 )
 class SimpleNodeTest(TestCase):
     def test_handshake(self):

buidl/test/test_pecc.py

@@ -35,20 +35,20 @@ def test_mul(self):
 
     def test_pow(self):
         a = FieldElement(17, 31)
-        self.assertEqual(a ** 3, FieldElement(15, 31))
+        self.assertEqual(a**3, FieldElement(15, 31))
         a = FieldElement(5, 31)
         b = FieldElement(18, 31)
-        self.assertEqual(a ** 5 * b, FieldElement(16, 31))
+        self.assertEqual(a**5 * b, FieldElement(16, 31))
 
     def test_div(self):
         a = FieldElement(3, 31)
         b = FieldElement(24, 31)
         self.assertEqual(a / b, FieldElement(4, 31))
         a = FieldElement(17, 31)
-        self.assertEqual(a ** -3, FieldElement(29, 31))
+        self.assertEqual(a**-3, FieldElement(29, 31))
         a = FieldElement(4, 31)
         b = FieldElement(11, 31)
-        self.assertEqual(a ** -4 * b, FieldElement(13, 31))
+        self.assertEqual(a**-4 * b, FieldElement(13, 31))
 
 
 class PointTest(TestCase):

buidl/test/test_tx.py

@@ -1,11 +1,10 @@
 from buidl.ecc import PrivateKey, Signature
 from buidl.script import RedeemScript, WitnessScript
-from buidl.tx import Tx, TxIn, TxOut, TxFetcher
-
 from buidl.test import OfflineTestCase
+from buidl.tx import Tx, TxIn, TxOut, TxFetcher
 
-import unittest  # for skipUnless
 from os import getenv
+from unittest import skipUnless
 from urllib.error import HTTPError
 
 
@@ -429,11 +428,11 @@ def test_coinbase_height(self):
         self.assertIsNone(tx.coinbase_height())
 
 
+@skipUnless(
+    getenv("INCLUDE_NETWORK_TESTS"),
+    reason="Requires (unreliable) network connection",
+)
 class TxFetcherTest(OfflineTestCase):
-    @unittest.skipUnless(
-        getenv("INCLUDE_NETWORK_TESTS"),
-        reason="Requires network connection, so may not be unreliable",
-    )
     def test_broadcast_duplicate_tx_spent_signet(self):
         tx_hex = "020000000001017bf99a29dd2f9968ca9a075e85b43a638b600bcc49fd9ba0ac8eaf2fa8d851330000000000feffffff02a0860100000000001600149253a4d3d120add0ddd578a5cca6139891503cb917ef7d9c4f060000160014f59bb0a324f3f6026574c1186b4f7e82de9ed77e0247304402201d7531c7aff722a10f4c97ea52bd10ae48dda497d514d0c8d491e80c9981daa0022036b67fb050b0e503ebba71578e2f5c35118b4f0cfa65f0ded1605c896e3c09ce012102eb882bb156e79619d5cd9089be277b39980830030e2ee2c5a07deed3fa1aba7ff9940100"
 
@@ -443,10 +442,6 @@ def test_broadcast_duplicate_tx_spent_signet(self):
         self.assertEqual(400, fail.exception.code)
         self.assertIn("missingorspent", fail.exception.read().decode())
 
-    @unittest.skipUnless(
-        getenv("INCLUDE_NETWORK_TESTS"),
-        reason="Requires network connection, so may not be unreliable",
-    )
     def test_broadcast_duplicate_tx_spent_testnet(self):
         tx_hex = "020000000001018b526b2fecec943908bbc2e61edbbe8182af32cdfaac3f3f97a07550c0221bc800000000171600145d2f5871d3b1c9a72e86071645fbff06634cdc00feffffff028c12d10300000000160014b2f894963b3bdb3dcf46e0eb06817aa0fd65cda050c30000000000001600143d9e1c6c27c4dd45816cedb9334672da6eea27a102473044022000f991d8a8556efa902a482c836557bde98fece79ed428b248d23480315e24780220461d4fc104d1af74967ba6a2ecd994746b243bf2c74b55ee25e6d170e778caa3012102fdd06a74d4791846e0f86239c7dbbf208afc7eb6108620b8ee842ebab1b1c6f2c4b72300"
 

buidl/tx.py

@@ -92,7 +92,9 @@ def dump_cache(cls, filename):
     def sendrawtransaction(cls, signed_tx_hex_str, network="mainnet"):
         """Broadcasts a signed transaction."""
         url = "{}/tx".format(cls.get_url(network=network))
-        req = Request(url, data=signed_tx_hex_str.encode(), headers={"User-Agent": "Mozilla/5.0"})
+        req = Request(
+            url, data=signed_tx_hex_str.encode(), headers={"User-Agent": "Mozilla/5.0"}
+        )
         response = urlopen(req)
         return response.read().decode("utf-8")  # returns the txid if successful
 

requirements-test.txt

@@ -1,4 +1,4 @@
-black==21.10b0
-flake8==3.8.4
+black==22.6.0
+flake8==5.0.4
 pexpect==4.8.0
 pytest==6.2.5