From a640e2c940b8b63683811eeb49014064625f7acd Mon Sep 17 00:00:00 2001
From: "fryorcraken.eth" <git@fryorcraken.xyz>
Date: Tue, 13 Dec 2022 15:23:39 +1100
Subject: [PATCH] refactor: remove dupe code

---
 packages/dns-discovery/package.json             |  1 +
 packages/dns-discovery/src/index.ts             |  2 +-
 .../dns-discovery/src/multiaddr_to_peer_info.ts | 17 -----------------
 3 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 packages/dns-discovery/src/multiaddr_to_peer_info.ts

diff --git a/packages/dns-discovery/package.json b/packages/dns-discovery/package.json
index a602683375..918cb3daae 100644
--- a/packages/dns-discovery/package.json
+++ b/packages/dns-discovery/package.json
@@ -59,6 +59,7 @@
   "dependencies": {
     "@waku/enr": "*",
     "@waku/byte-utils": "*",
+    "@waku/libp2p-utils": "*",
     "hi-base32": "^0.5.1",
     "debug": "^4.3.4",
     "dns-query": "^0.11.2",
diff --git a/packages/dns-discovery/src/index.ts b/packages/dns-discovery/src/index.ts
index 243197b723..ad60e4d4b4 100644
--- a/packages/dns-discovery/src/index.ts
+++ b/packages/dns-discovery/src/index.ts
@@ -6,10 +6,10 @@ import { symbol } from "@libp2p/interface-peer-discovery";
 import type { PeerInfo } from "@libp2p/interface-peer-info";
 import { CustomEvent, EventEmitter } from "@libp2p/interfaces/events";
 import { ENR } from "@waku/enr";
+import { multiaddrsToPeerInfo } from "@waku/libp2p-utils";
 import debug from "debug";
 
 import { DnsNodeDiscovery, NodeCapabilityCount } from "./dns.js";
-import { multiaddrsToPeerInfo } from "./multiaddr_to_peer_info.js";
 
 const log = debug("waku:peer-discovery-dns");
 
diff --git a/packages/dns-discovery/src/multiaddr_to_peer_info.ts b/packages/dns-discovery/src/multiaddr_to_peer_info.ts
deleted file mode 100644
index 65524c4439..0000000000
--- a/packages/dns-discovery/src/multiaddr_to_peer_info.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { PeerInfo } from "@libp2p/interface-peer-info";
-import { peerIdFromString } from "@libp2p/peer-id";
-import { Multiaddr } from "@multiformats/multiaddr";
-
-export function multiaddrsToPeerInfo(mas: Multiaddr[]): PeerInfo[] {
-  return mas
-    .map((ma) => {
-      const peerIdStr = ma.getPeerId();
-      const protocols: string[] = [];
-      return {
-        id: peerIdStr ? peerIdFromString(peerIdStr) : null,
-        multiaddrs: [ma.decapsulateCode(421)],
-        protocols,
-      };
-    })
-    .filter((peerInfo): peerInfo is PeerInfo => peerInfo.id !== null);
-}