From 514b6e1e4192f700a6f0e769d52a4ec5dfe757ec Mon Sep 17 00:00:00 2001
From: Alex Potsides <alex@achingbrain.net>
Date: Wed, 25 Oct 2023 18:11:25 +0100
Subject: [PATCH] fix: update libp2p interfaces (#109)

Remove deprecated interfaces for newer versions.
---
 packages/ipns/package.json               | 2 +-
 packages/ipns/src/routing/local-store.ts | 6 +++---
 packages/ipns/test/resolve.spec.ts       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/ipns/package.json b/packages/ipns/package.json
index a9b426cd..9e9a9f8a 100644
--- a/packages/ipns/package.json
+++ b/packages/ipns/package.json
@@ -156,9 +156,9 @@
   },
   "dependencies": {
     "@libp2p/interface": "^0.1.2",
+    "@libp2p/kad-dht": "^10.0.11",
     "@libp2p/logger": "^3.0.2",
     "@libp2p/peer-id": "^3.0.2",
-    "@libp2p/record": "^3.0.0",
     "hashlru": "^2.3.0",
     "interface-datastore": "^8.0.0",
     "ipns": "^7.0.1",
diff --git a/packages/ipns/src/routing/local-store.ts b/packages/ipns/src/routing/local-store.ts
index 06302129..bb142e18 100644
--- a/packages/ipns/src/routing/local-store.ts
+++ b/packages/ipns/src/routing/local-store.ts
@@ -1,4 +1,4 @@
-import { Libp2pRecord } from '@libp2p/record'
+import { Record } from '@libp2p/kad-dht'
 import { type Datastore, Key } from 'interface-datastore'
 import { CustomProgressEvent, type ProgressEvent } from 'progress-events'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
@@ -30,7 +30,7 @@ export function localStore (datastore: Datastore): LocalStore {
         const key = dhtRoutingKey(routingKey)
 
         // Marshal to libp2p record as the DHT does
-        const record = new Libp2pRecord(routingKey, marshalledRecord, new Date())
+        const record = new Record(routingKey, marshalledRecord, new Date())
 
         options.onProgress?.(new CustomProgressEvent('ipns:routing:datastore:put'))
         await datastore.put(key, record.serialize(), options)
@@ -47,7 +47,7 @@ export function localStore (datastore: Datastore): LocalStore {
         const buf = await datastore.get(key, options)
 
         // Unmarshal libp2p record as the DHT does
-        const record = Libp2pRecord.deserialize(buf)
+        const record = Record.deserialize(buf)
 
         return record.value
       } catch (err: any) {
diff --git a/packages/ipns/test/resolve.spec.ts b/packages/ipns/test/resolve.spec.ts
index 7815ef85..e605da32 100644
--- a/packages/ipns/test/resolve.spec.ts
+++ b/packages/ipns/test/resolve.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
+import { Record } from '@libp2p/kad-dht'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import { Libp2pRecord } from '@libp2p/record'
 import { expect } from 'aegir/chai'
 import { MemoryDatastore } from 'datastore-core'
 import { type Datastore, Key } from 'interface-datastore'
@@ -141,7 +141,7 @@ describe('resolve', () => {
     expect(result.toString()).to.equal(cid.toV1().toString(), 'incorrect record resolved')
 
     const cached = await datastore.get(dhtKey)
-    const record = Libp2pRecord.deserialize(cached)
+    const record = Record.deserialize(cached)
 
     // should have cached the updated record
     expect(record.value).to.equalBytes(marshalledRecordB)