feat: update uint8arrays (#105)

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v2
       with:
         node-version: 16
     - run: npm install
@@ -29,7 +29,7 @@ jobs:
       fail-fast: true
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
       - run: npm install
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
       - run: npm install
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 16
       - run: npm install

packages/compliance-tests/package.json

@@ -36,7 +36,7 @@
   "dependencies": {
     "abort-controller": "^3.0.0",
     "abortable-iterator": "^3.0.0",
-    "aegir": "^33.2.2",
+    "aegir": "^35.0.1",
     "chai": "^4.3.4",
     "chai-checkmark": "^1.0.1",
     "delay": "^5.0.0",
@@ -51,7 +51,7 @@
     "peer-id": "^0.15.0",
     "sinon": "^11.1.1",
     "streaming-iterables": "^6.0.0",
-    "uint8arrays": "^2.1.3"
+    "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
     "it-handshake": "^2.0.0"

packages/compliance-tests/src/crypto/index.js

@@ -7,7 +7,7 @@ const duplexPair = require('it-pair/duplex')
 const { pipe } = require('it-pipe')
 const PeerId = require('peer-id')
 const { collect } = require('streaming-iterables')
-const uint8arrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const peers = require('../utils/peers')
 const { UnexpectedPeerError } = require('libp2p-interfaces/src/crypto/errors')
@@ -55,7 +55,7 @@ module.exports = (common) => {
       pipe(inboundResult.conn, inboundResult.conn)
 
       // Send some data and collect the result
-      const input = uint8arrayFromString('data to encrypt')
+      const input = uint8ArrayFromString('data to encrypt')
       const result = await pipe(
         [input],
         outboundResult.conn,

packages/compliance-tests/src/pubsub/api.js

@@ -7,7 +7,7 @@ const sinon = require('sinon')
 
 const pDefer = require('p-defer')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const topic = 'foo'
 const data = uint8ArrayFromString('bar')

packages/compliance-tests/src/pubsub/connection-handlers.js

@@ -6,8 +6,8 @@ const { expect } = require('aegir/utils/chai')
 const sinon = require('sinon')
 const pDefer = require('p-defer')
 const pWaitFor = require('p-wait-for')
-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')
 
 const { expectSet } = require('./utils')
 

packages/compliance-tests/src/pubsub/emit-self.js

@@ -5,7 +5,7 @@
 const { expect } = require('aegir/utils/chai')
 const sinon = require('sinon')
 
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const topic = 'foo'
 const data = uint8ArrayFromString('bar')

packages/compliance-tests/src/pubsub/messages.js

@@ -6,7 +6,7 @@ const { expect } = require('aegir/utils/chai')
 const sinon = require('sinon')
 
 const PeerId = require('peer-id')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const { utils } = require('libp2p-interfaces/src/pubsub')
 const PeerStreams = require('libp2p-interfaces/src/pubsub/peer-streams')

packages/compliance-tests/src/pubsub/multiple-nodes.js

@@ -9,8 +9,8 @@ const sinon = require('sinon')
 const delay = require('delay')
 const pDefer = require('p-defer')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const { expectSet } = require('./utils')
 

packages/compliance-tests/src/pubsub/two-nodes.js

@@ -8,8 +8,8 @@ const sinon = require('sinon')
 
 const pDefer = require('p-defer')
 const pWaitFor = require('p-wait-for')
-const uint8ArrayFromString = require('uint8arrays/from-string')
-const uint8ArrayToString = require('uint8arrays/to-string')
+const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const {
   first,

packages/compliance-tests/src/stream-muxer/close-test.js

@@ -8,14 +8,14 @@ const { pipe } = require('it-pipe')
 const { consume } = require('streaming-iterables')
 const { source: abortable } = require('abortable-iterator')
 const AbortController = require('abort-controller').default
-const uint8arrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 function pause (ms) {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
 
 function randomBuffer () {
-  return uint8arrayFromString(Math.random().toString())
+  return uint8ArrayFromString(Math.random().toString())
 }
 
 const infiniteRandom = {

packages/compliance-tests/src/transport/listen-test.js

@@ -8,7 +8,7 @@ const sinon = require('sinon')
 
 const pWaitFor = require('p-wait-for')
 const { pipe } = require('it-pipe')
-const uint8arrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 const { isValidTick } = require('./utils')
 
 module.exports = (common) => {
@@ -74,7 +74,7 @@ module.exports = (common) => {
       // Wait for the data send and close to finish
       await Promise.all([
         pipe(
-          [uint8arrayFromString('Some data that is never handled')],
+          [uint8ArrayFromString('Some data that is never handled')],
           socket1
         ),
         // Closer the listener (will take a couple of seconds to time out)

packages/interfaces/package.json

@@ -19,7 +19,10 @@
     }
   },
   "eslintConfig": {
-    "extends": "ipfs"
+    "extends": "ipfs",
+    "ignorePatterns": [
+      "**/*.d.ts"
+    ]
   },
   "scripts": {
     "lint": "aegir lint",
@@ -66,12 +69,12 @@
     "multiformats": "^9.1.2",
     "peer-id": "^0.15.0",
     "protobufjs": "^6.10.2",
-    "uint8arrays": "^2.1.3"
+    "uint8arrays": "^3.0.0"
   },
   "devDependencies": {
     "@types/bl": "^5.0.1",
     "@types/debug": "^4.1.5",
-    "aegir": "^33.0.0",
+    "aegir": "^35.0.1",
     "events": "^3.3.0",
     "it-pair": "^1.0.0",
     "p-wait-for": "^3.2.0",

packages/interfaces/src/pubsub/index.js

@@ -495,7 +495,6 @@ class PubsubBaseProtocol extends EventEmitter {
    * Whether to accept a message from a peer
    * Override to create a graylist
    *
-   * @override
    * @param {string} id
    * @returns {boolean}
    */
@@ -653,7 +652,6 @@ class PubsubBaseProtocol extends EventEmitter {
   /**
    * Publishes messages to all subscribed peers
    *
-   * @override
    * @param {string} topic
    * @param {Uint8Array} message
    * @returns {Promise<void>}
@@ -718,7 +716,6 @@ class PubsubBaseProtocol extends EventEmitter {
   /**
    * Unsubscribe from the given topic.
    *
-   * @override
    * @param {string} topic
    * @returns {void}
    */
@@ -736,7 +733,6 @@ class PubsubBaseProtocol extends EventEmitter {
   /**
    * Get the list of topics which the peer is subscribed to.
    *
-   * @override
    * @returns {Array<string>}
    */
   getTopics () {

packages/interfaces/src/pubsub/message/sign.js

@@ -2,8 +2,8 @@
 
 const PeerId = require('peer-id')
 const { RPC } = require('./rpc')
-const uint8ArrayConcat = require('uint8arrays/concat')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { concat: uint8ArrayConcat } = require('uint8arrays/concat')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 const SignPrefix = uint8ArrayFromString('libp2p-pubsub:')
 const { normalizeOutRpcMessage } = require('../utils')
 

packages/interfaces/src/pubsub/utils.js

@@ -2,8 +2,8 @@
 
 // @ts-ignore libp2p crypto has no types
 const randomBytes = require('libp2p-crypto/src/random-bytes')
-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')
 const PeerId = require('peer-id')
 const { sha256 } = require('multiformats/hashes/sha2')
 

packages/interfaces/src/record/README.md

@@ -30,7 +30,7 @@ describe('your record', () => {
 ```js
 const multicodec = require('multicodec')
 const Record = require('libp2p-interfaces/src/record')
-const fromString = require('uint8arrays/from-string')
+const { fromString } = require('uint8arrays/from-string')
 // const Protobuf = require('./record.proto')
 
 const ENVELOPE_DOMAIN_PEER_RECORD = 'libp2p-peer-record'

packages/interfaces/test/pubsub/emit-self.spec.js

@@ -9,7 +9,7 @@ const {
   PubsubImplementation
 } = require('./utils')
 
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const protocol = '/pubsub/1.0.0'
 const topic = 'foo'

packages/interfaces/test/pubsub/message.spec.js

@@ -3,7 +3,7 @@
 
 const { expect } = require('aegir/utils/chai')
 const sinon = require('sinon')
-const uint8arrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const PubsubBaseImpl = require('../../src/pubsub')
 const { SignaturePolicy } = require('../../src/pubsub/signature-policy')
@@ -35,7 +35,7 @@ describe('pubsub base messages', () => {
   it('_buildMessage normalizes and signs messages', async () => {
     const message = {
       receivedFrom: peerId.toB58String(),
-      data: uint8arrayFromString('hello'),
+      data: uint8ArrayFromString('hello'),
       topicIDs: ['test-topic']
     }
 

packages/interfaces/test/pubsub/pubsub.spec.js

@@ -6,7 +6,7 @@ const { expect } = require('aegir/utils/chai')
 const sinon = require('sinon')
 const pWaitFor = require('p-wait-for')
 
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const PeerStreams = require('../../src/pubsub/peer-streams')
 const {

packages/interfaces/test/pubsub/sign.spec.js

@@ -3,8 +3,8 @@
 'use strict'
 
 const { expect } = require('aegir/utils/chai')
-const uint8ArrayConcat = require('uint8arrays/concat')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { concat: uint8ArrayConcat } = require('uint8arrays/concat')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const { RPC } = require('../../src/pubsub/message/rpc')
 const {

packages/interfaces/test/pubsub/topic-validators.spec.js

@@ -7,8 +7,8 @@ const pWaitFor = require('p-wait-for')
 const errCode = require('err-code')
 
 const PeerId = require('peer-id')
-const uint8ArrayEquals = require('uint8arrays/equals')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { equals: uint8ArrayEquals } = require('uint8arrays/equals')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const PeerStreams = require('../../src/pubsub/peer-streams')
 const { SignaturePolicy } = require('../../src/pubsub/signature-policy')

packages/interfaces/test/pubsub/utils.spec.js

@@ -3,7 +3,7 @@
 
 const { expect } = require('aegir/utils/chai')
 const utils = require('../../src/pubsub/utils')
-const uint8ArrayFromString = require('uint8arrays/from-string')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 describe('utils', () => {
   it('randomSeqno', () => {