Skip to content

Commit 76e4a26

Browse files
authored
Merge pull request #1287 from input-output-hk/refactor/deposit-values
LW-10576 Set not zero value for pool and stake key deposit in local-network
2 parents c1ea23f + cd351b0 commit 76e4a26

File tree

9 files changed

+8229
-14675
lines changed

9 files changed

+8229
-14675
lines changed

packages/cardano-services/test/StakePool/StakePoolHttpService.test.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -962,9 +962,10 @@ describe('StakePoolHttpService', () => {
962962
expect(response.pageResults).toEqual(responseCached.pageResults);
963963
expect(response.pageResults[0].status).toEqual(Cardano.StakePoolStatus.Activating);
964964
});
965-
it('pledgeMet false, status activating, and condition', async () => {
965+
966+
it('pledgeMet false, status active, and condition', async () => {
966967
const activating = await fixtureBuilder.getPools(1, {
967-
with: [PoolWith.ActivatingState, PoolWith.PledgeNotMet]
968+
with: [PoolWith.ActiveState, PoolWith.PledgeNotMet]
968969
});
969970
const filter: QueryStakePoolsArgs = {
970971
filters: {
@@ -975,13 +976,14 @@ describe('StakePoolHttpService', () => {
975976
pagination
976977
};
977978

978-
const options = addPledgeMetFilter(addStatusFilter(filter, Cardano.StakePoolStatus.Activating), false);
979+
const options = addPledgeMetFilter(addStatusFilter(filter, Cardano.StakePoolStatus.Active), false);
979980
const response = await provider.queryStakePools(options);
980981
const responseCached = await provider.queryStakePools(options);
981982
expect(response.pageResults.length).toBeGreaterThan(0);
982983
expect(response.pageResults).toEqual(responseCached.pageResults);
983-
expect(response.pageResults[0].status).toEqual(Cardano.StakePoolStatus.Activating);
984+
expect(response.pageResults[0].status).toEqual(Cardano.StakePoolStatus.Active);
984985
});
986+
985987
it('pledgeMet true, status retired, or condition', async () => {
986988
const options = addPledgeMetFilter(
987989
addStatusFilter(setFilterCondition(filterArgs, 'or'), Cardano.StakePoolStatus.Retired),

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ describe('TypeormStakePoolProvider', () => {
8181
let filterArgs: QueryStakePoolsArgs;
8282
let poolsInfo: PoolInfo[];
8383
let poolsInfoWithMeta: PoolInfo[];
84+
let poolsInfoWithUniqueMeta: PoolInfo[];
8485
let poolsInfoWithMetaFiltered: PoolInfo[];
8586
let poolsInfoWithMetrics: PoolInfo[];
8687
let poolsInfoWithMetricsFiltered: PoolInfo[];
@@ -108,15 +109,18 @@ describe('TypeormStakePoolProvider', () => {
108109
poolsInfo = await fixtureBuilder.getPools(1000, ['active', 'activating', 'retired', 'retiring']);
109110
poolsInfoWithMeta = poolsInfo.filter((pool) => isNotNil(pool.metadataUrl));
110111
poolsInfoWithMetrics = poolsInfo.filter((pool) => isNotNil(pool.saturation));
112+
poolsInfoWithUniqueMeta = poolsInfoWithMeta
113+
.filter(({ name, ticker }) => name !== 'Same Name' && ticker !== 'SP6a7')
114+
.sort((a, b) => (a.name < b.name ? -1 : 1));
111115

112116
filterArgs = {
113117
filters: {
114118
identifier: {
115119
_condition: 'or',
116120
values: [
117-
{ ticker: poolsInfoWithMeta[0].ticker },
118-
{ name: poolsInfoWithMeta[1].name },
119-
{ id: poolsInfoWithMeta[2].id }
121+
{ ticker: poolsInfoWithUniqueMeta[0].ticker },
122+
{ name: poolsInfoWithUniqueMeta[1].name },
123+
{ id: poolsInfoWithUniqueMeta[2].id }
120124
]
121125
}
122126
},
@@ -625,7 +629,7 @@ describe('TypeormStakePoolProvider', () => {
625629
describe('by default, result is sorted by relevance', () => {
626630
it('with stringent search', async () => {
627631
const response = await provider.queryStakePools({ filters: { text: 'sp11' }, pagination });
628-
expect(response.pageResults.map(({ metadata }) => metadata?.ticker)).toEqual(['SP11', 'SP1', 'SP10']);
632+
expect(response.pageResults.map(({ metadata }) => metadata?.ticker)).toEqual(['SP11', 'SP10', 'SP1']);
629633
});
630634

631635
it('with mild search', async () => {
@@ -739,7 +743,7 @@ describe('TypeormStakePoolProvider', () => {
739743
const response = await provider.queryStakePools(
740744
setSortCondition(setFilterCondition(filterArgs, 'or'), 'asc', 'ticker')
741745
);
742-
const expected = [...poolsInfoWithMeta].sort((a, b) => (a.ticker < b.ticker ? -1 : 1));
746+
const expected = [...poolsInfoWithMetricsFiltered].sort((a, b) => (a.ticker < b.ticker ? -1 : 1));
743747
expect(response.pageResults[0].metadata?.ticker).toEqual(expected[0].ticker);
744748
expect(response.pageResults[1].metadata?.ticker).toEqual(expected[1].ticker);
745749
});

packages/cardano-services/test/jest-setup/rebuild-test-db.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ yarn test:build:verify
1919

2020
yarn workspace @cardano-sdk/e2e local-network:down
2121
yarn workspace @cardano-sdk/e2e local-network:up -d --build
22-
yarn workspace @cardano-sdk/e2e wait-for-network
2322

2423
yarn workspace @cardano-sdk/e2e test:wallet
2524
yarn workspace @cardano-sdk/e2e test:long-running simple-delegation-rewards.test.ts

0 commit comments

Comments
 (0)