fixup! refactor!: hoist bufferChainSyncEvent to projection package

Author: AngelCastilloB

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

@@ -44,8 +44,8 @@ import {
   willStoreStakePools,
   willStoreUtxo
 } from '@cardano-sdk/projection-typeorm';
-import { Cardano, ChainSyncEventType } from '@cardano-sdk/core';
-import { Mappers as Mapper, ProjectionEvent } from '@cardano-sdk/projection';
+import { Cardano } from '@cardano-sdk/core';
+import { ChainSyncEventType, Mappers as Mapper, ProjectionEvent } from '@cardano-sdk/projection';
 import { ObservableType, passthrough } from '@cardano-sdk/util-rxjs';
 import { POOLS_METRICS_INTERVAL_DEFAULT, POOLS_METRICS_OUTDATED_INTERVAL_DEFAULT } from '../Program/programs/types';
 import { Sorter } from '@hapi/topo';

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

@@ -6,8 +6,9 @@ import {
   TokensEntity,
   createDataSource
 } from '@cardano-sdk/projection-typeorm';
-import { Cardano, ChainSyncEventType } from '@cardano-sdk/core';
+import { Cardano } from '@cardano-sdk/core';
 import { ChainSyncDataSet, chainSyncData, logger } from '@cardano-sdk/util-dev';
+import { ChainSyncEventType } from '@cardano-sdk/projection';
 import { ProjectionName, createTypeormProjection, prepareTypeormProjection } from '../../src';
 import { lastValueFrom } from 'rxjs';
 import { projectorConnectionConfig, projectorConnectionConfig$ } from '../util';

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

@@ -1,5 +1,5 @@
-import type { Block, Lovelace, PoolId, Tip, VrfVkHex } from '../../Cardano';
 import type { HealthCheckResponse } from '../../Provider';
+import type { Lovelace, PoolId, Tip, VrfVkHex } from '../../Cardano';
 import type { Milliseconds } from '../../util';
 
 export interface EraSummary {
@@ -58,28 +58,3 @@ export type Intersection = {
   point: PointOrOrigin;
   tip: TipOrOrigin;
 };
-
-export enum ChainSyncEventType {
-  RollForward,
-  RollBackward
-}
-
-export type RequestNext = () => void;
-
-export interface WithRequestNext {
-  requestNext: RequestNext;
-}
-
-export interface ChainSyncRollForward extends WithRequestNext {
-  tip: Tip;
-  eventType: ChainSyncEventType.RollForward;
-  block: Block;
-}
-
-export interface ChainSyncRollBackward extends WithRequestNext {
-  eventType: ChainSyncEventType.RollBackward;
-  point: PointOrOrigin;
-  tip: TipOrOrigin;
-}
-
-export type ChainSyncEvent = ChainSyncRollForward | ChainSyncRollBackward;

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

@@ -2,6 +2,9 @@ import * as Postgres from '@cardano-sdk/projection-typeorm';
 import { BlockDataEntity, BlockEntity, StakeKeyEntity } from '@cardano-sdk/projection-typeorm';
 import {
   Bootstrap,
+  ChainSyncEvent,
+  ChainSyncEventType,
+  ChainSyncRollForward,
   InMemory,
   Mappers,
   ObservableCardanoNode,
@@ -12,14 +15,7 @@ import {
   requestNext,
   withStaticContext
 } from '@cardano-sdk/projection';
-import {
-  Cardano,
-  ChainSyncEvent,
-  ChainSyncEventType,
-  ChainSyncRollForward,
-  Point,
-  TipOrOrigin
-} from '@cardano-sdk/core';
+import { Cardano, Point, TipOrOrigin } from '@cardano-sdk/core';
 import { ChainSyncDataSet, chainSyncData, logger } from '@cardano-sdk/util-dev';
 import { ConnectionConfig } from '@cardano-ogmios/client';
 import { Observable, filter, firstValueFrom, lastValueFrom, map, of, take, takeWhile, throwError, toArray } from 'rxjs';

packages/golden-test-generator/package.json

@@ -45,6 +45,7 @@
   "dependencies": {
     "@cardano-sdk/core": "workspace:~",
     "@cardano-sdk/ogmios": "workspace:~",
+    "@cardano-sdk/projection": "workspace:~",
     "@cardano-sdk/util": "workspace:~",
     "@cardano-sdk/util-dev": "workspace:~",
     "bunyan": "^1.8.15",

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

@@ -1,4 +1,5 @@
-import { Cardano, ChainSyncEventType, Intersection } from '@cardano-sdk/core';
+import { Cardano, Intersection } from '@cardano-sdk/core';
+import { ChainSyncEventType } from '@cardano-sdk/projection';
 import { GeneratorMetadata } from '../Content';
 import { Logger } from 'ts-log';
 import { Ogmios, ogmiosToCore } from '@cardano-sdk/ogmios';

packages/golden-test-generator/src/tsconfig.json

@@ -12,6 +12,9 @@
     },
     {
       "path": "../../util/src"
+    },
+    {
+      "path": "../../projection/src"
     }
   ]
 }

