upgrade typing

move constants
ethereum · Mar 5, 2019 · b76f5d8 · b76f5d8
1 parent e95a50e
commit b76f5d8
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 22 deletions.
diff --git a/py_ecc/bls_api/api.py b/py_ecc/bls_api/api.py
@@ -1,6 +1,11 @@
 from typing import (
     Sequence,
 )
+from eth_typing import (
+    BLSPubkey,
+    BLSSignature,
+    Hash32,
+)
 from eth_utils import (
     ValidationError,
 )
@@ -16,11 +21,8 @@
     pairing,
 )
 from .typing import (
-    BLSPubkey,
-    BLSSignature,
     G1Uncompressed,
     G2Uncompressed,
-    Hash32,
 )
 from .utils import (
     G1_to_pubkey,

diff --git a/py_ecc/bls_api/constants.py b/py_ecc/bls_api/constants.py
@@ -1,4 +1,14 @@
+from py_ecc.optimized_bls12_381 import (
+    FQ2,
+    field_modulus as q,
+)
 
+G2_cofactor = 305502333931268344200999753193121504214466019254188142667664032982267604182971884026507427359259977847832272839041616661285803823378372096355777062779109  # noqa: E501
+FQ2_order = q ** 2 - 1
+eighth_roots_of_unity = tuple(
+    FQ2([1, 1]) ** ((FQ2_order * k) // 8)
+    for k in range(8)
+)
 
 POW_2_381 = 2**381
 POW_2_382 = 2**382

diff --git a/py_ecc/bls_api/hash.py b/py_ecc/bls_api/hash.py
@@ -1,4 +1,4 @@
-from .typing import Hash32
+from eth_typing import Hash32
 from eth_hash.auto import keccak
 from typing import Union
 

diff --git a/py_ecc/bls_api/typing.py b/py_ecc/bls_api/typing.py
@@ -10,12 +10,6 @@
     FQ2,
 )
 
-
-Hash32 = NewType("Hash32", bytes)
-BLSPubkey = NewType('BLSPubkey', bytes)  # bytes48
-BLSSignature = NewType('BLSSignature', bytes)  # bytes96
-
-
 G1Uncompressed = NewType('G1Uncompressed', Tuple[FQ, FQ, FQ])
 G1Compressed = NewType('G1Compressed', int)
 

diff --git a/py_ecc/bls_api/utils.py b/py_ecc/bls_api/utils.py
@@ -4,7 +4,11 @@
     Tuple,
     Union,
 )
-
+from eth_typing import (
+    BLSPubkey,
+    BLSSignature,
+    Hash32,
+)
 from eth_utils import (
     big_endian_to_int,
 )
@@ -26,27 +30,20 @@
     hash_eth2,
 )
 from .typing import (
-    BLSPubkey,
-    BLSSignature,
     G1Compressed,
     G1Uncompressed,
     G2Compressed,
     G2Uncompressed,
-    Hash32,
 )
 from .constants import (
+    G2_cofactor,
+    FQ2_order,
+    eighth_roots_of_unity,
     POW_2_381,
     POW_2_382,
     POW_2_383,
 )
 
-G2_cofactor = 305502333931268344200999753193121504214466019254188142667664032982267604182971884026507427359259977847832272839041616661285803823378372096355777062779109  # noqa: E501
-FQ2_order = q ** 2 - 1
-eighth_roots_of_unity = [
-    FQ2([1, 1]) ** ((FQ2_order * k) // 8)
-    for k in range(8)
-]
-
 
 #
 # Helpers

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@
     package_data={'py_ecc': ['py.typed']},
     install_requires=[
         "eth-hash[pycryptodome]",
-        "eth-typing>=2.0.0,<3.0.0",
+        "eth-typing>=2.1.0,<3.0.0",
         "eth-utils>=1.3.0,<2",
         "mypy-extensions>=0.4.1",
     ],