Skip to content

Commit dd8b52f

Browse files
refactor!: hoist bufferChainSyncEvent to projection package
Co-authored-by: Martynas Kazlauskas <[email protected]> BREAKING CHANGE: OgmiosObservableCardanoNode and bufferChainSyncEvent were moved from core package to projection package
1 parent e8f3f0b commit dd8b52f

File tree

80 files changed

+265
-203
lines changed

Some content is hidden

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

80 files changed

+265
-203
lines changed

packages/cardano-services/src/Projection/createTypeormProjection.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
22
/* eslint-disable prefer-spread */
3-
import { Bootstrap, ProjectionEvent, logProjectionProgress, requestNext } from '@cardano-sdk/projection';
4-
import { Cardano, ObservableCardanoNode } from '@cardano-sdk/core';
3+
import {
4+
Bootstrap,
5+
ObservableCardanoNode,
6+
ProjectionEvent,
7+
logProjectionProgress,
8+
requestNext
9+
} from '@cardano-sdk/projection';
10+
import { Cardano } from '@cardano-sdk/core';
511
import { Logger } from 'ts-log';
612
import { Observable, concat, defer, groupBy, mergeMap, take, takeWhile } from 'rxjs';
713
import {

packages/cardano-services/src/Projection/prepareTypeormProjection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ import {
4444
willStoreStakePools,
4545
willStoreUtxo
4646
} from '@cardano-sdk/projection-typeorm';
47-
import { Cardano, ChainSyncEventType } from '@cardano-sdk/core';
48-
import { Mappers as Mapper, ProjectionEvent } from '@cardano-sdk/projection';
47+
import { Cardano } from '@cardano-sdk/core';
48+
import { ChainSyncEventType, Mappers as Mapper, ProjectionEvent } from '@cardano-sdk/projection';
4949
import { ObservableType, passthrough } from '@cardano-sdk/util-rxjs';
5050
import { POOLS_METRICS_INTERVAL_DEFAULT, POOLS_METRICS_OUTDATED_INTERVAL_DEFAULT } from '../Program/programs/types';
5151
import { Sorter } from '@hapi/topo';

packages/cardano-services/src/TxSubmit/NodeTxSubmitProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
HandleOwnerChangeError,
66
HandleProvider,
77
HealthCheckResponse,
8-
ObservableCardanoNode,
98
ProviderError,
109
ProviderFailure,
1110
SubmitTxArgs,
@@ -14,6 +13,7 @@ import {
1413
} from '@cardano-sdk/core';
1514
import { InMemoryCache } from '../InMemoryCache';
1615
import { Logger } from 'ts-log';
16+
import { ObservableCardanoNode } from '@cardano-sdk/projection';
1717
import { WithLogger } from '@cardano-sdk/util';
1818

1919
type ObservableTxSubmitter = Pick<ObservableCardanoNode, 'healthCheck$' | 'submitTx'>;

packages/cardano-services/test/Projection/createTypeormProjection.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import {
66
TokensEntity,
77
createDataSource
88
} from '@cardano-sdk/projection-typeorm';
9-
import { Cardano, ChainSyncEventType } from '@cardano-sdk/core';
9+
import { Cardano } from '@cardano-sdk/core';
1010
import { ChainSyncDataSet, chainSyncData, logger } from '@cardano-sdk/util-dev';
11+
import { ChainSyncEventType } from '@cardano-sdk/projection';
1112
import { ProjectionName, createTypeormProjection, prepareTypeormProjection } from '../../src';
1213
import { lastValueFrom } from 'rxjs';
1314
import { projectorConnectionConfig, projectorConnectionConfig$ } from '../util';

packages/core/src/CardanoNode/types/CardanoNode.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { HealthCheckResponse } from '../../Provider';
2-
import type { Lovelace, PoolId, VrfVkHex } from '../../Cardano';
2+
import type { Lovelace, PoolId, Tip, VrfVkHex } from '../../Cardano';
33
import type { Milliseconds } from '../../util';
44

55
export interface EraSummary {
@@ -48,3 +48,13 @@ export interface CardanoNode {
4848
*/
4949
healthCheck(): Promise<HealthCheckResponse>;
5050
}
51+
52+
// Similar to Ogmios.Point, but using Cardano.BlockId opaque string for hash
53+
export type Point = Pick<Tip, 'hash' | 'slot'>;
54+
export type Origin = 'origin';
55+
export type TipOrOrigin = Tip | Origin;
56+
export type PointOrOrigin = Point | Origin;
57+
export type Intersection = {
58+
point: PointOrOrigin;
59+
tip: TipOrOrigin;
60+
};
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
export * from './CardanoNode';
22
export * from './CardanoNodeErrors';
3-
export * from './ObservableCardanoNode';

packages/e2e/test/projection/offline-fork.test.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@ import * as Postgres from '@cardano-sdk/projection-typeorm';
22
import { BlockDataEntity, BlockEntity, StakeKeyEntity } from '@cardano-sdk/projection-typeorm';
33
import {
44
Bootstrap,
5+
ChainSyncEvent,
6+
ChainSyncEventType,
7+
ChainSyncRollForward,
58
InMemory,
69
Mappers,
10+
ObservableCardanoNode,
711
ProjectionEvent,
812
ProjectionOperator,
913
StabilityWindowBuffer,
1014
WithBlock,
1115
requestNext,
1216
withStaticContext
1317
} from '@cardano-sdk/projection';
14-
import {
15-
Cardano,
16-
ChainSyncEvent,
17-
ChainSyncEventType,
18-
ChainSyncRollForward,
19-
ObservableCardanoNode,
20-
Point,
21-
TipOrOrigin
22-
} from '@cardano-sdk/core';
18+
import { Cardano, Point, TipOrOrigin } from '@cardano-sdk/core';
2319
import { ChainSyncDataSet, chainSyncData, logger } from '@cardano-sdk/util-dev';
2420
import { ConnectionConfig } from '@cardano-ogmios/client';
2521
import { Observable, filter, firstValueFrom, lastValueFrom, map, of, take, takeWhile, throwError, toArray } from 'rxjs';

packages/e2e/test/projection/single-tenant-utxo.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as Postgres from '@cardano-sdk/projection-typeorm';
2-
import { Bootstrap, Mappers, ProjectionEvent, requestNext } from '@cardano-sdk/projection';
3-
import { Cardano, ObservableCardanoNode } from '@cardano-sdk/core';
2+
import { Bootstrap, Mappers, ObservableCardanoNode, ProjectionEvent, requestNext } from '@cardano-sdk/projection';
3+
import { Cardano } from '@cardano-sdk/core';
44
import { ConnectionConfig } from '@cardano-ogmios/client';
55
import { DataSource, QueryRunner } from 'typeorm';
66
import { Observable, filter, firstValueFrom, lastValueFrom, of, scan, takeWhile } from 'rxjs';

packages/golden-test-generator/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"dependencies": {
4646
"@cardano-sdk/core": "workspace:~",
4747
"@cardano-sdk/ogmios": "workspace:~",
48+
"@cardano-sdk/projection": "workspace:~",
4849
"@cardano-sdk/util": "workspace:~",
4950
"@cardano-sdk/util-dev": "workspace:~",
5051
"bunyan": "^1.8.15",

packages/golden-test-generator/src/ChainSyncEvents/chainSyncEvents.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Cardano, ChainSyncEventType, Intersection } from '@cardano-sdk/core';
1+
import { Cardano, Intersection } from '@cardano-sdk/core';
2+
import { ChainSyncEventType } from '@cardano-sdk/projection';
23
import { GeneratorMetadata } from '../Content';
34
import { Logger } from 'ts-log';
45
import { Ogmios, ogmiosToCore } from '@cardano-sdk/ogmios';

0 commit comments

Comments
 (0)