diff --git a/examples/auto-relay/test.js b/examples/auto-relay/test.js index 0eaf8cc3..ac5945ab 100644 --- 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 index 63e67f0c..0d9b40d4 100644 --- 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 index 9be0ab21..4574dd9a 100644 --- 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 index d187953c..0f76fa2f 100644 --- 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 index 0aa5c848..86183c81 100644 --- 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 index cbb4b74a..f73744cd 100644 --- 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 index 168f0044..579d6091 100644 --- 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 index a4adc2ad..b69c9ed6 100644 --- 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 index 72f3ba70..2a19b10d 100644 --- 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 index 546c3cdd..82dbcf92 100644 --- 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 index 129c883a..8a295dbb 100644 --- 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 index 35314ab9..c851b879 100644 --- 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 index e8d934cb..3f04c574 100644 --- 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 index e6dff441..223e1d12 100644 --- 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 index 41983896..6d9b0fa7 100644 --- 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 index 4d8a2c18..dc1fe581 100644 --- 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 index 229e2269..fddcc5c8 100644 --- 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 index 708b2039..ea968897 100644 --- 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 index ce4a37a2..63e32032 100644 --- 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 index fcef26e5..48c37fff 100644 --- 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 index d52fb951..cf75b44e 100644 --- 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 index 8ee6d8e3..7b2b6e5d 100644 --- 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 index a6a976a2..6f990073 100644 --- 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 index 950d790a..b0d64662 100644 --- 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 index 69fc0f76..c27bfc56 100644 --- 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 index 5a3b4ff3..b198b450 100644 --- 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 index 92a1932a..286e75a4 100644 --- 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 index 97d1a0d6..4bf63de3 100644 --- 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 index 50b227da..c2769a0a 100644 --- 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 index 2ffb139c..758c0cca 100644 --- 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 index da1f8297..6ef946b6 100644 --- 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 index e973f778..4bd3bab9 100644 --- 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 index 47a5600b..761cd234 100644 --- 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 index 02be96e0..4fadb4f0 100644 --- 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 index 946d9274..c1cfbb13 100644 --- 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 index 7750a357..74b3989c 100644 --- 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 index 2b7ccc6b..a0c9ba63 100644 --- 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 index c21b6305..79930b08 100644 --- 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 index 9c5047a9..26a1d608 100644 --- 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 index 50d42e13..9d9592f3 100644 --- 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 index 3f6b3f33..c7db9646 100644 --- a/test/peer-discovery/index.node.js +++ b/test/peer-discovery/index.node.js @@ -11,7 +11,7 @@ const crypto = require('libp2p-crypto') const KadDht = require('libp2p-kad-dht') const MulticastDNS = require('libp2p-mdns') const { Multiaddr } = require('multiaddr') -const uint8ArrayToString = require('uint8arrays/to-string') +const { toString: uint8ArrayToString } = require('uint8arrays/to-string') const Libp2p = require('../../src') const baseOptions = require('../utils/base-options') diff --git a/test/peer-store/metadata-book.spec.js b/test/peer-store/metadata-book.spec.js index e75ae419..a1b0d2a1 100644 --- a/test/peer-store/metadata-book.spec.js +++ b/test/peer-store/metadata-book.spec.js @@ -2,7 +2,7 @@ /* eslint-env mocha */ const { expect } = require('aegir/utils/chai') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const pDefer = require('p-defer') const PeerStore = require('../../src/peer-store') diff --git a/test/peer-store/peer-store.spec.js b/test/peer-store/peer-store.spec.js index c316240b..4cfaecfe 100644 --- a/test/peer-store/peer-store.spec.js +++ b/test/peer-store/peer-store.spec.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const PeerStore = require('../../src/peer-store') const { Multiaddr } = require('multiaddr') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const peerUtils = require('../utils/creators/peer') diff --git a/test/peer-store/persisted-peer-store.spec.js b/test/peer-store/persisted-peer-store.spec.js index 9c669efd..98509260 100644 --- a/test/peer-store/persisted-peer-store.spec.js +++ b/test/peer-store/persisted-peer-store.spec.js @@ -10,7 +10,7 @@ const PeerStore = require('../../src/peer-store/persistent') const { Multiaddr } = require('multiaddr') const { MemoryDatastore } = require('interface-datastore') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const peerUtils = require('../utils/creators/peer') diff --git a/test/pnet/index.spec.js b/test/pnet/index.spec.js index 98327146..76278e38 100644 --- a/test/pnet/index.spec.js +++ b/test/pnet/index.spec.js @@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai') const duplexPair = require('it-pair/duplex') const pipe = require('it-pipe') const { collect } = require('streaming-iterables') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const Protector = require('../../src/pnet') const Errors = Protector.errors diff --git a/test/record/envelope.spec.js b/test/record/envelope.spec.js index a99ad834..c932528f 100644 --- a/test/record/envelope.spec.js +++ b/test/record/envelope.spec.js @@ -2,8 +2,8 @@ /* eslint-env mocha */ const { expect } = require('aegir/utils/chai') -const uint8arrayFromString = require('uint8arrays/from-string') -const uint8arrayEquals = require('uint8arrays/equals') +const { fromString: uint8arrayFromString } = require('uint8arrays/from-string') +const { equals: uint8arrayEquals } = require('uint8arrays/equals') const Envelope = require('../../src/record/envelope') const { codes: ErrorCodes } = require('../../src/errors') diff --git a/test/relay/relay.node.js b/test/relay/relay.node.js index b75fb1cd..f2290a74 100644 --- a/test/relay/relay.node.js +++ b/test/relay/relay.node.js @@ -9,7 +9,7 @@ const { collect } = require('streaming-iterables') const pipe = require('it-pipe') const AggregateError = require('aggregate-error') const PeerId = require('peer-id') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const { createPeerId } = require('../utils/creators/peer') const baseOptions = require('../utils/base-options') diff --git a/test/upgrading/upgrader.spec.js b/test/upgrading/upgrader.spec.js index b9f276a7..36ed56c2 100644 --- a/test/upgrading/upgrader.spec.js +++ b/test/upgrading/upgrader.spec.js @@ -12,7 +12,7 @@ const pSettle = require('p-settle') const Transport = require('libp2p-websockets') const { NOISE: Crypto } = require('libp2p-noise') const Protector = require('../../src/pnet') -const uint8ArrayFromString = require('uint8arrays/from-string') +const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string') const swarmKeyBuffer = uint8ArrayFromString(require('../fixtures/swarm.key')) const Libp2p = require('../../src')