Skip to content

Commit b3bb51d

Browse files
neuodevneuodev
committed
fix: update test snapshots & update broken tests
1 parent 2d26840 commit b3bb51d

File tree

11 files changed

+49
-269
lines changed

11 files changed

+49
-269
lines changed

‎packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/multiwallet.test.js.snap

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -594,22 +594,6 @@ Array [
594594
"NetworkId": 0,
595595
"TokenId": 1,
596596
},
597-
Object {
598-
"Digest": 6.262633522161549e-167,
599-
"Identifier": "",
600-
"IsDefault": true,
601-
"IsNFT": false,
602-
"Metadata": Object {
603-
"assetName": "",
604-
"longName": null,
605-
"numberOfDecimals": 6,
606-
"policyId": "",
607-
"ticker": "ADA",
608-
"type": "Cardano",
609-
},
610-
"NetworkId": 100,
611-
"TokenId": 2,
612-
},
613597
Object {
614598
"Digest": 6.262633522161549e-167,
615599
"Identifier": "",
@@ -625,7 +609,7 @@ Array [
625609
"type": "Ergo",
626610
},
627611
"NetworkId": 200,
628-
"TokenId": 3,
612+
"TokenId": 2,
629613
},
630614
Object {
631615
"Digest": 6.262633522161549e-167,
@@ -641,7 +625,7 @@ Array [
641625
"type": "Cardano",
642626
},
643627
"NetworkId": 300,
644-
"TokenId": 4,
628+
"TokenId": 3,
645629
},
646630
Object {
647631
"Digest": 6.262633522161549e-167,
@@ -657,7 +641,7 @@ Array [
657641
"type": "Cardano",
658642
},
659643
"NetworkId": 400,
660-
"TokenId": 5,
644+
"TokenId": 4,
661645
},
662646
Object {
663647
"Digest": 6.262633522161549e-167,
@@ -673,7 +657,7 @@ Array [
673657
"type": "Cardano",
674658
},
675659
"NetworkId": 250,
676-
"TokenId": 6,
660+
"TokenId": 5,
677661
},
678662
Object {
679663
"Digest": 6.262633522161549e-167,
@@ -689,7 +673,7 @@ Array [
689673
"type": "Cardano",
690674
},
691675
"NetworkId": 350,
692-
"TokenId": 7,
676+
"TokenId": 6,
693677
},
694678
],
695679
},

‎packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/shelley.test.js.snap

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -451,22 +451,6 @@ Array [
451451
"NetworkId": 0,
452452
"TokenId": 1,
453453
},
454-
Object {
455-
"Digest": 6.262633522161549e-167,
456-
"Identifier": "",
457-
"IsDefault": true,
458-
"IsNFT": false,
459-
"Metadata": Object {
460-
"assetName": "",
461-
"longName": null,
462-
"numberOfDecimals": 6,
463-
"policyId": "",
464-
"ticker": "ADA",
465-
"type": "Cardano",
466-
},
467-
"NetworkId": 100,
468-
"TokenId": 2,
469-
},
470454
Object {
471455
"Digest": 6.262633522161549e-167,
472456
"Identifier": "",
@@ -482,7 +466,7 @@ Array [
482466
"type": "Ergo",
483467
},
484468
"NetworkId": 200,
485-
"TokenId": 3,
469+
"TokenId": 2,
486470
},
487471
Object {
488472
"Digest": 6.262633522161549e-167,
@@ -498,7 +482,7 @@ Array [
498482
"type": "Cardano",
499483
},
500484
"NetworkId": 300,
501-
"TokenId": 4,
485+
"TokenId": 3,
502486
},
503487
Object {
504488
"Digest": 6.262633522161549e-167,
@@ -514,7 +498,7 @@ Array [
514498
"type": "Cardano",
515499
},
516500
"NetworkId": 400,
517-
"TokenId": 5,
501+
"TokenId": 4,
518502
},
519503
Object {
520504
"Digest": 6.262633522161549e-167,
@@ -530,7 +514,7 @@ Array [
530514
"type": "Cardano",
531515
},
532516
"NetworkId": 250,
533-
"TokenId": 6,
517+
"TokenId": 5,
534518
},
535519
Object {
536520
"Digest": 6.262633522161549e-167,
@@ -546,7 +530,7 @@ Array [
546530
"type": "Cardano",
547531
},
548532
"NetworkId": 350,
549-
"TokenId": 7,
533+
"TokenId": 6,
550534
},
551535
],
552536
},

