Skip to content

Commit 3fdead3

Browse files
committed
fix: rm imports from @cardano-sdk/*/src/*
1 parent 7a47d26 commit 3fdead3

16 files changed

+46
-57
lines changed

Diff for: .eslintrc.js

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ module.exports = {
2323
2,
2424
"unix"
2525
],
26+
"no-restricted-imports": ["error", {
27+
"patterns": ["@cardano-sdk/*/src/*"]
28+
}],
2629
"new-cap": 0,
2730
"no-unused-expressions": 0,
2831
"no-useless-constructor": 0,

Diff for: packages/cip2/test/RoundRobinRandomImprove.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
testInputSelectionFailureMode,
88
testInputSelectionProperties
99
} from './util';
10-
import { createOutput } from '@cardano-sdk/util-dev/src/cslTestUtil';
1110
import { roundRobinRandomImprove } from '../src/RoundRobinRandomImprove';
1211
import fc from 'fast-check';
1312

@@ -37,7 +36,7 @@ describe('RoundRobinRandomImprove', () => {
3736
});
3837
it('Selects UTxO even when implicit input covers outputs', async () => {
3938
const utxo = new Set([CslTestUtil.createUnspentTxOutput({ coins: 10_000_000n })]);
40-
const outputs = new Set([createOutput({ coins: 1_000_000n })]);
39+
const outputs = new Set([CslTestUtil.createOutput({ coins: 1_000_000n })]);
4140
const results = await roundRobinRandomImprove().select({
4241
constraints: SelectionConstraints.NO_CONSTRAINTS,
4342
implicitCoin: { input: 2_000_000n },

Diff for: packages/core/test/CSL/coreToCsl.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable max-len */
22
import { Asset, CSL, Cardano, coreToCsl } from '../../src';
3-
import { CertificateType } from '@cardano-sdk/core/src/Cardano';
43

