partial bitcoin#20161: Minor taproot follow-ups

includes:
- 1d22300b99cda0504bb1f457d94468fa2c33c4e2
This commit is contained in:
Kittywhiskers Van Gogh 2020-10-15 15:39:09 -07:00 committed by pasta
parent 9aeef44d62
commit c15c7bb9be
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -235,8 +235,8 @@ class ECPubKey():
x = int.from_bytes(data[1:33], 'big')
if SECP256K1.is_x_coord(x):
p = SECP256K1.lift_x(x)
# if the oddness of the y co-ord isn't correct, find the other
# valid y
# Make the Y coordinate odd if required (lift_x always produces
# a point with an even Y coordinate).
if data[0] & 1:
p = SECP256K1.negate(p)
self.p = p
@ -551,7 +551,7 @@ class TestFrameworkKey(unittest.TestCase):
sig_actual = sign_schnorr(seckey, msg, aux_rand)
self.assertEqual(sig.hex(), sig_actual.hex(), "BIP340 test vector %i (%s): sig mismatch" % (i, comment))
except RuntimeError as e:
self.assertFalse("BIP340 test vector %i (%s): signing raised exception %s" % (i, comment, e))
self.fail("BIP340 test vector %i (%s): signing raised exception %s" % (i, comment, e))
result_actual = verify_schnorr(pubkey, sig, msg)
if result:
self.assertEqual(result, result_actual, "BIP340 test vector %i (%s): verification failed" % (i, comment))