From 9f60944d7fb73cd5be6bfb1b47e76044437847db Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 16 Aug 2023 13:09:33 +0100
Subject: [PATCH] deps: switch varint for uint8-varint

It's faster and we use it elsewhere in the stack so save ourselves
an extra dependency.
---
 package.json   |  5 ++---
 src/codec.ts   | 10 +++++-----
 src/convert.ts |  8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index b5a8553c..5942ce13 100644
--- a/package.json
+++ b/package.json
@@ -170,12 +170,11 @@
     "@libp2p/interface": "^0.1.1",
     "dns-over-http-resolver": "^2.1.0",
     "multiformats": "^12.0.1",
-    "uint8arrays": "^4.0.2",
-    "varint": "^6.0.0"
+    "uint8-varint": "^2.0.1",
+    "uint8arrays": "^4.0.2"
   },
   "devDependencies": {
     "@types/sinon": "^10.0.14",
-    "@types/varint": "^6.0.0",
     "aegir": "^40.0.2",
     "sinon": "^15.0.0"
   },
diff --git a/src/codec.ts b/src/codec.ts
index fb7ed616..1bd49c4d 100644
--- a/src/codec.ts
+++ b/src/codec.ts
@@ -1,6 +1,6 @@
+import * as varint from 'uint8-varint'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import varint from 'varint'
 import { convertToBytes, convertToString } from './convert.js'
 import { getProtocol } from './protocols-table.js'
 import type { StringTuple, Tuple, Protocol } from './index.js'
@@ -79,7 +79,7 @@ export function bytesToMultiaddrParts (bytes: Uint8Array): MultiaddrParts {
   let i = 0
   while (i < bytes.length) {
     const code = varint.decode(bytes, i)
-    const n = varint.decode.bytes ?? 0
+    const n = varint.encodingLength(code)
 
     const p = getProtocol(code)
 
@@ -165,8 +165,8 @@ function sizeForAddr (p: Protocol, addr: Uint8Array | number[]): number {
   } else if (p.size === 0) {
     return 0
   } else {
-    const size = varint.decode(addr)
-    return size + (varint.decode.bytes ?? 0)
+    const size = varint.decode(addr instanceof Uint8Array ? addr : Uint8Array.from(addr))
+    return size + varint.encodingLength(size)
   }
 }
 
@@ -175,7 +175,7 @@ export function bytesToTuples (buf: Uint8Array): Tuple[] {
   let i = 0
   while (i < buf.length) {
     const code = varint.decode(buf, i)
-    const n = varint.decode.bytes ?? 0
+    const n = varint.encodingLength(code)
 
     const p = getProtocol(code)
 
diff --git a/src/convert.ts b/src/convert.ts
index 43dd241b..65dd9aa5 100644
--- a/src/convert.ts
+++ b/src/convert.ts
@@ -10,10 +10,10 @@ import { base58btc } from 'multiformats/bases/base58'
 import { bases } from 'multiformats/basics'
 import { CID } from 'multiformats/cid'
 import * as Digest from 'multiformats/hashes/digest'
+import * as varint from 'uint8-varint'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import varint from 'varint'
 import * as ip from './ip.js'
 import { getProtocol } from './protocols-table.js'
 import type { Multiaddr } from './index.js'
@@ -176,7 +176,7 @@ function str2bytes (str: string): Uint8Array {
 
 function bytes2str (buf: Uint8Array): string {
   const size = varint.decode(buf)
-  buf = buf.slice(varint.decode.bytes)
+  buf = buf.slice(varint.encodingLength(size))
 
   if (buf.length !== size) {
     throw new Error('inconsistent lengths')
@@ -206,7 +206,7 @@ function mb2bytes (mbstr: string): Uint8Array {
 }
 function bytes2mb (buf: Uint8Array): string {
   const size = varint.decode(buf)
-  const hash = buf.slice(varint.decode.bytes)
+  const hash = buf.slice(varint.encodingLength(size))
 
   if (hash.length !== size) {
     throw new Error('inconsistent lengths')
@@ -220,7 +220,7 @@ function bytes2mb (buf: Uint8Array): string {
  */
 function bytes2mh (buf: Uint8Array): string {
   const size = varint.decode(buf)
-  const address = buf.slice(varint.decode.bytes)
+  const address = buf.slice(varint.encodingLength(size))
 
   if (address.length !== size) {
     throw new Error('inconsistent lengths')