54
const txIn: Cardano.TxIn = {
65
address:
@@ -23,7 +22,7 @@ const txOut: Cardano.TxOut = {
2322
const coreTxBody: Cardano.TxBodyAlonzo = {
2423
certificates: [
2524
{
26-
__typename: CertificateType.PoolRetirement,
25+
__typename: Cardano.CertificateType.PoolRetirement,
2726
epoch: 500,
2827
poolId: 'pool1y6chk7x7fup4ms9leesdr57r4qy9cwxuee0msan72x976a6u0nc'
2928
}

Diff for: packages/util-dev/src/createStubStakePoolSearchProvider.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { StakePool } from '@cardano-sdk/core/src/Cardano';
2-
import { StakePoolSearchProvider } from '@cardano-sdk/core';
1+
import { Cardano, StakePoolSearchProvider } from '@cardano-sdk/core';
32
import delay from 'delay';
43

5-
export const somePartialStakePools: StakePool[] = [
4+
export const somePartialStakePools: Cardano.StakePool[] = [
65
{
76
hexId: 'cf12a9dcaacdc09778616d60502011a88ed4542c482f2ddd08d8ac5a',
87
id: 'pool1euf2nh92ehqfw7rpd4s9qgq34z8dg4pvfqhjmhggmzk95gcd402',
@@ -23,13 +22,13 @@ export const somePartialStakePools: StakePool[] = [
2322
ticker: 'VEGA2'
2423
}
2524
}
26-
] as StakePool[];
25+
] as Cardano.StakePool[];
2726

2827
/**
2928
* Good source for testnet pools: https://testnet.adatools.io/pools
3029
*/
3130
export const createStubStakePoolSearchProvider = (
32-
stakePools: StakePool[] = somePartialStakePools,
31+
stakePools: Cardano.StakePool[] = somePartialStakePools,
3332
delayMs?: number
3433
): StakePoolSearchProvider => ({
3534
queryStakePools: async (fragments) => {

Diff for: packages/wallet/src/Transaction/computeImplicitCoin.ts

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { BigIntMath, Cardano, ProtocolParametersRequiredByWallet } from '@cardano-sdk/core';
2-
import { CertificateType } from '@cardano-sdk/core/src/Cardano';
32
import { InitializeTxProps } from '../types';
43

54
/**
@@ -14,17 +13,17 @@ export const computeImplicitCoin = (
1413
const deposit = BigIntMath.sum(
1514
certificates?.map(
1615
(cert) =>
17-
(cert.__typename === CertificateType.StakeRegistration && stakeKeyDepositBigint) ||
18-
(cert.__typename === CertificateType.PoolRegistration && poolDepositBigint) ||
16+
(cert.__typename === Cardano.CertificateType.StakeRegistration && stakeKeyDepositBigint) ||
17+
(cert.__typename === Cardano.CertificateType.PoolRegistration && poolDepositBigint) ||
1918
0n
2019
) || []
2120
);
2221
const withdrawalsTotal = (withdrawals && BigIntMath.sum(withdrawals.map(({ quantity }) => quantity))) || 0n;
2322
const reclaimTotal = BigIntMath.sum(
2423
certificates?.map(
2524
(cert) =>
26-
(cert.__typename === CertificateType.StakeDeregistration && stakeKeyDepositBigint) ||
27-
(cert.__typename === CertificateType.PoolRetirement && poolDepositBigint) ||
25+
(cert.__typename === Cardano.CertificateType.StakeDeregistration && stakeKeyDepositBigint) ||
26+
(cert.__typename === Cardano.CertificateType.PoolRetirement && poolDepositBigint) ||
2827
0n
2928
) || []
3029
);

Diff for: packages/wallet/src/services/DelegationTracker/DelegationTracker.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable unicorn/no-nested-ternary */
22
import { Cardano, StakePoolSearchProvider, WalletProvider } from '@cardano-sdk/core';
3-
import { CertificateType, Epoch, NewTxAlonzo } from '@cardano-sdk/core/src/Cardano';
43
import { Delegation, Transactions } from '../types';
54
import { DelegationKeyStatus } from '..';
65
import { KeyManager } from '../../KeyManagement';
@@ -30,7 +29,7 @@ export interface DelegationTrackerProps {
3029
walletProvider: WalletProvider;
3130
keyManager: KeyManager;
3231
stakePoolSearchProvider: StakePoolSearchProvider;
33-
epoch$: Observable<Epoch>;
32+
epoch$: Observable<Cardano.Epoch>;
3433
transactionsTracker: Transactions;
3534
retryBackoffConfig: RetryBackoffConfig;
3635
internals?: {
@@ -56,7 +55,7 @@ export const certificateTransactionsWithEpochs = (
5655

5756
export const createRewardAccountsTracker = (
5857
transactions$: Observable<TxWithEpoch[]>,
59-
transactionsInFlight$: Observable<NewTxAlonzo[]>
58+
transactionsInFlight$: Observable<Cardano.NewTxAlonzo[]>
6059
) =>
6160
combineLatest([transactions$, transactionsInFlight$]).pipe(
6261
map(([transactions, transactionsInFlight]) => [transactions.map(({ tx }) => tx), transactionsInFlight]),
@@ -107,9 +106,9 @@ export const createDelegationTracker = ({
107106
} = {}
108107
}: DelegationTrackerProps): Delegation => {
109108
const transactions$ = certificateTransactionsWithEpochs(transactionsTracker, blockEpochProvider, [
110-
CertificateType.StakeDelegation,
111-
CertificateType.StakeRegistration,
112-
CertificateType.StakeDeregistration
109+
Cardano.CertificateType.StakeDelegation,
110+
Cardano.CertificateType.StakeRegistration,
111+
Cardano.CertificateType.StakeDeregistration
113112
]);
114113
const rewardsHistory$ = new TrackerSubject(createRewardsHistoryTracker(transactions$, rewardsHistoryProvider));
115114
const delegatee$ = new TrackerSubject(createDelegateeTracker(queryStakePoolsProvider, epoch$, transactions$));

Diff for: packages/wallet/src/services/DelegationTracker/RewardsHistory.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import { BigIntMath, Cardano, WalletProvider } from '@cardano-sdk/core';
1+
import { BigIntMath, Cardano, WalletProvider, util } from '@cardano-sdk/core';
22
import { KeyManager } from '../../KeyManagement';
33
import { Observable, distinctUntilChanged, map, of, switchMap } from 'rxjs';
44
import { RetryBackoffConfig } from 'backoff-rxjs';
55
import { TxWithEpoch } from './types';
66
import { coldObservableProvider, transactionHasAnyCertificate } from '../util';
77
import { first } from 'lodash-es';
8-
import { isNotNil } from '@cardano-sdk/core/src/util/misc';
98

109
export const createRewardsHistoryProvider =
1110
(walletProvider: WalletProvider, keyManager: KeyManager, retryBackoffConfig: RetryBackoffConfig) =>
@@ -26,7 +25,7 @@ const firstDelegationEpoch$ = (transactions$: Observable<TxWithEpoch[]>) =>
2625
transactions.filter(({ tx }) => transactionHasAnyCertificate(tx, [Cardano.CertificateType.StakeDelegation]))
2726
)
2827
),
29-
map((tx) => (isNotNil(tx) ? tx.epoch + 2 : null)),
28+
map((tx) => (util.isNotNil(tx) ? tx.epoch + 2 : null)),
3029
distinctUntilChanged()
3130
);
3231

Diff for: packages/wallet/src/services/DelegationTracker/transactionCertificates.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Cardano, util } from '@cardano-sdk/core';
22
import { Transactions } from '../types';
3-
import { TxBodyAlonzo } from '@cardano-sdk/core/src/Cardano';
43
import { distinctUntilChanged, map } from 'rxjs';
54
import { last } from 'lodash-es';
65
import { transactionsEquals } from '../util/equals';
@@ -10,7 +9,7 @@ export const RegAndDeregCertificateTypes = [
109
Cardano.CertificateType.StakeDeregistration
1110
];
1211

13-
export const transactionStakeKeyCertficates = (body: TxBodyAlonzo) =>
12+
export const transactionStakeKeyCertficates = (body: Cardano.TxBodyAlonzo) =>
1413
(body.certificates || []).filter((certificate): certificate is Cardano.StakeAddressCertificate =>
1514
RegAndDeregCertificateTypes.includes(certificate.__typename)
1615
);
@@ -21,7 +20,7 @@ export const transactionHasAnyCertificate = (
2120
) => certificates?.some(({ __typename }) => certificateTypes.includes(__typename)) || false;
2221

2322
export const isLastStakeKeyCertOfType = (
24-
transactions: { body: TxBodyAlonzo }[],
23+
transactions: { body: Cardano.TxBodyAlonzo }[],
2524
certType: Cardano.CertificateType.StakeRegistration | Cardano.CertificateType.StakeDeregistration,
2625
rewardAccount?: Cardano.Address
2726
) => {

Diff for: packages/wallet/src/services/util/equals.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { Cardano } from '@cardano-sdk/core';
2-
import { TxAlonzo } from '@cardano-sdk/core/src/Cardano';
32

43
export const strictEquals = <T>(a: T, b: T) => a === b;
54

65
export const arrayEquals = <T>(arrayA: T[], arrayB: T[], itemEquals: (a: T, b: T) => boolean) =>
76
arrayA.length === arrayB.length && arrayA.every((a) => arrayB.some((b) => itemEquals(a, b)));
87

9-
export const txEquals = (a: TxAlonzo, b: TxAlonzo) => a.id === b.id;
8+
export const txEquals = (a: Cardano.TxAlonzo, b: Cardano.TxAlonzo) => a.id === b.id;
109

1110
export const transactionsEquals = (a: Cardano.TxAlonzo[], b: Cardano.TxAlonzo[]) => arrayEquals(a, b, txEquals);
1211

Diff for: packages/wallet/test/SingleAddressWallet.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import * as mocks from './mocks';
33
import { Cardano } from '@cardano-sdk/core';
44
import { KeyManagement, SingleAddressWallet } from '../src';
5-
import { coalesceValueQuantities } from '@cardano-sdk/core/src/Cardano/util';
65
import { createStubStakePoolSearchProvider } from '@cardano-sdk/util-dev';
76
import { firstValueFrom, skip } from 'rxjs';
87

@@ -41,7 +40,7 @@ describe('SingleAddressWallet', () => {
4140
await firstValueFrom(wallet.balance.available$);
4241
await firstValueFrom(wallet.balance.total$);
4342
expect(wallet.balance.available$.value?.coins).toEqual(
44-
coalesceValueQuantities(mocks.utxo.map((utxo) => utxo[1].value)).coins
43+
Cardano.util.coalesceValueQuantities(mocks.utxo.map((utxo) => utxo[1].value)).coins
4544
);
4645
expect(wallet.balance.total$.value?.rewards).toBe(mocks.rewards);
4746
});

Diff for: packages/wallet/test/Transaction/computeImplicitCoin.test.ts

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
import { Cardano, ProtocolParametersRequiredByWallet } from '@cardano-sdk/core';
2-
import { CertificateType } from '@cardano-sdk/core/src/Cardano';
32
import { InitializeTxProps, Transaction } from '../../src';
43

54
describe('Transaction.computeImplicitCoin', () => {
65
it('sums registrations for deposit, withdrawals and deregistrations for input', async () => {
76
const protocolParameters = { poolDeposit: 3, stakeKeyDeposit: 2 } as ProtocolParametersRequiredByWallet;
87
const address = 'stake...';
98
const certificates: Cardano.Certificate[] = [
10-
{ __typename: CertificateType.StakeRegistration, address },
11-
{ __typename: CertificateType.StakeDeregistration, address },
12-
{ __typename: CertificateType.StakeRegistration, address },
13-
{ __typename: CertificateType.PoolRetirement, epoch: 500, poolId: 'pool...' },
14-
{ __typename: CertificateType.StakeDelegation, address, epoch: 500, poolId: 'pool...' }
9+
{ __typename: Cardano.CertificateType.StakeRegistration, address },
10+
{ __typename: Cardano.CertificateType.StakeDeregistration, address },
11+
{ __typename: Cardano.CertificateType.StakeRegistration, address },
12+
{ __typename: Cardano.CertificateType.PoolRetirement, epoch: 500, poolId: 'pool...' },
13+
{ __typename: Cardano.CertificateType.StakeDelegation, address, epoch: 500, poolId: 'pool...' }
1514
];
1615
const withdrawals: Cardano.Withdrawal[] = [{ quantity: 5n, stakeAddress: address }];
1716
const txProps = { certificates, withdrawals } as InitializeTxProps;

Diff for: packages/wallet/test/integration/withdrawal.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Cardano } from '@cardano-sdk/core';
2-
import { CertificateType } from '@cardano-sdk/core/src/Cardano';
32
import { KeyManagement, SingleAddressWallet, SingleAddressWalletProps, TransactionFailure } from '../../src';
43
import { createStubStakePoolSearchProvider } from '@cardano-sdk/util-dev';
54
import { firstValueFrom } from 'rxjs';
@@ -36,7 +35,7 @@ describe('integration/withdrawal', () => {
3635
const availableRewards = wallet.balance.available$.value!.rewards;
3736

3837
const txInternals = await wallet.initializeTx({
39-
certificates: [{ __typename: CertificateType.StakeDeregistration, address: keyManager.rewardAccount }],
38+
certificates: [{ __typename: Cardano.CertificateType.StakeDeregistration, address: keyManager.rewardAccount }],
4039
outputs: new Set(), // In a real transaction you would probably want to have some outputs
4140
withdrawals: [{ quantity: availableRewards, stakeAddress: keyManager.rewardAccount }]
4241
});

Diff for: packages/wallet/test/mocks/mockWalletProvider.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// TODO: rename to MockWalletProvider since it's using jest.fn() mocks
22
/* eslint-disable max-len */
3+
import { AssetId } from '@cardano-sdk/util-dev';
34
import { Cardano, EpochRewards, WalletProvider } from '@cardano-sdk/core';
4-
import { PXL, TSLA } from '@cardano-sdk/util-dev/src/assetId';
55

66
export const stakeKeyHash = 'stake_test1up7pvfq8zn4quy45r2g572290p9vf99mr9tn7r9xrgy2l2qdsf58d';
77

@@ -18,8 +18,8 @@ export const utxo: Cardano.Utxo[] = [
1818
'addr_test1qzs0umu0s2ammmpw0hea0w2crtcymdjvvlqngpgqy76gpfnuzcjqw982pcftgx53fu5527z2cj2tkx2h8ux2vxsg475qp3y3vz',
1919
value: {
2020
assets: {
21-
[PXL]: 5n,
22-
[TSLA]: 10n
21+
[AssetId.PXL]: 5n,
22+
[AssetId.TSLA]: 10n
2323
},
2424
coins: 4_027_026_465n
2525
}
@@ -37,7 +37,7 @@ export const utxo: Cardano.Utxo[] = [
3737
'addr_test1qq585l3hyxgj3nas2v3xymd23vvartfhceme6gv98aaeg9muzcjqw982pcftgx53fu5527z2cj2tkx2h8ux2vxsg475q2g7k3g',
3838
value: {
3939
assets: {
40-
[TSLA]: 15n
40+
[AssetId.TSLA]: 15n
4141
},
4242
coins: 3_289_566n
4343
}

Diff for: packages/wallet/test/services/BalanceTracker.test.ts

+8-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
/* eslint-disable space-in-parens */
55
import { BehaviorObservable, Delegation, DelegationKeyStatus, RewardAccount, createBalanceTracker } from '../../src/services';
66
import { Cardano, ProtocolParametersRequiredByWallet } from '@cardano-sdk/core';
7-
import { coalesceValueQuantities } from '@cardano-sdk/core/src/Cardano/util';
87
import { createTestScheduler } from '../testScheduler';
98
import { utxo } from '../mocks';
109

@@ -27,16 +26,16 @@ describe('createBalanceTracker', () => {
2726
{ rewardAccounts$ } as Delegation
2827
);
2928
expectObservable(balanceTracker.total$).toBe('-a--bc-', {
30-
a: { ...coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 10n },
31-
b: { ...coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 20n },
32-
c: { ...coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 2n, rewards: 20n }
29+
a: { ...Cardano.util.coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 10n },
30+
b: { ...Cardano.util.coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 20n },
31+
c: { ...Cardano.util.coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 2n, rewards: 20n }
3332
});
3433
expectObservable(balanceTracker.available$).toBe('--abcde', {
35-
a: { ...coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 10n },
36-
b: { ...coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 5n },
37-
c: { ...coalesceValueQuantities(utxo.slice(1).map((u) => u[1].value)), deposit: 0n, rewards: 5n },
38-
d: { ...coalesceValueQuantities(utxo.slice(1).map((u) => u[1].value)), deposit: 2n, rewards: 5n },
39-
e: { ...coalesceValueQuantities(utxo.slice(1).map((u) => u[1].value)), deposit: 0n, rewards: 5n }
34+
a: { ...Cardano.util.coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 10n },
35+
b: { ...Cardano.util.coalesceValueQuantities(utxo.map((u) => u[1].value)), deposit: 0n, rewards: 5n },
36+
c: { ...Cardano.util.coalesceValueQuantities(utxo.slice(1).map((u) => u[1].value)), deposit: 0n, rewards: 5n },
37+
d: { ...Cardano.util.coalesceValueQuantities(utxo.slice(1).map((u) => u[1].value)), deposit: 2n, rewards: 5n },
38+
e: { ...Cardano.util.coalesceValueQuantities(utxo.slice(1).map((u) => u[1].value)), deposit: 0n, rewards: 5n }
4039
});
4140
});
4241
});

Diff for: packages/wallet/test/services/DelegationTracker/DelegationTracker.test.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Cardano, WalletProvider } from '@cardano-sdk/core';
22
import { DelegationKeyStatus, Transactions } from '../../../src/services';
3-
import { NewTxAlonzo } from '@cardano-sdk/core/src/Cardano';
43
import { RetryBackoffConfig } from 'backoff-rxjs';
54
import { TxWithEpoch } from '../../../src/services/DelegationTracker/types';
65
import {
@@ -41,12 +40,12 @@ describe('DelegationTracker', () => {
4140
b: [
4241
{
4342
body: { certificates: [{ __typename: Cardano.CertificateType.StakeRegistration, address }] }
44-
} as NewTxAlonzo
43+
} as Cardano.NewTxAlonzo
4544
],
4645
c: [
4746
{
4847
body: { certificates: [{ __typename: Cardano.CertificateType.StakeDeregistration, address }] }
49-
} as NewTxAlonzo
48+
} as Cardano.NewTxAlonzo
5049
]
5150
});
5251
const tracker$ = createRewardAccountsTracker(transactions$, transactionsInFlight$);

Diff for: packages/wallet/test/services/util/equals.test.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
22
import { Cardano } from '@cardano-sdk/core';
3-
import { TxAlonzo } from '@cardano-sdk/core/src/Cardano';
43
import { arrayEquals, strictEquals, transactionsEquals, txEquals, utxoEquals } from '../../../src';
54

65
describe('equals', () => {
@@ -22,8 +21,8 @@ describe('equals', () => {
2221

2322
test('transactionsEquals', () => {
2423
expect(transactionsEquals([], [])).toBe(true);
25-
expect(transactionsEquals([{ id: 'id1' } as TxAlonzo], [{ id: 'id2' } as TxAlonzo])).toBe(false);
26-
expect(transactionsEquals([{ id: 'id1' } as TxAlonzo], [{ id: 'id1' } as TxAlonzo])).toBe(true);
24+
expect(transactionsEquals([{ id: 'id1' } as Cardano.TxAlonzo], [{ id: 'id2' } as Cardano.TxAlonzo])).toBe(false);
25+
expect(transactionsEquals([{ id: 'id1' } as Cardano.TxAlonzo], [{ id: 'id1' } as Cardano.TxAlonzo])).toBe(true);
2726
});
2827

2928
test('utxoEquals ', () => {

0 commit comments

Comments
 (0)