diff --git a/keyserver/src/shared/state-sync/threads-state-sync-spec.js b/keyserver/src/shared/state-sync/threads-state-sync-spec.js --- a/keyserver/src/shared/state-sync/threads-state-sync-spec.js +++ b/keyserver/src/shared/state-sync/threads-state-sync-spec.js @@ -4,8 +4,6 @@ import { threadsStateSyncSpec as libSpec } from 'lib/shared/state-sync/threads-state-sync-spec.js'; import type { ClientThreadInconsistencyReportCreationRequest } from 'lib/types/report-types.js'; import { - type LegacyRawThreadInfos, - type LegacyRawThreadInfo, type RawThreadInfo, type RawThreadInfos, } from 'lib/types/thread-types.js'; @@ -17,9 +15,9 @@ import { validateOutput } from '../../utils/validation-utils.js'; export const threadsStateSyncSpec: ServerStateSyncSpec< - LegacyRawThreadInfos, - LegacyRawThreadInfos, - LegacyRawThreadInfo, + RawThreadInfos, + RawThreadInfos, + RawThreadInfo, $ReadOnlyArray, > = Object.freeze({ fetch, diff --git a/lib/shared/state-sync/threads-state-sync-spec.js b/lib/shared/state-sync/threads-state-sync-spec.js --- a/lib/shared/state-sync/threads-state-sync-spec.js +++ b/lib/shared/state-sync/threads-state-sync-spec.js @@ -11,8 +11,8 @@ } from '../../types/report-types.js'; import type { ProcessServerRequestAction } from '../../types/request-types.js'; import { - type LegacyRawThreadInfos, - type LegacyRawThreadInfo, + type RawThreadInfo, + type RawThreadInfos, } from '../../types/thread-types.js'; import { actionLogger } from '../../utils/action-logger.js'; import { getConfig } from '../../utils/config.js'; @@ -24,8 +24,8 @@ const selector: ( state: AppState, ) => BoundStateSyncSpec< - LegacyRawThreadInfos, - LegacyRawThreadInfo, + RawThreadInfos, + RawThreadInfo, $ReadOnlyArray, > = createSelector( (state: AppState) => state.integrityStore.threadHashes, @@ -43,8 +43,8 @@ ); export const threadsStateSyncSpec: StateSyncSpec< - LegacyRawThreadInfos, - LegacyRawThreadInfo, + RawThreadInfos, + RawThreadInfo, $ReadOnlyArray, > = Object.freeze({ hashKey: 'threadInfos', @@ -55,8 +55,8 @@ }, findStoreInconsistencies( action: ProcessServerRequestAction, - beforeStateCheck: LegacyRawThreadInfos, - afterStateCheck: LegacyRawThreadInfos, + beforeStateCheck: RawThreadInfos, + afterStateCheck: RawThreadInfos, ) { if (_isEqual(beforeStateCheck)(afterStateCheck)) { return emptyArray; diff --git a/lib/types/report-types.js b/lib/types/report-types.js --- a/lib/types/report-types.js +++ b/lib/types/report-types.js @@ -7,7 +7,7 @@ import { type RawEntryInfo, type CalendarQuery } from './entry-types.js'; import { type MediaMission } from './media-types.js'; import type { AppState, BaseAction } from './redux-types.js'; -import { type LegacyRawThreadInfos } from './thread-types.js'; +import { type RawThreadInfos } from './thread-types.js'; import type { UserInfo, UserInfos } from './user-types.js'; import { tPlatformDetails, tShape } from '../utils/validation-utils.js'; @@ -71,10 +71,10 @@ }; export type ThreadInconsistencyReportShape = { +platformDetails: PlatformDetails, - +beforeAction: LegacyRawThreadInfos, + +beforeAction: RawThreadInfos, +action: BaseAction, - +pollResult?: ?LegacyRawThreadInfos, - +pushResult: LegacyRawThreadInfos, + +pollResult?: ?RawThreadInfos, + +pushResult: RawThreadInfos, +lastActionTypes?: ?$ReadOnlyArray<$PropertyType>, +lastActions?: ?$ReadOnlyArray, +time?: ?number, @@ -139,9 +139,9 @@ export type ClientThreadInconsistencyReportShape = { +platformDetails: PlatformDetails, - +beforeAction: LegacyRawThreadInfos, + +beforeAction: RawThreadInfos, +action: BaseAction, - +pushResult: LegacyRawThreadInfos, + +pushResult: RawThreadInfos, +lastActions: $ReadOnlyArray, +time: number, };