Skip to content

Commit e5bcd3b

Browse files
greatertomigreatertomi
committed
test: fix failing tests
1 parent c21d193 commit e5bcd3b

File tree

55 files changed

+509
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+509
-219
lines changed

‎packages/cardano-services/test/StakePool/TypeormStakePoolProvider/util.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { validateFuzzyOptions, withTextFilter } from '../../../src/StakePool/Typ
44
describe('TypeormStakePoolProvider utils', () => {
55
describe('validateFuzzyOptions', () => {
66
it('throws if value is not a valid JSON encoded string', () =>
7-
expect(() => validateFuzzyOptions('test')).toThrow('Unexpected token e in JSON at position 1'));
7+
expect(() => validateFuzzyOptions('test')).toThrow(/Unexpected token/));
88
it('throws if value is not an object', () =>
99
expect(() => validateFuzzyOptions('"test"')).toThrow('must be an object'));
1010
it('throws without threshold', () =>

‎packages/e2e/test/load-test-custom/wallet-init/wallet-init.test.ts

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
/* eslint-disable import/imports-first */
22
import * as dotenv from 'dotenv';
3-
import path from 'path';
4-
5-
// This line must come before loading the env, to configure the location of the .env file
6-
dotenv.config({ path: path.join(__dirname, '../../../.env') });
7-
83
import { BaseWallet, createPersonalWallet } from '@cardano-sdk/wallet';
4+
import { Bip32Account, KeyPurpose, util } from '@cardano-sdk/key-management';
95
import { Logger } from 'ts-log';
10-
import { bufferCount, bufferTime, from, mergeAll, tap } from 'rxjs';
11-
import { logger } from '@cardano-sdk/util-dev';
12-
13-
import { Bip32Account, util } from '@cardano-sdk/key-management';
146
import {
157
MeasurementUtil,
168
assetProviderFactory,
@@ -27,6 +19,12 @@ import {
2719
waitForWalletStateSettle,
2820
walletVariables
2921
} from '../../../src';
22+
import { bufferCount, bufferTime, from, mergeAll, tap } from 'rxjs';
23+
import { logger } from '@cardano-sdk/util-dev';
24+
import path from 'path';
25+
26+
// This line must come before loading the env, to configure the location of the .env file
27+
dotenv.config({ path: path.join(__dirname, '../../../.env') });
3028

3129
// Example call that creates 5000 wallets in 10 minutes:
3230
// VIRTUAL_USERS_GENERATE_DURATION=600 VIRTUAL_USERS_COUNT=5000 yarn load-test-custom:wallet-init
@@ -85,7 +83,7 @@ const createWallet = async (accountIndex: number): Promise<BaseWallet> => {
8583

8684
measurementUtil.addStartMarker(MeasureTarget.wallet, accountIndex);
8785
return createPersonalWallet(
88-
{ name: `Wallet ${accountIndex}` },
86+
{ name: `Wallet ${accountIndex}`, purpose: KeyPurpose.STANDARD },
8987
{
9088
...providers,
9189
bip32Account: await Bip32Account.fromAsyncKeyAgent(keyAgent),

‎packages/e2e/test/long-running/cache-invalidation.test.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as Crypto from '@cardano-sdk/crypto';
2-
import { AddressType, KeyRole } from '@cardano-sdk/key-management';
2+
import { AddressType, KeyPurpose, KeyRole } from '@cardano-sdk/key-management';
33
import { Cardano } from '@cardano-sdk/core';
44
import {
55
KeyAgentFactoryProps,
@@ -89,7 +89,8 @@ describe('cache invalidation', () => {
8989
idx: 0,
9090
logger,
9191
name: 'Pool Wallet 1',
92-
polling: { interval: 500 }
92+
polling: { interval: 500 },
93+
purpose: KeyPurpose.STANDARD
9394
});
9495

9596
await waitForWalletStateSettle(wallet1.wallet);

‎packages/e2e/test/long-running/multisig-wallet/MultiSigWallet.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export class MultiSigWallet {
217217
body: multiSigTx.getTransaction().body,
218218
hash: multiSigTx.getTransaction().id
219219
},
220-
{ knownAddresses: [this.#address], txInKeyPathMap: {} },
220+
{ knownAddresses: [this.#address], purpose: KeyPurpose.MULTI_SIG, txInKeyPathMap: {} },
221221
{ additionalKeyPaths: [DERIVATION_PATH] }
222222
);
223223

@@ -413,6 +413,7 @@ export class MultiSigWallet {
413413
address: baseAddress.toAddress().toBech32() as Cardano.PaymentAddress,
414414
index: 0,
415415
networkId,
416+
purpose: KeyPurpose.MULTI_SIG,
416417
rewardAccount: Cardano.RewardAddress.fromCredentials(networkId, scriptCredential)
417418
.toAddress()
418419
.toBech32() as Cardano.RewardAccount,

‎packages/e2e/test/wallet_epoch_0/PersonalWallet/plutusTest.test.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { BaseWallet } from '@cardano-sdk/wallet';
22
import { Cardano, Serialization, UtxoProvider } from '@cardano-sdk/core';
33
import { HexBlob, isNotNil } from '@cardano-sdk/util';
4+
import { KeyPurpose } from '@cardano-sdk/key-management';
45
import { Observable, filter, firstValueFrom, interval, map, switchMap, take } from 'rxjs';
56
import { createLogger } from '@cardano-sdk/util-dev';
67
import { getEnv, getWallet, utxoProviderFactory, walletReady, walletVariables } from '../../../src';
@@ -191,7 +192,9 @@ describe('PersonalWallet/plutus', () => {
191192
});
192193

193194
it('can spend balance from a plutus script', async () => {
194-
wallet = (await getWallet({ env, logger, name: 'Spending Wallet', polling: { interval: 50 } })).wallet;
195+
wallet = (
196+
await getWallet({ env, logger, name: 'Spending Wallet', polling: { interval: 50 }, purpose: KeyPurpose.STANDARD })
197+
).wallet;
195198
// UTXO provider can be use to fetch the UTXO set from the script address.
196199
const utxoProvider = await utxoProviderFactory.create(env.UTXO_PROVIDER, env.UTXO_PROVIDER_PARAMS, logger);
197200

@@ -265,7 +268,9 @@ describe('PersonalWallet/plutus', () => {
265268
});
266269

267270
it('can spend balance from a plutus script using a reference script', async () => {
268-
wallet = (await getWallet({ env, logger, name: 'Spending Wallet', polling: { interval: 50 } })).wallet;
271+
wallet = (
272+
await getWallet({ env, logger, name: 'Spending Wallet', polling: { interval: 50 }, purpose: KeyPurpose.STANDARD })
273+
).wallet;
269274
// UTXO provider can be use to fetch the UTXO set from the script address.
270275
const utxoProvider = await utxoProviderFactory.create(env.UTXO_PROVIDER, env.UTXO_PROVIDER_PARAMS, logger);
271276

‎packages/e2e/test/wallet_epoch_0/SharedWallet/utils.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as Crypto from '@cardano-sdk/crypto';
22
import {
33
AccountKeyDerivationPath,
44
KeyAgent,
5+
KeyPurpose,
56
KeyRole,
67
SignBlobResult,
78
SignDataContext,
@@ -22,6 +23,7 @@ const randomPublicKey = () => Crypto.Ed25519PublicKeyHex(Array.from({ length: 64
2223

2324
const DERIVATION_PATH = {
2425
index: 0,
26+
purpose: KeyPurpose.STANDARD,
2527
role: KeyRole.External
2628
};
2729

@@ -30,7 +32,12 @@ const getKeyAgent = async (
3032
genesisParameters: Cardano.CompactGenesis,
3133
bip32Ed25519: Crypto.Bip32Ed25519
3234
) => {
33-
const keyAgent = await createStandaloneKeyAgent(mnemonics.split(' '), genesisParameters, bip32Ed25519);
35+
const keyAgent = await createStandaloneKeyAgent(
36+
mnemonics.split(' '),
37+
genesisParameters,
38+
bip32Ed25519,
39+
KeyPurpose.STANDARD
40+
);
3441

3542
const pubKey = await keyAgent.derivePublicKey(DERIVATION_PATH);
3643

@@ -294,6 +301,7 @@ export const buildSharedWallets = async (env: any, genesisParameters: Cardano.Co
294301
name: 'Alice shared Wallet',
295302
paymentScript,
296303
polling: { interval: 50 },
304+
purpose: KeyPurpose.STANDARD,
297305
stakingScript,
298306
witnesser: new SharedWalletWitnesser(alice.keyAgent, paymentScript, stakingScript)
299307
})
@@ -306,6 +314,7 @@ export const buildSharedWallets = async (env: any, genesisParameters: Cardano.Co
306314
name: 'Bob shared Wallet',
307315
paymentScript,
308316
polling: { interval: 50 },
317+
purpose: KeyPurpose.STANDARD,
309318
stakingScript,
310319
witnesser: new SharedWalletWitnesser(bob.keyAgent, paymentScript, stakingScript)
311320
})
@@ -318,6 +327,7 @@ export const buildSharedWallets = async (env: any, genesisParameters: Cardano.Co
318327
name: 'Charlotte shared Wallet',
319328
paymentScript,
320329
polling: { interval: 50 },
330+
purpose: KeyPurpose.STANDARD,
321331
stakingScript,
322332
witnesser: new SharedWalletWitnesser(charlotte.keyAgent, paymentScript, stakingScript)
323333
})

‎packages/hardware-ledger/src/transformers/certificates.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const getCredentialType = (knownAddress: GroupedAddress | undefined) => {
104104
const stakeCredentialMapper = (credential: Cardano.Credential, context: LedgerTxTransformerContext) => {
105105
const knownAddress = getKnownAddress(credential, context);
106106
const credentialType = getCredentialType(knownAddress);
107-
const path = util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
107+
const path = util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose: context.purpose });
108108

109109
return credentialMapper(credential, credentialType, path);
110110
};
@@ -160,7 +160,7 @@ const getPoolOperatorKeyPath = (
160160
context: LedgerTxTransformerContext
161161
): Ledger.BIP32Path | null => {
162162
const knownAddress = context?.knownAddresses.find((address) => address.rewardAccount === operator);
163-
return util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
163+
return util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose: context.purpose });
164164
};
165165

166166
export const poolRegistrationCertificate: Transform<
@@ -270,7 +270,7 @@ const poolRetirementCertificate: Transform<
270270
)
271271
);
272272

273-
const poolKeyPath = util.stakeKeyPathFromGroupedAddress({ address: knownAddress });
273+
const poolKeyPath = util.stakeKeyPathFromGroupedAddress({ address: knownAddress, purpose: context?.purpose });
274274

275275
if (!poolKeyPath) throw new InvalidArgumentError('certificate', 'Missing key matching pool retirement certificate.');
276276

‎packages/hardware-ledger/test/LedgerKeyAgent.test.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as Crypto from '@cardano-sdk/crypto';
33
import * as Ledger from '@cardano-foundation/ledgerjs-hw-app-cardano';
44
import { Ada, InvalidDataReason } from '@cardano-foundation/ledgerjs-hw-app-cardano';
55
import { Cardano } from '@cardano-sdk/core';
6-
import { CardanoKeyConst, CommunicationType, util } from '@cardano-sdk/key-management';
6+
import { CardanoKeyConst, CommunicationType, KeyPurpose, util } from '@cardano-sdk/key-management';
77
import { LedgerKeyAgent } from '../src';
88
import { dummyLogger } from 'ts-log';
99
import { poolId, poolParameters, pureAdaTxOut, stakeKeyHash, txIn, txOutWithDatum } from './testData';
@@ -366,6 +366,7 @@ describe('LedgerKeyAgent', () => {
366366
const txId = '0000000000000000000000000000000000000000000000000000000000000000' as unknown as Cardano.TransactionId;
367367
const noAddressesOptions = {
368368
knownAddresses: [],
369+
purpose: KeyPurpose.STANDARD,
369370
txInKeyPathMap: {}
370371
};
371372

@@ -379,7 +380,8 @@ describe('LedgerKeyAgent', () => {
379380
communicationType: CommunicationType.Node,
380381
extendedAccountPublicKey: Crypto.Bip32PublicKeyHex(
381382
'00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
382-
)
383+
),
384+
purpose: KeyPurpose.STANDARD
383385
},
384386
{
385387
bip32Ed25519: new Crypto.SodiumBip32Ed25519(),

‎packages/hardware-ledger/test/transformers/certificates.test.ts

+48-15
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* eslint-disable sonarjs/no-duplicate-string */
22
import * as Ledger from '@cardano-foundation/ledgerjs-hw-app-cardano';
33
import {
4-
AccountKeyDerivationPath,
54
AddressType,
65
CardanoKeyConst,
76
GroupedAddress,
7+
KeyPurpose,
88
KeyRole,
99
TxInId,
1010
TxInKeyPathMap,
@@ -22,23 +22,26 @@ import {
2222
} from '../testData';
2323
import { Cardano } from '@cardano-sdk/core';
2424
import { Hash28ByteBase16 } from '@cardano-sdk/crypto';
25-
import { LedgerTxTransformerContext } from '../../src';
26-
import { getKnownAddress, mapCerts } from '../../src/transformers/certificates';
25+
import { LedgerTxTransformerContext, getKnownAddress, mapCerts } from '../../src';
2726

2827
export const stakeKeyPath = {
2928
index: 0,
29+
purpose: KeyPurpose.STANDARD,
3030
role: KeyRole.Stake
3131
};
32-
const createGroupedAddress = (
33-
address: Cardano.PaymentAddress,
34-
rewardAccount: Cardano.RewardAccount,
35-
type: AddressType,
36-
index: number,
37-
stakeKeyDerivationPath: AccountKeyDerivationPath
38-
): GroupedAddress =>
32+
33+
const createGroupedAddress = ({
34+
address,
35+
rewardAccount,
36+
stakeKeyDerivationPath,
37+
index,
38+
purpose,
39+
type
40+
}: Omit<GroupedAddress, 'networkId' | 'accountIndex'>): GroupedAddress =>
3941
({
4042
address,
4143
index,
44+
purpose,
4245
rewardAccount,
4346
stakeKeyDerivationPath,
4447
type
@@ -64,6 +67,7 @@ export const createTxInKeyPathMapMock = (knownAddresses: GroupedAddress[]): TxIn
6467
const txInId: TxInId = `MockTxIn_${index}` as TxInId; // Mock TxInId creation
6568
result[txInId] = {
6669
index: address.index,
70+
purpose: address.purpose,
6771
role: KeyRole.Internal
6872
};
6973
}
@@ -78,13 +82,42 @@ const mockContext: LedgerTxTransformerContext = {
7882
handleResolutions: [],
7983

8084
knownAddresses: [
81-
createGroupedAddress(address1, ownRewardAccount, AddressType.External, 0, stakeKeyPath),
82-
createGroupedAddress(address2, ownRewardAccount, AddressType.External, 1, stakeKeyPath)
85+
createGroupedAddress({
86+
address: address1,
87+
index: 0,
88+
purpose: KeyPurpose.STANDARD,
89+
rewardAccount: ownRewardAccount,
90+
stakeKeyDerivationPath: stakeKeyPath,
91+
type: AddressType.External
92+
}),
93+
createGroupedAddress({
94+
address: address2,
95+
index: 1,
96+
purpose: KeyPurpose.STANDARD,
97+
rewardAccount: ownRewardAccount,
98+
stakeKeyDerivationPath: stakeKeyPath,
99+
type: AddressType.External
100+
})
83101
],
102+
purpose: KeyPurpose.STANDARD,
84103
sender: undefined,
85104
txInKeyPathMap: createTxInKeyPathMapMock([
86-
createGroupedAddress(address1, ownRewardAccount, AddressType.External, 0, stakeKeyPath),
87-
createGroupedAddress(address2, ownRewardAccount, AddressType.External, 1, stakeKeyPath)
105+
createGroupedAddress({
106+
address: address1,
107+
index: 0,
108+
purpose: KeyPurpose.STANDARD,
109+
rewardAccount: ownRewardAccount,
110+
stakeKeyDerivationPath: stakeKeyPath,
111+
type: AddressType.External
112+
}),
113+
createGroupedAddress({
114+
address: address2,
115+
index: 1,
116+
purpose: KeyPurpose.STANDARD,
117+
rewardAccount: ownRewardAccount,
118+
stakeKeyDerivationPath: stakeKeyPath,
119+
type: AddressType.External
120+
})
88121
])
89122
};
90123

@@ -140,7 +173,7 @@ describe('certificates', () => {
140173
params: {
141174
stakeCredential: {
142175
keyPath: [
143-
util.harden(CardanoKeyConst.PURPOSE),
176+
util.harden(KeyPurpose.STANDARD),
144177
util.harden(CardanoKeyConst.COIN_TYPE),
145178
util.harden(0),
146179
KeyRole.Stake,

‎packages/hardware-ledger/test/transformers/collateralInputs.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CONTEXT_WITH_KNOWN_ADDRESSES, txIn } from '../testData';
2-
import { CardanoKeyConst, TxInId, util } from '@cardano-sdk/key-management';
2+
import { CardanoKeyConst, KeyPurpose, TxInId, util } from '@cardano-sdk/key-management';
33
import { mapCollateralTxIns } from '../../src/transformers';
44

55
describe('collateralInputs', () => {
@@ -12,6 +12,7 @@ describe('collateralInputs', () => {
1212
it('can map a a set of collateral inputs', async () => {
1313
const keyPath = {
1414
index: 0,
15+
purpose: KeyPurpose.STANDARD,
1516
role: 1
1617
};
1718
const txIns = mapCollateralTxIns([txIn, txIn, txIn], {

‎packages/hardware-ledger/test/transformers/txIn.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { CONTEXT_WITHOUT_KNOWN_ADDRESSES, CONTEXT_WITH_KNOWN_ADDRESSES, txIn } from '../testData';
2-
import { CardanoKeyConst, TxInId, util } from '@cardano-sdk/key-management';
3-
import { mapTxIns, toTxIn } from '../../src/transformers';
2+
import { CardanoKeyConst, KeyPurpose, TxInId, util } from '@cardano-sdk/key-management';
3+
import { mapTxIns, toTxIn } from '../../src';
44

55
describe('txIn', () => {
6-
const paymentKeyPath = { index: 0, role: 1 };
6+
const paymentKeyPath = { index: 0, purpose: KeyPurpose.STANDARD, role: 1 };
77

88
describe('mapTxIns', () => {
99
it('can map a a set of TxIns', async () => {
@@ -52,7 +52,7 @@ describe('txIn', () => {
5252
expect(ledgerTxIn).toEqual({
5353
outputIndex: txIn.index,
5454
path: [
55-
util.harden(CardanoKeyConst.PURPOSE),
55+
util.harden(KeyPurpose.STANDARD),
5656
util.harden(CardanoKeyConst.COIN_TYPE),
5757
util.harden(CONTEXT_WITH_KNOWN_ADDRESSES.accountIndex),
5858
paymentKeyPath.role,

‎packages/hardware-trezor/src/transformers/additionalWitnessRequests.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ export const mapAdditionalWitnessRequests: Transform<
2222
const additionalWitnessPaths: Trezor.DerivationPath[] = [...paymentKeyPaths];
2323

2424
if (context?.knownAddresses?.length) {
25-
const stakeKeyPath = util.stakeKeyPathFromGroupedAddress({ address: context.knownAddresses[0] });
25+
const stakeKeyPath = util.stakeKeyPathFromGroupedAddress({
26+
address: context.knownAddresses[0],
27+
purpose: context.purpose
28+
});
2629
if (stakeKeyPath) additionalWitnessPaths.push(stakeKeyPath);
2730
}
2831
return additionalWitnessPaths;

0 commit comments

Comments
 (0)