From 9b6f719628bcd2a69a23cf672e398b69b4415629 Mon Sep 17 00:00:00 2001
From: Alex Potsides <alex@achingbrain.net>
Date: Wed, 21 Sep 2022 09:08:40 +0100
Subject: [PATCH] deps: update @multiformats/multiaddr to 11.0.0 (#26)

Updates all usage of @multiformats/multiaddr
---
 package.json             |  2 +-
 src/peer-record/index.ts |  5 +++--
 test/peer-record.spec.ts | 12 ++++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 9dcd2b1..550710a 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "@libp2p/logger": "^2.0.0",
     "@libp2p/peer-id": "^1.1.13",
     "@libp2p/utils": "^3.0.0",
-    "@multiformats/multiaddr": "^10.1.5",
+    "@multiformats/multiaddr": "^11.0.0",
     "err-code": "^3.0.1",
     "interface-datastore": "^7.0.0",
     "it-all": "^1.0.6",
diff --git a/src/peer-record/index.ts b/src/peer-record/index.ts
index 2d565f9..bfd729e 100644
--- a/src/peer-record/index.ts
+++ b/src/peer-record/index.ts
@@ -1,5 +1,6 @@
-import { Multiaddr } from '@multiformats/multiaddr'
+import type { Multiaddr } from '@multiformats/multiaddr'
 import type { PeerId } from '@libp2p/interface-peer-id'
+import { multiaddr } from '@multiformats/multiaddr'
 import { arrayEquals } from '@libp2p/utils/array-equals'
 import { peerIdFromBytes } from '@libp2p/peer-id'
 import { PeerRecord as Protobuf } from './peer-record.js'
@@ -34,7 +35,7 @@ export class PeerRecord {
   static createFromProtobuf = (buf: Uint8Array | Uint8ArrayList): PeerRecord => {
     const peerRecord = Protobuf.decode(buf)
     const peerId = peerIdFromBytes(peerRecord.peerId)
-    const multiaddrs = (peerRecord.addresses ?? []).map((a) => new Multiaddr(a.multiaddr))
+    const multiaddrs = (peerRecord.addresses ?? []).map((a) => multiaddr(a.multiaddr))
     const seqNumber = peerRecord.seq
 
     return new PeerRecord({ peerId, multiaddrs, seqNumber })
diff --git a/test/peer-record.spec.ts b/test/peer-record.spec.ts
index 3ff70d6..dd552d6 100644
--- a/test/peer-record.spec.ts
+++ b/test/peer-record.spec.ts
@@ -2,7 +2,7 @@
 
 import { expect } from 'aegir/chai'
 import tests from '@libp2p/interface-record-compliance-tests'
-import { Multiaddr } from '@multiformats/multiaddr'
+import { multiaddr } from '@multiformats/multiaddr'
 import { peerIdFromKeys } from '@libp2p/peer-id'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { RecordEnvelope } from '../src/envelope/index.js'
@@ -59,7 +59,7 @@ describe('PeerRecord', () => {
 
   it('creates a peer record with provided data', () => {
     const multiaddrs = [
-      new Multiaddr('/ip4/127.0.0.1/tcp/2000')
+      multiaddr('/ip4/127.0.0.1/tcp/2000')
     ]
     const seqNumber = BigInt(Date.now())
     const peerRecord = new PeerRecord({ peerId, multiaddrs, seqNumber })
@@ -74,7 +74,7 @@ describe('PeerRecord', () => {
 
   it('marshals and unmarshals a peer record', () => {
     const multiaddrs = [
-      new Multiaddr('/ip4/127.0.0.1/tcp/2000')
+      multiaddr('/ip4/127.0.0.1/tcp/2000')
     ]
     const seqNumber = BigInt(Date.now())
     const peerRecord = new PeerRecord({ peerId, multiaddrs, seqNumber })
@@ -114,12 +114,12 @@ describe('PeerRecord', () => {
 
   it('equals returns false if the peer record has a different multiaddrs', () => {
     const multiaddrs = [
-      new Multiaddr('/ip4/127.0.0.1/tcp/2000')
+      multiaddr('/ip4/127.0.0.1/tcp/2000')
     ]
     const peerRecord0 = new PeerRecord({ peerId, multiaddrs })
 
     const multiaddrs1 = [
-      new Multiaddr('/ip4/127.0.0.1/tcp/2001')
+      multiaddr('/ip4/127.0.0.1/tcp/2001')
     ]
     const peerRecord1 = new PeerRecord({ peerId, multiaddrs: multiaddrs1 })
 
@@ -135,7 +135,7 @@ describe('PeerRecord inside Envelope', () => {
   before(async () => {
     peerId = await createEd25519PeerId()
     const multiaddrs = [
-      new Multiaddr('/ip4/127.0.0.1/tcp/2000')
+      multiaddr('/ip4/127.0.0.1/tcp/2000')
     ]
     const seqNumber = BigInt(Date.now())
     peerRecord = new PeerRecord({ peerId, multiaddrs, seqNumber })