lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

pyln: Migrate from binascii.hexlify to bytes.hex 

Suggested-by: Lisa <@niftynei>
travis-experimental
Christian Decker 4 years ago
committed by Rusty Russell
parent
04462f6a64
commit
a351b9bf2f
1 changed files with 107 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 217
      contrib/pyln-proto/tests/test_onion.py

217
contrib/pyln-proto/tests/test_onion.py
View File

@ -1,4 +1,3 @@
from binascii import hexlify, unhexlify
from io import BytesIO from io import BytesIO
from pyln.proto import onion from pyln.proto import onion
from typing import Tuple from typing import Tuple
@ -8,18 +7,18 @@ import unittest
def test_legacy_payload(): def test_legacy_payload():
legacy = unhexlify( legacy = bytes.fromhex(
b'00000067000001000100000000000003e800000075000000000000000000000000' '00000067000001000100000000000003e800000075000000000000000000000000'
) )
payload = onion.OnionPayload.from_bytes(legacy) payload = onion.OnionPayload.from_bytes(legacy)
assert(payload.to_bytes(include_prefix=True) == legacy) assert(payload.to_bytes(include_prefix=True) == legacy)
def test_tlv_payload(): def test_tlv_payload():
tlv = unhexlify( tlv = bytes.fromhex(
b'58fe020c21160c48656c6c6f20776f726c6421fe020c21184076e8acd54afbf2361' '58fe020c21160c48656c6c6f20776f726c6421fe020c21184076e8acd54afbf2361'
b'0b7166ba689afcc9e8ec3c44e442e765012dfc1d299958827d0205f7e4e1a12620e' '0b7166ba689afcc9e8ec3c44e442e765012dfc1d299958827d0205f7e4e1a12620e'
b'7fc8ce1c7d3651acefde899c33f12b6958d3304106a0' '7fc8ce1c7d3651acefde899c33f12b6958d3304106a0'
) )
payload = onion.OnionPayload.from_bytes(tlv) payload = onion.OnionPayload.from_bytes(tlv)
assert(payload.to_bytes() == tlv) assert(payload.to_bytes() == tlv)
@ -28,9 +27,9 @@ def test_tlv_payload():
assert(len(fields) == 2) assert(len(fields) == 2)
assert(isinstance(fields[0], onion.TextField)) assert(isinstance(fields[0], onion.TextField))
assert(fields[0].typenum == 34349334 and fields[0].value == "Hello world!") assert(fields[0].typenum == 34349334 and fields[0].value == "Hello world!")
assert(fields[1].typenum == 34349336 and fields[1].value == unhexlify( assert(fields[1].typenum == 34349336 and fields[1].value == bytes.fromhex(
b'76e8acd54afbf23610b7166ba689afcc9e8ec3c44e442e765012dfc1d299958827d' '76e8acd54afbf23610b7166ba689afcc9e8ec3c44e442e765012dfc1d299958827d'
b'0205f7e4e1a12620e7fc8ce1c7d3651acefde899c33f12b6958d3304106a0' '0205f7e4e1a12620e7fc8ce1c7d3651acefde899c33f12b6958d3304106a0'
)) ))
assert(payload.to_bytes() == tlv) assert(payload.to_bytes() == tlv)
@ -83,53 +82,51 @@ def test_onion_parse():
o = onion.RoutingOnion.from_hex(o) o = onion.RoutingOnion.from_hex(o)
assert(o.version == 0) assert(o.version == 0)
assert(hexlify(o.hmac) == b'b8640887e027e946df96488b47fbc4a4fadaa8beda4abe446fafea5403fae2ef') assert(bytes.hex(o.hmac) == 'b8640887e027e946df96488b47fbc4a4fadaa8beda4abe446fafea5403fae2ef')
assert(o.to_bin() == unhexlify(vec['onion'])) assert(o.to_bin() == bytes.fromhex(vec['onion']))
def test_generate_keyset(): def test_generate_keyset():
unhex = unhexlify secret = onion.Secret(bytes.fromhex(
'53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b348c4e1cd36a03ea66'
secret = onion.Secret(unhex(
b'53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b348c4e1cd36a03ea66'
)) ))
keys = onion.generate_keyset(secret) keys = onion.generate_keyset(secret)
expected = onion.KeySet( expected = onion.KeySet(
rho=unhex(b'ce496ec94def95aadd4bec15cdb41a740c9f2b62347c4917325fcc6fb0453986'), rho=bytes.fromhex('ce496ec94def95aadd4bec15cdb41a740c9f2b62347c4917325fcc6fb0453986'),
mu=unhex(b'b57061dc6d0a2b9f261ac410c8b26d64ac5506cbba30267a649c28c179400eba'), mu=bytes.fromhex('b57061dc6d0a2b9f261ac410c8b26d64ac5506cbba30267a649c28c179400eba'),
um=unhex(b'3ca76e96fad1a0300928639d203b4369e81254032156c936179077b08091ca49'), um=bytes.fromhex('3ca76e96fad1a0300928639d203b4369e81254032156c936179077b08091ca49'),
pad=unhex(b'3c348715f933c32b5571e2c9136b17c4da2e8fd13e35b7092deff56650eea958'), pad=bytes.fromhex('3c348715f933c32b5571e2c9136b17c4da2e8fd13e35b7092deff56650eea958'),
gamma=unhex(b'c5b96917bc536aff7c2d6584bd60cf3b99151ccac18f173133f1fd0bdcae08b5'), gamma=bytes.fromhex('c5b96917bc536aff7c2d6584bd60cf3b99151ccac18f173133f1fd0bdcae08b5'),
pi=unhex(b'3a70333f46a4fd1b3f72acae87760b147b07fe4923131066906a4044d4f1ddd1'), pi=bytes.fromhex('3a70333f46a4fd1b3f72acae87760b147b07fe4923131066906a4044d4f1ddd1'),
) )
assert(keys == expected) assert(keys == expected)
def test_blind(): def test_blind():
tests = [ tests = [
(b'02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619', ('02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619',
b'53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b348c4e1cd36a03ea66', '53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b348c4e1cd36a03ea66',
b'2ec2e5da605776054187180343287683aa6a51b4b1c04d6dd49c45d8cffb3c36'), '2ec2e5da605776054187180343287683aa6a51b4b1c04d6dd49c45d8cffb3c36'),
(b'028f9438bfbf7feac2e108d677e3a82da596be706cc1cf342b75c7b7e22bf4e6e2', ('028f9438bfbf7feac2e108d677e3a82da596be706cc1cf342b75c7b7e22bf4e6e2',
b'a6519e98832a0b179f62123b3567c106db99ee37bef036e783263602f3488fae', 'a6519e98832a0b179f62123b3567c106db99ee37bef036e783263602f3488fae',
b'bf66c28bc22e598cfd574a1931a2bafbca09163df2261e6d0056b2610dab938f'), 'bf66c28bc22e598cfd574a1931a2bafbca09163df2261e6d0056b2610dab938f'),
(b'03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0', ('03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0',
b'3a6b412548762f0dbccce5c7ae7bb8147d1caf9b5471c34120b30bc9c04891cc', '3a6b412548762f0dbccce5c7ae7bb8147d1caf9b5471c34120b30bc9c04891cc',
b'a1f2dadd184eb1627049673f18c6325814384facdee5bfd935d9cb031a1698a5'), 'a1f2dadd184eb1627049673f18c6325814384facdee5bfd935d9cb031a1698a5'),
(b'031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595', ('031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595',
b'21e13c2d7cfe7e18836df50872466117a295783ab8aab0e7ecc8c725503ad02d', '21e13c2d7cfe7e18836df50872466117a295783ab8aab0e7ecc8c725503ad02d',
b'7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262'), '7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262'),
(b'03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4', ('03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4',
b'b5756b9b542727dbafc6765a49488b023a725d631af688fc031217e90770c328', 'b5756b9b542727dbafc6765a49488b023a725d631af688fc031217e90770c328',
b'c96e00dddaf57e7edcd4fb5954be5b65b09f17cb6d20651b4e90315be5779205'), 'c96e00dddaf57e7edcd4fb5954be5b65b09f17cb6d20651b4e90315be5779205'),
] ]
for pubkey, sharedsecret, expected in tests: for pubkey, sharedsecret, expected in tests:
expected = onion.Secret(unhexlify(expected)) expected = onion.Secret(bytes.fromhex(expected))
pubkey = onion.PublicKey(unhexlify(pubkey)) pubkey = onion.PublicKey(bytes.fromhex(pubkey))
sharedsecret = onion.Secret(unhexlify(sharedsecret)) sharedsecret = onion.Secret(bytes.fromhex(sharedsecret))
res = onion.blind(pubkey, sharedsecret) res = onion.blind(pubkey, sharedsecret)
assert(res == expected) assert(res == expected)
@ -137,26 +134,26 @@ def test_blind():
def test_blind_group_element(): def test_blind_group_element():
tests = [ tests = [
(b'031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595', ('031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595',
b'7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262', '7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262',
b'03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4'), '03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4'),
(b'028f9438bfbf7feac2e108d677e3a82da596be706cc1cf342b75c7b7e22bf4e6e2', ('028f9438bfbf7feac2e108d677e3a82da596be706cc1cf342b75c7b7e22bf4e6e2',
b'bf66c28bc22e598cfd574a1931a2bafbca09163df2261e6d0056b2610dab938f', 'bf66c28bc22e598cfd574a1931a2bafbca09163df2261e6d0056b2610dab938f',
b'03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0'), '03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0'),
(b'03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0', ('03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0',
b'a1f2dadd184eb1627049673f18c6325814384facdee5bfd935d9cb031a1698a5', 'a1f2dadd184eb1627049673f18c6325814384facdee5bfd935d9cb031a1698a5',
b'031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595'), '031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595'),
(b'031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595', ('031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595',
b'7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262', '7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262',
b'03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4'), '03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4'),
] ]
for pubkey, blind, expected in tests: for pubkey, blind, expected in tests:
expected = onion.PublicKey(unhexlify(expected)) expected = onion.PublicKey(bytes.fromhex(expected))
pubkey = onion.PublicKey(unhexlify(pubkey)) pubkey = onion.PublicKey(bytes.fromhex(pubkey))
blind = onion.Secret(unhexlify(blind)) blind = onion.Secret(bytes.fromhex(blind))
res = onion.blind_group_element(pubkey, blind) res = onion.blind_group_element(pubkey, blind)
assert(res.to_bytes() == expected.to_bytes()) assert(res.to_bytes() == expected.to_bytes())
@ -186,12 +183,12 @@ def sphinx_path_from_test_vector(filename: str) -> Tuple[onion.SphinxPath, dict]
root = os.path.join(path, '..', '..', '..') root = os.path.join(path, '..', '..', '..')
filename = os.path.join(root, filename) filename = os.path.join(root, filename)
v = json.load(open(filename, 'r')) v = json.load(open(filename, 'r'))
session_key = onion.Secret(unhexlify(v['generate']['session_key'])) session_key = onion.Secret(bytes.fromhex(v['generate']['session_key']))
associated_data = unhexlify(v['generate']['associated_data']) associated_data = bytes.fromhex(v['generate']['associated_data'])
hops = [] hops = []
for h in v['generate']['hops']: for h in v['generate']['hops']:
payload = unhexlify(h['payload']) payload = bytes.fromhex(h['payload'])
if h['type'] == 'raw' or h['type'] == 'tlv': if h['type'] == 'raw' or h['type'] == 'tlv':
b = BytesIO() b = BytesIO()
onion.varint_encode(len(payload), b) onion.varint_encode(len(payload), b)
@ -201,7 +198,7 @@ def sphinx_path_from_test_vector(filename: str) -> Tuple[onion.SphinxPath, dict]
payload = b'\x00' + payload + (b'\x00' * padlen) payload = b'\x00' + payload + (b'\x00' * padlen)
assert(len(payload) == 33) assert(len(payload) == 33)
pubkey = onion.PublicKey(unhexlify(h['pubkey'])) pubkey = onion.PublicKey(bytes.fromhex(h['pubkey']))
hops.append(onion.SphinxHop( hops.append(onion.SphinxHop(
pubkey=pubkey, pubkey=pubkey,
payload=payload, payload=payload,
@ -227,32 +224,32 @@ def test_hop_params():
params = sp.get_hop_params() params = sp.get_hop_params()
expected = [( expected = [(
b'02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619', '02eec7245d6b7d2ccb30380bfbe2a3648cd7a942653f5aa340edcea1f283686619',
b'53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b348c4e1cd36a03ea66', '53eb63ea8a3fec3b3cd433b85cd62a4b145e1dda09391b348c4e1cd36a03ea66',
b'2ec2e5da605776054187180343287683aa6a51b4b1c04d6dd49c45d8cffb3c36' '2ec2e5da605776054187180343287683aa6a51b4b1c04d6dd49c45d8cffb3c36'
), ( ), (
b'028f9438bfbf7feac2e108d677e3a82da596be706cc1cf342b75c7b7e22bf4e6e2', '028f9438bfbf7feac2e108d677e3a82da596be706cc1cf342b75c7b7e22bf4e6e2',
b'a6519e98832a0b179f62123b3567c106db99ee37bef036e783263602f3488fae', 'a6519e98832a0b179f62123b3567c106db99ee37bef036e783263602f3488fae',
b'bf66c28bc22e598cfd574a1931a2bafbca09163df2261e6d0056b2610dab938f' 'bf66c28bc22e598cfd574a1931a2bafbca09163df2261e6d0056b2610dab938f'
), ( ), (
b'03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0', '03bfd8225241ea71cd0843db7709f4c222f62ff2d4516fd38b39914ab6b83e0da0',
b'3a6b412548762f0dbccce5c7ae7bb8147d1caf9b5471c34120b30bc9c04891cc', '3a6b412548762f0dbccce5c7ae7bb8147d1caf9b5471c34120b30bc9c04891cc',
b'a1f2dadd184eb1627049673f18c6325814384facdee5bfd935d9cb031a1698a5' 'a1f2dadd184eb1627049673f18c6325814384facdee5bfd935d9cb031a1698a5'
), ( ), (
b'031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595', '031dde6926381289671300239ea8e57ffaf9bebd05b9a5b95beaf07af05cd43595',
b'21e13c2d7cfe7e18836df50872466117a295783ab8aab0e7ecc8c725503ad02d', '21e13c2d7cfe7e18836df50872466117a295783ab8aab0e7ecc8c725503ad02d',
b'7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262' '7cfe0b699f35525029ae0fa437c69d0f20f7ed4e3916133f9cacbb13c82ff262'
), ( ), (
b'03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4', '03a214ebd875aab6ddfd77f22c5e7311d7f77f17a169e599f157bbcdae8bf071f4',
b'b5756b9b542727dbafc6765a49488b023a725d631af688fc031217e90770c328', 'b5756b9b542727dbafc6765a49488b023a725d631af688fc031217e90770c328',
b'c96e00dddaf57e7edcd4fb5954be5b65b09f17cb6d20651b4e90315be5779205' 'c96e00dddaf57e7edcd4fb5954be5b65b09f17cb6d20651b4e90315be5779205'
)] )]
assert(len(params) == len(sp.hops)) assert(len(params) == len(sp.hops))
for a, b in zip(expected, params): for a, b in zip(expected, params):
assert(a[0] == hexlify(b.ephemeralkey.to_bytes())) assert(a[0] == bytes.hex(b.ephemeralkey.to_bytes()))
assert(a[1] == hexlify(b.secret.to_bytes())) assert(a[1] == bytes.hex(b.secret.to_bytes()))
assert(a[2] == hexlify(b.blind.to_bytes())) assert(a[2] == bytes.hex(b.blind.to_bytes()))
def test_filler(): def test_filler():
@ -266,20 +263,20 @@ def test_filler():
``` ```
""" """
expected = ( expected = (
b'b77d99c935d3f32469844f7e09340a91ded147557bdd0456c369f7e449587c0f566' 'b77d99c935d3f32469844f7e09340a91ded147557bdd0456c369f7e449587c0f566'
b'6faab58040146db49024db88553729bce12b860391c29c1779f022ae48a9cb314ca' '6faab58040146db49024db88553729bce12b860391c29c1779f022ae48a9cb314ca'
b'35d73fc91addc92632bcf7ba6fd9f38e6fd30fabcedbd5407b6648073c38331ee7a' '35d73fc91addc92632bcf7ba6fd9f38e6fd30fabcedbd5407b6648073c38331ee7a'
b'b0332f41f550c180e1601f8c25809ed75b3a1e78635a2ef1b828e92c9658e76e49f' 'b0332f41f550c180e1601f8c25809ed75b3a1e78635a2ef1b828e92c9658e76e49f'
b'995d72cf9781eec0c838901d0bdde3ac21c13b4979ac9e738a1c4d0b9741d58e777' '995d72cf9781eec0c838901d0bdde3ac21c13b4979ac9e738a1c4d0b9741d58e777'
b'ad1aed01263ad1390d36a18a6b92f4f799dcf75edbb43b7515e8d72cb4f827a9af0' 'ad1aed01263ad1390d36a18a6b92f4f799dcf75edbb43b7515e8d72cb4f827a9af0'
b'e7b9338d07b1a24e0305b5535f5b851b1144bad6238b9d9482b5ba6413f1aafac3c' 'e7b9338d07b1a24e0305b5535f5b851b1144bad6238b9d9482b5ba6413f1aafac3c'
b'dde5067966ed8b78f7c1c5f916a05f874d5f17a2b7d0ae75d66a5f1bb6ff932570d' 'dde5067966ed8b78f7c1c5f916a05f874d5f17a2b7d0ae75d66a5f1bb6ff932570d'
b'c5a0cf3ce04eb5d26bc55c2057af1f8326e20a7d6f0ae644f09d00fac80de60f20a' 'c5a0cf3ce04eb5d26bc55c2057af1f8326e20a7d6f0ae644f09d00fac80de60f20a'
b'ceee85be41a074d3e1dda017db79d0070b99f54736396f206ee3777abd4c00a4bb9' 'ceee85be41a074d3e1dda017db79d0070b99f54736396f206ee3777abd4c00a4bb9'
b'5c871750409261e3b01e59a3793a9c20159aae4988c68397a1443be6370fd9614e4' '5c871750409261e3b01e59a3793a9c20159aae4988c68397a1443be6370fd9614e4'
b'6108291e615691729faea58537209fa668a172d066d0efff9bc77c2bd34bd77870a' '6108291e615691729faea58537209fa668a172d066d0efff9bc77c2bd34bd77870a'
b'd79effd80140990e36731a0b72092f8d5bc8cd346762e93b2bf203d00264e4bc136' 'd79effd80140990e36731a0b72092f8d5bc8cd346762e93b2bf203d00264e4bc136'
b'fc142de8f7b69154deb05854ea88e2d7506222c95ba1aab065c8a' 'fc142de8f7b69154deb05854ea88e2d7506222c95ba1aab065c8a'
) )
sp, v = sphinx_path_from_test_vector( sp, v = sphinx_path_from_test_vector(
@ -287,36 +284,36 @@ def test_filler():
) )
filler = sp.get_filler() filler = sp.get_filler()
assert(2 * len(filler) == len(expected)) assert(2 * len(filler) == len(expected))
assert(hexlify(filler) == expected) assert(bytes.hex(bytes(filler)) == expected)
def test_chacha20_stream(): def test_chacha20_stream():
"""Test that we can generate a correct stream for encryption/decryption """Test that we can generate a correct stream for encryption/decryption
""" """
tests = [( tests = [(
b'ce496ec94def95aadd4bec15cdb41a740c9f2b62347c4917325fcc6fb0453986', 'ce496ec94def95aadd4bec15cdb41a740c9f2b62347c4917325fcc6fb0453986',
b'e5f14350c2a76fc232b5e46d421e9615471ab9e0bc887beff8c95fdb878f7b3a' 'e5f14350c2a76fc232b5e46d421e9615471ab9e0bc887beff8c95fdb878f7b3a'
), ( ), (
b'450ffcabc6449094918ebe13d4f03e433d20a3d28a768203337bc40b6e4b2c59', '450ffcabc6449094918ebe13d4f03e433d20a3d28a768203337bc40b6e4b2c59',
b'03455084337a8dbe5d5bfa27f825f3a9ae4f431f6f7a16ad786704887cbd85bd' '03455084337a8dbe5d5bfa27f825f3a9ae4f431f6f7a16ad786704887cbd85bd'
), ( ), (
b'11bf5c4f960239cb37833936aa3d02cea82c0f39fd35f566109c41f9eac8deea', '11bf5c4f960239cb37833936aa3d02cea82c0f39fd35f566109c41f9eac8deea',
b'e22ea443b8a275174533abc584fae578e80ed4c1851d0554235171e45e1e2a18' 'e22ea443b8a275174533abc584fae578e80ed4c1851d0554235171e45e1e2a18'
), ( ), (
b'cbe784ab745c13ff5cffc2fbe3e84424aa0fd669b8ead4ee562901a4a4e89e9e', 'cbe784ab745c13ff5cffc2fbe3e84424aa0fd669b8ead4ee562901a4a4e89e9e',
b'35de88a5f7e63d2c0072992046827fc997c3312b54591844fc713c0cca433626' '35de88a5f7e63d2c0072992046827fc997c3312b54591844fc713c0cca433626'
)] )]
for a, b in tests: for a, b in tests:
stream = bytearray(32) stream = bytearray(32)
onion.chacha20_stream(unhexlify(a), stream) onion.chacha20_stream(bytes.fromhex(a), stream)
assert(hexlify(stream) == b) assert(bytes.hex(bytes(stream)) == b)
# And since we're at it make sure we can actually encrypt inplace on a # And since we're at it make sure we can actually encrypt inplace on a
# memoryview. # memoryview.
stream = memoryview(bytearray(64)) stream = memoryview(bytearray(64))
onion.chacha20_stream(unhexlify(a), memoryview(stream[16:-16])) onion.chacha20_stream(bytes.fromhex(a), memoryview(stream[16:-16]))
assert(hexlify(stream) == b'00' * 16 + b + b'00' * 16) assert(bytes.hex(bytes(stream)) == '00' * 16 + b + '00' * 16)
def test_sphinx_path_compile(): def test_sphinx_path_compile():
@ -324,22 +321,22 @@ def test_sphinx_path_compile():
sp, v = sphinx_path_from_test_vector(f) sp, v = sphinx_path_from_test_vector(f)
o = sp.compile() o = sp.compile()
assert(o.to_bin() == unhexlify(v['onion'])) assert(o.to_bin() == bytes.fromhex(v['onion']))
def test_unwrap(): def test_unwrap():
f = 'tests/vectors/onion-test-multi-frame.json' f = 'tests/vectors/onion-test-multi-frame.json'
sp, v = sphinx_path_from_test_vector(f) sp, v = sphinx_path_from_test_vector(f)
o = onion.RoutingOnion.from_hex(v['onion']) o = onion.RoutingOnion.from_hex(v['onion'])
assocdata = unhexlify(v['generate']['associated_data']) assocdata = bytes.fromhex(v['generate']['associated_data'])
privkeys = [onion.PrivateKey(unhexlify(h)) for h in v['decode']] privkeys = [onion.PrivateKey(bytes.fromhex(h)) for h in v['decode']]
for pk, h in zip(privkeys, v['generate']['hops']): for pk, h in zip(privkeys, v['generate']['hops']):
pl, o = o.unwrap(pk, assocdata=assocdata) pl, o = o.unwrap(pk, assocdata=assocdata)
b = hexlify(pl.to_bytes(include_prefix=False)) b = bytes.hex(pl.to_bytes(include_prefix=False))
if h['type'] == 'legacy': if h['type'] == 'legacy':
assert(b == h['payload'].encode('ascii') + b'00' * 12) assert(b == h['payload'] + '00' * 12)
else: else:
assert(b == h['payload'].encode('ascii')) assert(b == h['payload'])
assert(o is None) assert(o is None)

Write Preview
Loading…
Cancel
Save