‎packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/simpleTxs.test.js.snap

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -455,22 +455,6 @@ Array [
455455
"NetworkId": 0,
456456
"TokenId": 1,
457457
},
458-
Object {
459-
"Digest": 6.262633522161549e-167,
460-
"Identifier": "",
461-
"IsDefault": true,
462-
"IsNFT": false,
463-
"Metadata": Object {
464-
"assetName": "",
465-
"longName": null,
466-
"numberOfDecimals": 6,
467-
"policyId": "",
468-
"ticker": "ADA",
469-
"type": "Cardano",
470-
},
471-
"NetworkId": 100,
472-
"TokenId": 2,
473-
},
474458
Object {
475459
"Digest": 6.262633522161549e-167,
476460
"Identifier": "",
@@ -486,7 +470,7 @@ Array [
486470
"type": "Ergo",
487471
},
488472
"NetworkId": 200,
489-
"TokenId": 3,
473+
"TokenId": 2,
490474
},
491475
Object {
492476
"Digest": 6.262633522161549e-167,
@@ -502,7 +486,7 @@ Array [
502486
"type": "Cardano",
503487
},
504488
"NetworkId": 300,
505-
"TokenId": 4,
489+
"TokenId": 3,
506490
},
507491
Object {
508492
"Digest": 6.262633522161549e-167,
@@ -518,7 +502,7 @@ Array [
518502
"type": "Cardano",
519503
},
520504
"NetworkId": 400,
521-
"TokenId": 5,
505+
"TokenId": 4,
522506
},
523507
Object {
524508
"Digest": 6.262633522161549e-167,
@@ -534,7 +518,7 @@ Array [
534518
"type": "Cardano",
535519
},
536520
"NetworkId": 250,
537-
"TokenId": 6,
521+
"TokenId": 5,
538522
},
539523
Object {
540524
"Digest": 6.262633522161549e-167,
@@ -550,7 +534,7 @@ Array [
550534
"type": "Cardano",
551535
},
552536
"NetworkId": 350,
553-
"TokenId": 7,
537+
"TokenId": 6,
554538
},
555539
],
556540
},

‎packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/status.test.js.snap

