Merge branch '202209_fe_ge_classes' into py-ellsq

stratospher · Jun 1, 2023 · 1e54054 · 1e54054
1 parent 9e54dde
commit 1e54054
Show file tree

Hide file tree

Showing 3 changed files with 408 additions and 286 deletions.
diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py
@@ -103,8 +103,8 @@
     sign_schnorr,
     tweak_add_privkey,
     ECKey,
-    SECP256K1
 )
+from test_framework import secp256k1
 from test_framework.address import (
     hash160,
     program_to_witness,
@@ -694,7 +694,7 @@ def spenders_taproot_active():
     # Generate an invalid public key
     while True:
         invalid_pub = random_bytes(32)
-        if not SECP256K1.is_x_coord(int.from_bytes(invalid_pub, 'big')):
+        if not secp256k1.GE.is_valid_x(int.from_bytes(invalid_pub, 'big')):
             break
 
     # Implement a test case that detects validation logic which maps invalid public keys to the