Skip to content

Commit 055e4dd

Browse files
meherettmeherett
committed
Fix: test implementations & data
1 parent a419cc0 commit 055e4dd

22 files changed

Lines changed: 101 additions & 85 deletions

‎tests/cli/dump_rules.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
"cardano-type": "cardano_type",
298298
"language": "language",
299299
"seed-client": ("Cardano",),
300-
"address-type": ("staking",)
300+
# "address-type": ("staking",)
301301
}
302302
},
303303
"Electrum-V1": {

‎tests/cli/test_cli_dumps.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ def get_dumps_output(ddict):
8888
def test_cli_dumps(cli_tester, hd_data):
8989

9090
dumps, derivation, hd, name = hd_data
91-
9291
hd_args = get_hd_args(dumps, rules[hd]["args"])
9392
for param, rule in rules[hd]["available-methods"].items():
9493
final_dumps = copy.deepcopy(dumps)
@@ -100,6 +99,11 @@ def test_cli_dumps(cli_tester, hd_data):
10099
]
101100
args.extend(hd_args)
102101

102+
if name in ["byron-icarus", "byron-ledger", "byron-legacy"]:
103+
args.extend(["--address-type", "public-key"])
104+
elif name in ["shelley-icarus", "shelley-ledger"]:
105+
args.extend(["--address-type", "staking"])
106+
103107
if rule["derivable"]:
104108
args.extend(get_derivation_args(derivation))
105109
args.extend([

‎tests/data/json/hds.json‎

Lines changed: 19 additions & 19 deletions
Large diffs are not rendered by default.

‎tests/data/json/hdwallet.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"strength": 160,
1616
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
1717
"passphrase": null,
18-
"language": "English",
18+
"language": "english",
1919
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
2020
"ecc": "SLIP10-Secp256k1",
2121
"hd": "BIP32",
@@ -101,7 +101,7 @@
101101
"strength": 160,
102102
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
103103
"passphrase": null,
104-
"language": "English",
104+
"language": "english",
105105
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
106106
"ecc": "SLIP10-Secp256k1",
107107
"hd": "BIP32",
@@ -195,7 +195,7 @@
195195
"strength": 160,
196196
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
197197
"passphrase": null,
198-
"language": "English",
198+
"language": "english",
199199
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
200200
"ecc": "SLIP10-Secp256k1",
201201
"hd": "BIP44",
@@ -281,7 +281,7 @@
281281
"strength": 160,
282282
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
283283
"passphrase": null,
284-
"language": "English",
284+
"language": "english",
285285
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
286286
"ecc": "SLIP10-Secp256k1",
287287
"hd": "BIP44",
@@ -375,7 +375,7 @@
375375
"strength": 160,
376376
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
377377
"passphrase": null,
378-
"language": "English",
378+
"language": "english",
379379
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
380380
"ecc": "SLIP10-Secp256k1",
381381
"hd": "BIP49",
@@ -461,7 +461,7 @@
461461
"strength": 160,
462462
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
463463
"passphrase": null,
464-
"language": "English",
464+
"language": "english",
465465
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
466466
"ecc": "SLIP10-Secp256k1",
467467
"hd": "BIP49",
@@ -555,7 +555,7 @@
555555
"strength": 160,
556556
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
557557
"passphrase": null,
558-
"language": "English",
558+
"language": "english",
559559
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
560560
"ecc": "SLIP10-Secp256k1",
561561
"hd": "BIP84",
@@ -641,7 +641,7 @@
641641
"strength": 160,
642642
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
643643
"passphrase": null,
644-
"language": "English",
644+
"language": "english",
645645
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
646646
"ecc": "SLIP10-Secp256k1",
647647
"hd": "BIP84",
@@ -735,7 +735,7 @@
735735
"strength": 160,
736736
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
737737
"passphrase": null,
738-
"language": "English",
738+
"language": "english",
739739
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
740740
"ecc": "SLIP10-Secp256k1",
741741
"hd": "BIP86",
@@ -821,7 +821,7 @@
821821
"strength": 160,
822822
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
823823
"passphrase": null,
824-
"language": "English",
824+
"language": "english",
825825
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
826826
"ecc": "SLIP10-Secp256k1",
827827
"hd": "BIP86",
@@ -915,7 +915,7 @@
915915
"strength": 160,
916916
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
917917
"passphrase": null,
918-
"language": "English",
918+
"language": "english",
919919
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
920920
"ecc": "SLIP10-Secp256k1",
921921
"hd": "BIP141",
@@ -985,7 +985,7 @@
985985
"strength": 160,
986986
"mnemonic": "track search rotate enough engine glass knife defy claw family tattoo stumble double barely spike",
987987
"passphrase": null,
988-
"language": "English",
988+
"language": "english",
989989
"seed": "3412a2f89e1f6e9a3fba3b6c9c2dcac183c7ff40ebe4917957b2197d20f812ac36113a4359cf621b18d2b060c2fd9739e9819195dcf9b36b402ea6757cf36ea0",
990990
"ecc": "SLIP10-Secp256k1",
991991
"hd": "BIP141",
@@ -1063,7 +1063,7 @@
10631063
"strength": 224,
10641064
"mnemonic": "kapybara negace herec vydat jasno orlice rodokmen limetka cyklista nominace cigareta kultura zatemnit pomlka plno ovanout kemp exekuce cela okrasa clona",
10651065
"passphrase": null,
1066-
"language": "Czech",
1066+
"language": "czech",
10671067
"seed": "46cee0c87543fb17ac72fc1a4f545dac0f533fe67c7a48c51c46c401",
10681068
"ecc": "Kholaw-Ed25519",
10691069
"hd": "Cardano",
@@ -1142,7 +1142,7 @@
11421142
"strength": 224,
11431143
"mnemonic": "kapybara negace herec vydat jasno orlice rodokmen limetka cyklista nominace cigareta kultura zatemnit pomlka plno ovanout kemp exekuce cela okrasa clona",
11441144
"passphrase": null,
1145-
"language": "Czech",
1145+
"language": "czech",
11461146
"seed": "ad640d79a85fc8a86ecf9966294f0da76e314538a27bbb2ffcacdb7fbe7e2be33d9ae37d9975c406206eb44d13d06ca8e20f877f29e769df690f8c700c5153a0",
11471147
"ecc": "Kholaw-Ed25519",
11481148
"hd": "Cardano",
@@ -1221,7 +1221,7 @@
12211221
"strength": 224,
12221222
"mnemonic": "kapybara negace herec vydat jasno orlice rodokmen limetka cyklista nominace cigareta kultura zatemnit pomlka plno ovanout kemp exekuce cela okrasa clona",
12231223
"passphrase": null,
1224-
"language": "Czech",
1224+
"language": "czech",
12251225
"seed": "cce7ebb0de741cb8829075d35bb2e7cacf21d994e50a1e68635498b4007e03af",
12261226
"ecc": "Kholaw-Ed25519",
12271227
"hd": "Cardano",
@@ -1301,7 +1301,7 @@
13011301
"strength": 224,
13021302
"mnemonic": "kapybara negace herec vydat jasno orlice rodokmen limetka cyklista nominace cigareta kultura zatemnit pomlka plno ovanout kemp exekuce cela okrasa clona",
13031303
"passphrase": null,
1304-
"language": "Czech",
1304+
"language": "czech",
13051305
"seed": "46cee0c87543fb17ac72fc1a4f545dac0f533fe67c7a48c51c46c401",
13061306
"ecc": "Kholaw-Ed25519",
13071307
"hd": "Cardano",
@@ -1380,7 +1380,7 @@
13801380
"strength": 224,
13811381
"mnemonic": "kapybara negace herec vydat jasno orlice rodokmen limetka cyklista nominace cigareta kultura zatemnit pomlka plno ovanout kemp exekuce cela okrasa clona",
13821382
"passphrase": null,
1383-
"language": "Czech",
1383+
"language": "czech",
13841384
"seed": "ad640d79a85fc8a86ecf9966294f0da76e314538a27bbb2ffcacdb7fbe7e2be33d9ae37d9975c406206eb44d13d06ca8e20f877f29e769df690f8c700c5153a0",
13851385
"ecc": "Kholaw-Ed25519",
13861386
"hd": "Cardano",
@@ -1467,7 +1467,7 @@
14671467
"strength": 128,
14681468
"mnemonic": "amaze dirt anymore place fairy crap table quiet carefully mist bee moon",
14691469
"passphrase": null,
1470-
"language": "English",
1470+
"language": "english",
14711471
"seed": "3fb117a3e9daf2d60d5bb85f999fba2347996721497e49d00debf48d9e34755e",
14721472
"ecc": "SLIP10-Secp256k1",
14731473
"hd": "Electrum-V1",
@@ -1512,7 +1512,7 @@
15121512
"strength": 128,
15131513
"mnemonic": "amaze dirt anymore place fairy crap table quiet carefully mist bee moon",
15141514
"passphrase": null,
1515-
"language": "English",
1515+
"language": "english",
15161516
"seed": "3fb117a3e9daf2d60d5bb85f999fba2347996721497e49d00debf48d9e34755e",
15171517
"ecc": "SLIP10-Secp256k1",
15181518
"hd": "Electrum-V1",
@@ -1565,7 +1565,7 @@
15651565
"strength": 132,
15661566
"mnemonic": "repolho aferir vinco platina seiva urologia produto bovino comando fivela terno levitar",
15671567
"passphrase": null,
1568-
"language": "Portuguese",
1568+
"language": "portuguese",
15691569
"seed": "c70a8edce9ea5f6474e26619ff76894e9db87df869c07d7d095d821a9f183144261df71d305d2f24e0889be06f433d73842eac579565ac7154250b3f1bf8af35",
15701570
"ecc": "SLIP10-Secp256k1",
15711571
"hd": "Electrum-V2",
@@ -1612,7 +1612,7 @@
16121612
"strength": 132,
16131613
"mnemonic": "milhar agarrar vinco platina seiva urologia produto bovino comando fivela terno levitar",
16141614
"passphrase": null,
1615-
"language": "Portuguese",
1615+
"language": "portuguese",
16161616
"seed": "4c5b0e28b1f0b8ece0382dcc27b4dadc9b5bad90d184b5b65d202ad12106ed6fd55c8b8940a08527c770a81dac6f25a4f091c3eb51fb0d55da58c9e4830da45c",
16171617
"ecc": "SLIP10-Secp256k1",
16181618
"hd": "Electrum-V2",
@@ -1659,7 +1659,7 @@
16591659
"strength": 132,
16601660
"mnemonic": "selvagem aferir vinco platina seiva urologia produto bovino comando fivela terno levitar",
16611661
"passphrase": null,
1662-
"language": "Portuguese",
1662+
"language": "portuguese",
16631663
"seed": "c4b76269e959316bc5cba4be73e50dce6765276745a92de1f535e113611ab3eddb60f82563de2a23d34fa90600809b502b0058c046a25044fb5615e19e686094",
16641664
"ecc": "SLIP10-Secp256k1",
16651665
"hd": "Electrum-V2",
@@ -1706,7 +1706,7 @@
17061706
"strength": 132,
17071707
"mnemonic": "selvagem aferir vinco platina seiva urologia produto bovino comando fivela terno levitar",
17081708
"passphrase": null,
1709-
"language": "Portuguese",
1709+
"language": "portuguese",
17101710
"seed": "c4b76269e959316bc5cba4be73e50dce6765276745a92de1f535e113611ab3eddb60f82563de2a23d34fa90600809b502b0058c046a25044fb5615e19e686094",
17111711
"ecc": "SLIP10-Secp256k1",
17121712
"hd": "Electrum-V2",
@@ -1762,7 +1762,7 @@
17621762
"strength": 128,
17631763
"mnemonic": "guizo melro cirurgico enlutar fiquei slide ilharga flotilha musselina socratico muon encurvar",
17641764
"passphrase": null,
1765-
"language": "Portuguese",
1765+
"language": "portuguese",
17661766
"seed": "fb57a097f01c2180c4d853420fbd78aa",
17671767
"ecc": "SLIP10-Ed25519-Monero",
17681768
"hd": "Monero",

‎tests/hdwallet/eccs/test_kholaw_ed25519_ecc.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def test_kholaw_ed25519_ecc_point(data):
4141
assert isinstance(point.underlying_object(), bytes)
4242
assert point.x() == data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["x"]
4343
assert point.y() == data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["y"]
44-
assert point.raw_encoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["encode"])
45-
assert point.raw() == point.raw_decoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["decode"])
44+
assert point.raw() == point.raw_encoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["encode"])
45+
assert point.raw_decoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["decode"])
4646
# Test from coordinate
4747
point = KholawEd25519Point.from_coordinates(
4848
x=data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["x"],
@@ -53,8 +53,8 @@ def test_kholaw_ed25519_ecc_point(data):
5353
assert isinstance(point.underlying_object(), bytes)
5454
assert point.x() == data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["x"]
5555
assert point.y() == data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["y"]
56-
assert point.raw_encoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["encode"])
57-
assert point.raw() == point.raw_decoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["decode"])
56+
assert point.raw() == point.raw_encoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["encode"])
57+
assert point.raw_decoded() == get_bytes(data["eccs"]["Kholaw-Ed25519"][public_key_type]["point"]["decode"])
5858