packages/ogmios/src/CardanoNode/OgmiosObservableCardanoNode/createObservableChainSyncClient.ts

@@ -1,12 +1,6 @@
-import {
-  ChainSyncEvent,
-  ChainSyncEventType,
-  GeneralCardanoNodeError,
-  GeneralCardanoNodeErrorCode,
-  PointOrOrigin,
-  RequestNext
-} from '@cardano-sdk/core';
+import { ChainSyncEvent, ChainSyncEventType, RequestNext } from '@cardano-sdk/projection';
 import { ChainSynchronization, InteractionContext, Schema, safeJSON } from '@cardano-ogmios/client';
+import { GeneralCardanoNodeError, GeneralCardanoNodeErrorCode, PointOrOrigin } from '@cardano-sdk/core';
 import { Logger } from 'ts-log';
 import { Observable, Subscriber, from, switchMap } from 'rxjs';
 import { WithLogger, toSerializableObject } from '@cardano-sdk/util';

packages/projection-typeorm/src/TypeormStabilityWindowBuffer.ts

@@ -1,10 +1,16 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { BlockDataEntity } from './entity';
-import { Cardano, ChainSyncEventType } from '@cardano-sdk/core';
+import { Cardano } from '@cardano-sdk/core';
+import {
+  ChainSyncEventType,
+  ProjectionEvent,
+  RollForwardEvent,
+  StabilityWindowBuffer,
+  WithNetworkInfo
+} from '@cardano-sdk/projection';
 import { LessThan, QueryRunner } from 'typeorm';
 import { Logger } from 'ts-log';
 import { Observable, catchError, concatMap, from, map, of, switchMap, take } from 'rxjs';
-import { ProjectionEvent, RollForwardEvent, StabilityWindowBuffer, WithNetworkInfo } from '@cardano-sdk/projection';
 import { ReconnectionConfig } from '@cardano-sdk/util-rxjs';
 import { RetryBackoffConfig, retryBackoff } from 'backoff-rxjs';
 import { TypeormConnection } from './createDataSource';

packages/projection-typeorm/src/createTypeormTipTracker.ts

@@ -1,9 +1,9 @@
-import { BaseProjectionEvent } from '@cardano-sdk/projection';
+import { BaseProjectionEvent, ChainSyncEventType } from '@cardano-sdk/projection';
 import { BlockEntity } from './entity';
-import { ChainSyncEventType, TipOrOrigin } from '@cardano-sdk/core';
 import { Observable, ReplaySubject, from, map, of, switchMap, take, tap } from 'rxjs';
 import { ReconnectionConfig } from '@cardano-sdk/util-rxjs';
 import { RetryBackoffConfig, retryBackoff } from 'backoff-rxjs';
+import { TipOrOrigin } from '@cardano-sdk/core';
 import { TypeormConnection } from './createDataSource';
 import { isRecoverableTypeormError } from './isRecoverableTypeormError';