small tweaks, fix tests

Signed-off-by: Miroslav Bajtoš <oss@bajtos.net>

Author: bajtos

indexer/lib/advertisement-walker.js

@@ -70,7 +70,7 @@ export async function fetchAdvertisedPayload (providerAddress, advertisementCid)
       Entries: { '/': string },
       IsRm: false,
       Metadata: { '/': { bytes: string } },
-      PreviousID?: { '/': string ,
+      PreviousID?: { '/': string },
       Provider: string
       Signature: {
         '/': {

indexer/lib/typings.d.ts

@@ -8,10 +8,37 @@ export interface ProviderInfo {
 
 export type ProviderToInfoMap = Map<string, ProviderInfo>;
 
+/**
+lastAdCID --> [ ] -\
+               ↓    |
+              ...   | entries announced after we started the current walk
+               ↓    |
+              [ ] -/
+               ↓
+     head --> [ ] -\
+               ↓    |
+              ...   | entries visited in this walk
+               ↓    |
+              [ ] -/
+               ↓
+     tail --> [ ] -\
+               ↓    |
+              ...   | entries NOT visited yet
+               ↓    |
+              [ ] -/
+               ↓
+last_head --> [ ] -\
+               ↓    |
+              ...   | entries visited in the previous walks
+               ↓    |
+              [ ] -/
+               ↓
+             (null)
+ */
 export interface WalkerState {
-  lastHead: string;
   head: string;
   tail: string | undefined
+  lastHead: string;
   status: string;
 }
 

indexer/test/advertisement-walker.test.js

@@ -11,38 +11,42 @@ import { FRISBII_ADDRESS, FRISBII_AD_CID } from './helpers/test-data.js'
 const debug = createDebug('test')
 
 // TODO(bajtos) We may need to replace this with a mock index provider
-const providerId = '12D3KooWDYiKtcxTrjNFtR6UqKRkJpESYHmmFznQAAkDX2ZHQ49t'
-const providerAddress = 'http://222.214.219.200:3104'
-const knownAdvertisementCID = 'baguqeeradb34kxwvi5fs3gj6wrxfkcqntzklq4qdallcejqfhyryftnpd25a'
-const knownPrevAdvertisementCID = 'baguqeerawqvze5suesscwzsmpgemthwv6hx2yi2rg35zt7jdlmxapjf5qfdq'
+const providerId = '12D3KooWHKeaNCnYByQUMS2n5PAZ1KZ9xKXqsb4bhpxVJ6bBJg5V'
+const providerAddress = 'http://f010479.twinquasar.io:3104'
+const knownAdvertisement = {
+  adCid: 'baguqeerarbmakqcnzzuhki25xs357xyin4ieqxvumrp5cy7s44v7tzwwmg3q',
+  previousAdCid: 'baguqeerau2rz67nvzcaotgowm2olalanx3eynr2asbjwdkaq3y5umqvdi2ea',
+  payloadCid: 'bafkreigrnnl64xuevvkhknbhrcqzbdvvmqnchp7ae2a4ulninsjoc5svoq',
+  pieceCid: 'baga6ea4seaqlwzed5tgjtyhrugjziutzthx2wrympvsuqhfngwdwqzvosuchmja'
+}
 
 describe('processNextAdvertisement', () => {
   it('handles a new index provider not seen before', async () => {
     /** @type {ProviderInfo} */
     const providerInfo = {
       providerAddress,
-      lastAdvertisementCID: knownAdvertisementCID
+      lastAdvertisementCID: knownAdvertisement.adCid
     }
     const walkerState = undefined
     const { indexEntry, newState } = await processNextAdvertisement(providerId, providerInfo, walkerState)
     assert.deepStrictEqual(newState, /** @type {WalkerState} */({
       head: providerInfo.lastAdvertisementCID,
       lastHead: providerInfo.lastAdvertisementCID,
-      tail: knownPrevAdvertisementCID,
-      status: `Walking the advertisements from ${knownAdvertisementCID}, next step: ${knownPrevAdvertisementCID}`
+      tail: knownAdvertisement.previousAdCid,
+      status: `Walking the advertisements from ${knownAdvertisement.adCid}, next step: ${knownAdvertisement.previousAdCid}`
     }))
 
     assert.deepStrictEqual(indexEntry, {
-      payloadCid: 'bafk2bzaceaybhh2uenrbiuv4x6xywbv6oxizamydggd5r2xgnnvr53uwnjqea',
-      pieceCid: 'baga6ea4seaqjk25ts2kekzqa5jplj6uyzk7qpiigg4koiqjz26dtmzooiocwuoa'
+      payloadCid: knownAdvertisement.payloadCid,
+      pieceCid: knownAdvertisement.pieceCid
     })
   })
 
   it('does nothing when the last advertisement has been already processed', async () => {
     /** @type {ProviderInfo} */
     const providerInfo = {
       providerAddress,
-      lastAdvertisementCID: knownAdvertisementCID
+      lastAdvertisementCID: knownAdvertisement.adCid
     }
 
     let result = await processNextAdvertisement(providerId, providerInfo, undefined)
@@ -57,11 +61,11 @@ describe('processNextAdvertisement', () => {
 
 describe('fetchAdvertisedPayload', () => {
   it('returns previousAdvertisementCid, pieceCid and payloadCid for Graphsync retrievals', async () => {
-    const result = await fetchAdvertisedPayload(providerAddress, knownAdvertisementCID)
+    const result = await fetchAdvertisedPayload(providerAddress, knownAdvertisement.adCid)
     assert.deepStrictEqual(result, /** @type {AdvertisedPayload} */({
-      payloadCid: 'bafk2bzaceaybhh2uenrbiuv4x6xywbv6oxizamydggd5r2xgnnvr53uwnjqea',
-      pieceCid: 'baga6ea4seaqjk25ts2kekzqa5jplj6uyzk7qpiigg4koiqjz26dtmzooiocwuoa',
-      previousAdvertisementCid: 'baguqeerawqvze5suesscwzsmpgemthwv6hx2yi2rg35zt7jdlmxapjf5qfdq'
+      payloadCid: knownAdvertisement.payloadCid,
+      pieceCid: knownAdvertisement.pieceCid,
+      previousAdvertisementCid: knownAdvertisement.previousAdCid
     }))
   })
 

indexer/test/ipni-watcher.test.js

@@ -15,11 +15,10 @@ describe('getProvidersWithMetadata', () => {
     const providers = await getProvidersWithMetadata()
     debug(JSON.stringify(providers, null, 2))
 
-    const frisbiiOnFly = providers.find(
-      p => p.providerId === FRISBII_ID && p.providerAddress === FRISBII_ADDRESS
-    )
+    const frisbiiOnFly = providers.get(FRISBII_ID)
 
     assert(frisbiiOnFly)
+    assert.strictEqual(frisbiiOnFly.providerAddress, FRISBII_ADDRESS)
     assert.match(frisbiiOnFly.lastAdvertisementCID, /^bagu/)
   })
 })