fix: time resolution

fairDataSociety · Aug 15, 2023 · 36623ad · 36623ad
1 parent d6309fa
commit 36623ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 211 deletions.
diff --git a/src/streaming-feed.ts b/src/streaming-feed.ts
diff --git a/src/streaming-feed/index.ts b/src/streaming-feed/index.ts
@@ -56,12 +56,14 @@ export class StreamingFeed implements IStreamingFeed<number> {
      * @param initialTime initial time of streaming feed
      * @param updatePeriod streaming feed frequency in milliseconds
      * @param lookupTime lookup time
+     * @param discover boolean, indicates whether the algorithm will look for the closest successful hit
      * @returns a StreamingFeedChunk object
      */
     const getUpdate = async (
       initialTime: number,
       updatePeriod: number,
       lookupTime?: number,
+      discover = true,
     ): Promise<StreamingFeedChunk> => {
       lookupTime = lookupTime ?? getCurrentTime()
       const index = getIndexForArbitraryTime(lookupTime, initialTime, updatePeriod)

diff --git a/src/utils.ts b/src/utils.ts
@@ -194,4 +194,4 @@ export function isObject(value: unknown): value is Record<string, unknown> {
   return value !== null && typeof value === 'object'
 }
 
-export const getCurrentTime = (d = new Date()): number => d.getTime()
+export const getCurrentTime = (d = new Date()): number => Math.floor(d.getTime() / 1000) // ms to s
diff --git a/test/integration/streaming-feed.spec.ts b/test/integration/streaming-feed.spec.ts
@@ -30,7 +30,7 @@ describe('streaming feed', () => {
     const feedRw = streamingFeed.makeFeedRW(topic, signer)
 
     const initialTime = getCurrentTime()
-    const updatePeriod = 5000
+    const updatePeriod = 5
     const testReference: Reference = '0000000000000000000000000000000000000000000000000000000000000126' as HexString<64>
     await feedRw.setLastUpdate(batchId, testReference, initialTime, updatePeriod)
 
@@ -45,7 +45,7 @@ describe('streaming feed', () => {
     const feedRw = streamingFeed.makeFeedRW(topic, signer)
 
     const initialTime = getCurrentTime()
-    const updatePeriod = 5000
+    const updatePeriod = 5
 
     const feedUpdate = await feedRw.findLastUpdate(initialTime, updatePeriod)
 
@@ -71,7 +71,7 @@ describe('streaming feed', () => {
     const random = new Date().getTime().toString().padStart(64, '0')
     const multipleUpdateTopic = Utils.Hex.makeHexString(random) as Topic
 
-    const updatePeriod = 5000
+    const updatePeriod = 5
     const feedRw = streamingFeed.makeFeedRW(multipleUpdateTopic, signer)
 
     const numUpdates = 5
@@ -93,11 +93,11 @@ describe('streaming feed', () => {
     }
 
     const feedUpdateResponse = await feedRw.getUpdates(initialTime, updatePeriod)
-    expect(feedUpdateResponse.length).toEqual(5)
-    expect(feedUpdateResponse[0].updatePeriod).toEqual(5000)
-    expect(feedUpdateResponse[1].updatePeriod).toEqual(5000)
-    expect(feedUpdateResponse[2].updatePeriod).toEqual(5000)
-    expect(feedUpdateResponse[3].updatePeriod).toEqual(5000)
-    expect(feedUpdateResponse[4].updatePeriod).toEqual(5000)
+    expect(feedUpdateResponse.length).toEqual(numUpdates)
+    expect(feedUpdateResponse[0].updatePeriod).toEqual(updatePeriod)
+    expect(feedUpdateResponse[1].updatePeriod).toEqual(updatePeriod)
+    expect(feedUpdateResponse[2].updatePeriod).toEqual(updatePeriod)
+    expect(feedUpdateResponse[3].updatePeriod).toEqual(updatePeriod)
+    expect(feedUpdateResponse[4].updatePeriod).toEqual(updatePeriod)
   }, 45000)
 })