5959
for number in range(2, 50):
6060
point_add, point_radd, point_mul, point_rmul = (

‎tests/hdwallet/eccs/test_slip10_ed25519_blake2b_ecc.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def test_slip10_ed25519_blake2b_ecc_point(data):
4141
assert isinstance(point.underlying_object(), bytes)
4242
assert point.x() == data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["x"]
4343
assert point.y() == data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["y"]
44-
assert point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["encode"])
45-
assert point.raw() == point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["decode"])
44+
assert point.raw() == point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["encode"])
45+
assert point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["decode"])
4646
# Test from coordinate
4747
point = SLIP10Ed25519Blake2bPoint.from_coordinates(
4848
x=data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["x"],
@@ -53,8 +53,8 @@ def test_slip10_ed25519_blake2b_ecc_point(data):
5353
assert isinstance(point.underlying_object(), bytes)
5454
assert point.x() == data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["x"]
5555
assert point.y() == data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["y"]
56-
assert point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["encode"])
57-
assert point.raw() == point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["decode"])
56+
assert point.raw() == point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["encode"])
57+
assert point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519-Blake2b"][public_key_type]["point"]["decode"])
5858

5959
for number in range(2, 50):
6060
point_add, point_radd, point_mul, point_rmul = (

‎tests/hdwallet/eccs/test_slip10_ed25519_ecc.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def test_slip10_ed25519_ecc_point(data):
4141
assert isinstance(point.underlying_object(), bytes)
4242
assert point.x() == data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["x"]
4343
assert point.y() == data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["y"]
44-
assert point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["encode"])
45-
assert point.raw() == point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["decode"])
44+
assert point.raw() == point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["encode"])
45+
assert point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["decode"])
4646
# Test from coordinate
4747
point = SLIP10Ed25519Point.from_coordinates(
4848
x=data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["x"],
@@ -53,8 +53,8 @@ def test_slip10_ed25519_ecc_point(data):
5353
assert isinstance(point.underlying_object(), bytes)
5454
assert point.x() == data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["x"]
5555
assert point.y() == data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["y"]
56-
assert point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["encode"])
57-
assert point.raw() == point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["decode"])
56+
assert point.raw() == point.raw_encoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["encode"])
57+
assert point.raw_decoded() == get_bytes(data["eccs"]["SLIP10-Ed25519"][public_key_type]["point"]["decode"])
5858

5959
for number in range(2, 50):
6060
point_add, point_radd, point_mul, point_rmul = (

0 commit comments

Comments
 (0)