Lines changed: 10 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -923,22 +923,6 @@ Array [
923923
"NetworkId": 0,
924924
"TokenId": 1,
925925
},
926-
Object {
927-
"Digest": 6.262633522161549e-167,
928-
"Identifier": "",
929-
"IsDefault": true,
930-
"IsNFT": false,
931-
"Metadata": Object {
932-
"assetName": "",
933-
"longName": null,
934-
"numberOfDecimals": 6,
935-
"policyId": "",
936-
"ticker": "ADA",
937-
"type": "Cardano",
938-
},
939-
"NetworkId": 100,
940-
"TokenId": 2,
941-
},
942926
Object {
943927
"Digest": 6.262633522161549e-167,
944928
"Identifier": "",
@@ -954,7 +938,7 @@ Array [
954938
"type": "Ergo",
955939
},
956940
"NetworkId": 200,
957-
"TokenId": 3,
941+
"TokenId": 2,
958942
},
959943
Object {
960944
"Digest": 6.262633522161549e-167,
@@ -970,7 +954,7 @@ Array [
970954
"type": "Cardano",
971955
},
972956
"NetworkId": 300,
973-
"TokenId": 4,
957+
"TokenId": 3,
974958
},
975959
Object {
976960
"Digest": 6.262633522161549e-167,
@@ -986,7 +970,7 @@ Array [
986970
"type": "Cardano",
987971
},
988972
"NetworkId": 400,
989-
"TokenId": 5,
973+
"TokenId": 4,
990974
},
991975
Object {
992976
"Digest": 6.262633522161549e-167,
@@ -1002,7 +986,7 @@ Array [
1002986
"type": "Cardano",
1003987
},
1004988
"NetworkId": 250,
1005-
"TokenId": 6,
989+
"TokenId": 5,
1006990
},
1007991
Object {
1008992
"Digest": 6.262633522161549e-167,
@@ -1018,7 +1002,7 @@ Array [
10181002
"type": "Cardano",
10191003
},
10201004
"NetworkId": 350,
1021-
"TokenId": 7,
1005+
"TokenId": 6,
10221006
},
10231007
],
10241008
},
@@ -2135,22 +2119,6 @@ Array [
21352119
"NetworkId": 0,
21362120
"TokenId": 1,
21372121
},
2138-
Object {
2139-
"Digest": 6.262633522161549e-167,
2140-
"Identifier": "",
2141-
"IsDefault": true,
2142-
"IsNFT": false,
2143-
"Metadata": Object {
2144-
"assetName": "",
2145-
"longName": null,
2146-
"numberOfDecimals": 6,
2147-
"policyId": "",
2148-
"ticker": "ADA",
2149-
"type": "Cardano",
2150-
},
2151-
"NetworkId": 100,
2152-
"TokenId": 2,
2153-
},
21542122
Object {
21552123
"Digest": 6.262633522161549e-167,
21562124
"Identifier": "",
@@ -2166,7 +2134,7 @@ Array [
21662134
"type": "Ergo",
21672135
},
21682136
"NetworkId": 200,
2169-
"TokenId": 3,
2137+
"TokenId": 2,
21702138
},
21712139
Object {
21722140
"Digest": 6.262633522161549e-167,
@@ -2182,7 +2150,7 @@ Array [
21822150
"type": "Cardano",
21832151
},
21842152
"NetworkId": 300,
2185-
"TokenId": 4,
2153+
"TokenId": 3,
21862154
},
21872155
Object {
21882156
"Digest": 6.262633522161549e-167,
@@ -2198,7 +2166,7 @@ Array [
21982166
"type": "Cardano",
21992167
},
22002168
"NetworkId": 400,
2201-
"TokenId": 5,
2169+
"TokenId": 4,
22022170
},
22032171
Object {
22042172
"Digest": 6.262633522161549e-167,
@@ -2214,7 +2182,7 @@ Array [
22142182
"type": "Cardano",
22152183
},
22162184
"NetworkId": 250,
2217-
"TokenId": 6,
2185+
"TokenId": 5,
22182186
},
22192187
Object {
22202188
"Digest": 6.262633522161549e-167,
@@ -2230,7 +2198,7 @@ Array [
22302198
"type": "Cardano",
22312199
},
22322200
"NetworkId": 350,
2233-
"TokenId": 7,
2201+
"TokenId": 6,
22342202
},
22352203
],
22362204
},

‎packages/yoroi-extension/app/api/ada/lib/storage/bridge/utils.js

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -370,31 +370,6 @@ export function getCardanoSpendingKeyHash(
370370
throw new Error(`${nameof(getCardanoSpendingKeyHash)} unknown address type`);
371371
}
372372

373-
export function getJormungandrSpendingKey(
374-
addr: RustModule.WalletV3.Address,
375-
): (
376-
// null -> legacy address (no key hash)
377-
RustModule.WalletV3.PublicKey | null
378-
) {
379-
{
380-
const groupAddr = addr.to_group_address();
381-
if (groupAddr) return groupAddr.get_spending_key();
382-
}
383-
{
384-
const multisig = addr.to_multisig_address();
385-
if (multisig) throw new Error(`${nameof(getJormungandrSpendingKey)} multisig not supported`);
386-
}
387-
{
388-
const singleAddr = addr.to_single_address();
389-
if (singleAddr) return singleAddr.get_spending_key();
390-
}
391-
{
392-
const accountAddr = addr.to_account_address();
393-
if (accountAddr) return accountAddr.get_account_key();
394-
}
395-
throw new Error(`${nameof(getJormungandrSpendingKey)} unknown address type`);
396-
}
397-
398373
export function addressToDisplayString(
399374
address: string,
400375
network: $ReadOnly<NetworkRow>,

0 commit comments

Comments
 (0)