chore: update uint8arrays

vasco-santos · vasco-santos · commit 0f389a7828e7 · 2021-08-20T09:13:21.000+02:00
diff --git a/examples/auto-relay/test.js b/examples/auto-relay/test.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 function startProcess (name, args = []) {
   return execa('node', [path.join(__dirname, name), ...args], {
diff --git a/examples/chat/test.js b/examples/chat/test.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 function startProcess(name) {
   return execa('node', [path.join(__dirname, name)], {
diff --git a/examples/connection-encryption/test.js b/examples/connection-encryption/test.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test () {
   const messageReceived = pDefer()
diff --git a/examples/discovery-mechanisms/test-1.js b/examples/discovery-mechanisms/test-1.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 const bootstrapers = require('./bootstrapers')
 
 const discoveredCopy = 'Discovered:'
diff --git a/examples/discovery-mechanisms/test-2.js b/examples/discovery-mechanisms/test-2.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const discoveredCopy = 'Discovered:'
 
diff --git a/examples/discovery-mechanisms/test-3.js b/examples/discovery-mechanisms/test-3.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const discoveredCopy = 'discovered:'
 
diff --git a/examples/echo/test.js b/examples/echo/test.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 function startProcess(name) {
   return execa('node', [path.join(__dirname, name)], {
diff --git a/examples/package.json b/examples/package.json
@@ -10,10 +10,12 @@
   "dependencies": {
     "execa": "^2.1.0",
     "fs-extra": "^8.1.0",
+    "libp2p": "../src",
     "libp2p-pubsub-peer-discovery": "^4.0.0",
-    "libp2p-relay-server": "^0.2.0",
-    "libp2p-gossipsub": "^0.9.1",
+    "libp2p-relay-server": "^0.3.0",
+    "libp2p-gossipsub": "^0.11.0",
     "p-defer": "^3.0.0",
+    "uint8arrays": "^3.0.0",
     "which": "^2.0.1"
   },
   "devDependencies": {
diff --git a/examples/peer-and-content-routing/test-1.js b/examples/peer-and-content-routing/test-1.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test() {
   process.stdout.write('1.js\n')
diff --git a/examples/peer-and-content-routing/test-2.js b/examples/peer-and-content-routing/test-2.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const providedCopy = 'is providing'
 const foundCopy = 'Found provider:'
diff --git a/examples/pnet/test.js b/examples/pnet/test.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test () {
   const messageReceived = pDefer()
diff --git a/examples/protocol-and-stream-muxing/test-1.js b/examples/protocol-and-stream-muxing/test-1.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test() {
   const messageDefer = pDefer()
diff --git a/examples/protocol-and-stream-muxing/test-2.js b/examples/protocol-and-stream-muxing/test-2.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const messages = [
   'protocol (a)',
diff --git a/examples/protocol-and-stream-muxing/test-3.js b/examples/protocol-and-stream-muxing/test-3.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const messages = [
   'from 1 to 2',
diff --git a/examples/pubsub/1.js b/examples/pubsub/1.js
@@ -6,8 +6,8 @@ const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const createNode = async () => {
   const node = await Libp2p.create({
diff --git a/examples/pubsub/message-filtering/1.js b/examples/pubsub/message-filtering/1.js
@@ -6,8 +6,8 @@ const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
 const { NOISE } = require('libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const createNode = async () => {
   const node = await Libp2p.create({
diff --git a/examples/pubsub/message-filtering/test.js b/examples/pubsub/message-filtering/test.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const stdout = [
   {
diff --git a/examples/pubsub/test-1.js b/examples/pubsub/test-1.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test () {
   const defer = pDefer()
diff --git a/examples/transports/test-1.js b/examples/transports/test-1.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test () {
   const deferStarted = pDefer()
diff --git a/examples/transports/test-2.js b/examples/transports/test-2.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test () {
   const defer = pDefer()
diff --git a/examples/transports/test-3.js b/examples/transports/test-3.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test () {
   const deferNode1 = pDefer()
diff --git a/examples/transports/test-4.js b/examples/transports/test-4.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 async function test () {
   const deferNode1 = pDefer()
diff --git a/examples/webrtc-direct/test.js b/examples/webrtc-direct/test.js
@@ -3,7 +3,7 @@
 const path = require('path')
 const execa = require('execa')
 const pDefer = require('p-defer')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 const { chromium } = require('playwright');
 
 function startNode (name, args = []) {
diff --git a/package.json b/package.json
@@ -124,7 +124,7 @@
     "set-delayed-interval": "^1.0.0",
     "streaming-iterables": "^6.0.0",
     "timeout-abort-controller": "^1.1.1",
-    "uint8arrays": "^2.1.3",
+    "uint8arrays": "^3.0.0",
     "varint": "^6.0.0",
     "wherearewe": "^1.0.0",
     "xsalsa20": "^1.1.0"
diff --git a/src/circuit/auto-relay.js b/src/circuit/auto-relay.js
@@ -5,8 +5,8 @@ const log = Object.assign(debug('libp2p:auto-relay'), {
   error: debug('libp2p:auto-relay:err')
 })
 
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 const { Multiaddr } = require('multiaddr')
 const PeerId = require('peer-id')
 
diff --git a/src/identify/index.js b/src/identify/index.js
@@ -8,7 +8,7 @@ const errCode = require('err-code')
 const lp = require('it-length-prefixed')
 const { pipe } = require('it-pipe')
 const { collect, take, consume } = require('streaming-iterables')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const PeerId = require('peer-id')
 const { Multiaddr } = require('multiaddr')
diff --git a/src/keychain/cms.js b/src/keychain/cms.js
@@ -8,8 +8,8 @@ require('node-forge/lib/pbe')
 const forge = require('node-forge/lib/forge')
 const { certificateForKey, findAsync } = require('./util')
 const errcode = require('err-code')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const privates = new WeakMap()
 
diff --git a/src/keychain/index.js b/src/keychain/index.js
@@ -10,8 +10,8 @@ const crypto = require('libp2p-crypto')
 const { Key } = require('interface-datastore')
 const CMS = require('./cms')
 const errcode = require('err-code')
-const uint8ArrayToString = require('uint8arrays/to-string')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 // @ts-ignore node-forge sha512 types not exported
 require('node-forge/lib/sha512')
diff --git a/src/peer-store/metadata-book.js b/src/peer-store/metadata-book.js
@@ -5,7 +5,7 @@ const log = Object.assign(debug('libp2p:peer-store:proto-book'), {
   error: debug('libp2p:peer-store:proto-book:err')
 })
 const errcode = require('err-code')
-const uint8ArrayEquals = require('uint8arrays/equals')
+const { equals: uint8ArrayEquals } = require('uint8arrays/equals')
 
 const PeerId = require('peer-id')
 
diff --git a/src/ping/index.js b/src/ping/index.js
@@ -11,7 +11,7 @@ const { pipe } = require('it-pipe')
 // @ts-ignore it-buffer has no types exported
 const { toBuffer } = require('it-buffer')
 const { collect, take } = require('streaming-iterables')
-const equals = require('uint8arrays/equals')
+const { equals } = require('uint8arrays/equals')
 
 const { PROTOCOL_NAME, PING_LENGTH, PROTOCOL_VERSION } = require('./constants')
 
diff --git a/src/pnet/crypto.js b/src/pnet/crypto.js
@@ -10,8 +10,8 @@ const Errors = require('./errors')
 // @ts-ignore xsalsa20 has no types exported
 const xsalsa20 = require('xsalsa20')
 const KEY_LENGTH = require('./key-generator').KEY_LENGTH
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 /**
  * Creates a stream iterable to encrypt messages in a private network
diff --git a/src/pnet/key-generator.js b/src/pnet/key-generator.js
@@ -2,8 +2,8 @@
 
 const crypto = require('libp2p-crypto')
 const KEY_LENGTH = 32
-const uint8ArrayToString = require('uint8arrays/to-string')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 /**
  * Generates a PSK that can be used in a libp2p-pnet private network
diff --git a/src/record/README.md b/src/record/README.md
@@ -17,7 +17,7 @@ You can read further about the envelope in [libp2p/specs#217](https://github.com
 ```js
 // interface-record implementation example with the "libp2p-example" namespace
 const Record = require('libp2p-interfaces/src/record')
-const fromString = require('uint8arrays/from-string')
+const { fromString } = require('uint8arrays/from-string')
 
 class ExampleRecord extends Record {
   constructor () {
diff --git a/src/record/envelope/index.js b/src/record/envelope/index.js
@@ -1,13 +1,13 @@
 'use strict'
 
 const errCode = require('err-code')
-const uint8arraysConcat = require('uint8arrays/concat')
-const uint8arraysFromString = require('uint8arrays/from-string')
+const { concat: uint8arraysConcat } = require('uint8arrays/concat')
+const { fromString: uint8arraysFromString } = require('uint8arrays/from-string')
 // @ts-ignore libp2p-crypto does not support types
 const cryptoKeys = require('libp2p-crypto/src/keys')
 const PeerId = require('peer-id')
 const varint = require('varint')
-const uint8arraysEquals = require('uint8arrays/equals')
+const { equals: uint8arraysEquals } = require('uint8arrays/equals')
 
 const { codes } = require('../../errors')
 const { Envelope: Protobuf } = require('./envelope')
diff --git a/test/content-routing/dht/operation.node.js b/test/content-routing/dht/operation.node.js
@@ -6,7 +6,7 @@ const { expect } = require('aegir/utils/chai')
 const { Multiaddr } = require('multiaddr')
 const pWaitFor = require('p-wait-for')
 const mergeOptions = require('merge-options')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const { create } = require('../../../src')
 const { subsystemOptions, subsystemMulticodecs } = require('./utils')
diff --git a/test/dialing/direct.node.js b/test/dialing/direct.node.js
@@ -17,7 +17,7 @@ const pushable = require('it-pushable')
 const AggregateError = require('aggregate-error')
 const { Connection } = require('libp2p-interfaces/src/connection')
 const { AbortError } = require('libp2p-interfaces/src/transport/errors')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const Libp2p = require('../../src')
 const Dialer = require('../../src/dialer')
diff --git a/test/identify/index.spec.js b/test/identify/index.spec.js
@@ -9,7 +9,7 @@ const PeerId = require('peer-id')
 const duplexPair = require('it-pair/duplex')
 const { Multiaddr } = require('multiaddr')
 const pWaitFor = require('p-wait-for')
-const unit8ArrayToString = require('uint8arrays/to-string')
+const { toString: unit8ArrayToString } = require('uint8arrays/to-string')
 
 const { codes: Errors } = require('../../src/errors')
 const IdentifyService = require('../../src/identify')
diff --git a/test/keychain/cms-interop.spec.js b/test/keychain/cms-interop.spec.js
@@ -3,8 +3,8 @@
 'use strict'
 
 const { expect } = require('aegir/utils/chai')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 const { MemoryDatastore } = require('interface-datastore')
 const Keychain = require('../../src/keychain')
 
diff --git a/test/keychain/keychain.spec.js b/test/keychain/keychain.spec.js
@@ -4,8 +4,8 @@
 
 const { expect } = require('aegir/utils/chai')
 const fail = expect.fail
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
 
 const peerUtils = require('../utils/creators/peer')
 
diff --git a/test/keychain/peerid.spec.js b/test/keychain/peerid.spec.js
@@ -7,7 +7,7 @@ const { base58btc } = require('multiformats/bases/base58')
 const crypto = require('libp2p-crypto')
 const rsaUtils = require('libp2p-crypto/src/keys/rsa-utils')
 const rsaClass = require('libp2p-crypto/src/keys/rsa-class')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const sample = {
   id: '122019318b6e5e0cf93a2314bf01269a2cc23cd3dcd452d742cdb9379d8646f6e4a9',
diff --git a/test/peer-discovery/index.node.js b/test/peer-discovery/index.node.js
diff --git a/test/peer-store/metadata-book.spec.js b/test/peer-store/metadata-book.spec.js
diff --git a/test/peer-store/peer-store.spec.js b/test/peer-store/peer-store.spec.js
diff --git a/test/peer-store/persisted-peer-store.spec.js b/test/peer-store/persisted-peer-store.spec.js
diff --git a/test/pnet/index.spec.js b/test/pnet/index.spec.js
diff --git a/test/record/envelope.spec.js b/test/record/envelope.spec.js
diff --git a/test/relay/relay.node.js b/test/relay/relay.node.js
diff --git a/test/upgrading/upgrader.spec.js b/test/upgrading/upgrader.spec.js
