Skip to content

Commit 352fd67

Browse files
committed
fix rebase mess
1 parent 5d22df8 commit 352fd67

File tree

2 files changed

+2
-24
lines changed

2 files changed

+2
-24
lines changed

src/datasource/graphene/backend.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export class GrapheneMeshSource extends WithParameters(
203203

204204
interface ShardInfo {
205205
shardUrl: string;
206-
offset: Uint64;
206+
offset: bigint;
207207
}
208208

209209
interface GrapheneMultiscaleManifestChunk extends MultiscaleManifestChunk {
@@ -293,7 +293,7 @@ export class GrapheneMultiscaleMeshSource extends WithParameters(
293293
this.parameters.fragmentUrl,
294294
);
295295

296-
addNewSegment(segment: Uint64) {
296+
addNewSegment(segment: bigint) {
297297
const { newSegments } = this;
298298
newSegments.add(segment);
299299
const TEN_MINUTES = 1000 * 60 * 10;

src/datasource/graphene/frontend.ts

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,16 +1999,6 @@ class GrapheneGraphServerInterface {
19991999
async getRoot(segment: bigint, timestamp = 0) {
20002000
const timestampEpoch = timestamp / 1000;
20012001
const { fetchOkImpl, baseUrl } = this.httpSource;
2002-
const response = await fetchOkImpl(`${baseUrl}/oldest_timestamp`).then(
2003-
(response) => response.json(),
2004-
);
2005-
const isoString = verifyObjectProperty(response, "iso", verifyString);
2006-
return new Date(isoString).valueOf();
2007-
}
2008-
2009-
async getRoot(segment: Uint64, timestamp = 0) {
2010-
const timestampEpoch = timestamp / 1000;
2011-
const { fetchOkImpl, baseUrl } = this.httpSource;
20122002

20132003
const jsonResp = await withErrorMessageHTTP(
20142004
fetchOkImpl(
@@ -2545,18 +2535,6 @@ const addSelection = (
25452535
selection.annotationReference = ref;
25462536
};
25472537

2548-
const synchronizeAnnotationSource = (
2549-
source: WatchableSet<SegmentSelection>,
2550-
state: AnnotationLayerState,
2551-
) => {
2552-
const annotationSource = state.source;
2553-
annotationSource.childDeleted.add((annotationId) => {
2554-
const selection = [...source].find(
2555-
(selection) => selection.annotationReference?.id === annotationId,
2556-
);
2557-
if (selection) source.delete(selection);
2558-
});
2559-
25602538
const synchronizeAnnotationSource = (
25612539
source: WatchableSet<SegmentSelection>,
25622540
state: AnnotationLayerState,

0 commit comments

Comments
 (0)