chore: bump aegir from 38.1.8 to 39.0.4 (#111)

* deps: bump aegir from 38.1.8 to 39.0.4 Bumps [aegir](https://github.com/ipfs/aegir) from 38.1.8 to 39.0.4. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md) - [Commits](ipfs/aegir@v38.1.8...v39.0.4) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore: fix linting * chore: put comment back * chore: make aegir a dev dep --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: achingbrain <alex@achingbrain.net>
ipfs · May 3, 2023 · 2156568 · 2156568
1 parent 65f44e2
commit 2156568
Show file tree

Hide file tree

Showing 27 changed files with 107 additions and 106 deletions.
diff --git a/package.json b/package.json
@@ -38,8 +38,8 @@
     "dep-check": "aegir run dep-check",
     "release": "npm run docs:no-publish && aegir run release && npm run docs"
   },
-  "dependencies": {
-    "aegir": "^38.1.0"
+  "devDependencies": {
+    "aegir": "^39.0.4"
   },
   "type": "module",
   "workspaces": [

diff --git a/packages/helia/package.json b/packages/helia/package.json
@@ -167,7 +167,8 @@
     "@ipld/dag-cbor": "^9.0.0",
     "@ipld/dag-json": "^10.0.1",
     "@libp2p/websockets": "^5.0.3",
-    "aegir": "^38.1.0",
+    "@types/sinon": "^10.0.14",
+    "aegir": "^39.0.4",
     "delay": "^5.0.0",
     "libp2p": "^0.44.0",
     "sinon": "^15.0.2",

diff --git a/packages/helia/src/helia.ts b/packages/helia/src/helia.ts
@@ -1,21 +1,21 @@
+import { logger } from '@libp2p/logger'
+import { MemoryBlockstore } from 'blockstore-core'
+import { MemoryDatastore } from 'datastore-core'
+import { type Bitswap, createBitswap } from 'ipfs-bitswap'
+import drain from 'it-drain'
+import { identity } from 'multiformats/hashes/identity'
+import { sha256, sha512 } from 'multiformats/hashes/sha2'
+import { CustomProgressEvent } from 'progress-events'
+import { PinsImpl } from './pins.js'
+import { BlockStorage } from './storage.js'
+import { assertDatastoreVersionIsCurrent } from './utils/datastore-version.js'
+import type { HeliaInit } from '.'
 import type { GCOptions, Helia } from '@helia/interface'
+import type { Pins } from '@helia/interface/pins'
 import type { Libp2p } from '@libp2p/interface-libp2p'
 import type { Datastore } from 'interface-datastore'
 import type { CID } from 'multiformats/cid'
-import { identity } from 'multiformats/hashes/identity'
-import { sha256, sha512 } from 'multiformats/hashes/sha2'
 import type { MultihashHasher } from 'multiformats/hashes/interface'
-import type { HeliaInit } from '.'
-import { Bitswap, createBitswap } from 'ipfs-bitswap'
-import { BlockStorage } from './storage.js'
-import type { Pins } from '@helia/interface/pins'
-import { PinsImpl } from './pins.js'
-import { assertDatastoreVersionIsCurrent } from './utils/datastore-version.js'
-import drain from 'it-drain'
-import { CustomProgressEvent } from 'progress-events'
-import { MemoryDatastore } from 'datastore-core'
-import { MemoryBlockstore } from 'blockstore-core'
-import { logger } from '@libp2p/logger'
 
 const log = logger('helia')
 

diff --git a/packages/helia/src/index.ts b/packages/helia/src/index.ts
@@ -25,13 +25,13 @@
  * ```
  */
 
+import { HeliaImpl } from './helia.js'
 import type { Helia } from '@helia/interface'
 import type { Libp2p } from '@libp2p/interface-libp2p'
 import type { Blockstore } from 'interface-blockstore'
 import type { Datastore } from 'interface-datastore'
 import type { CID } from 'multiformats/cid'
 import type { MultihashHasher } from 'multiformats/hashes/interface'
-import { HeliaImpl } from './helia.js'
 
 /**
  * DAGWalkers take a block and yield CIDs encoded in that block

diff --git a/packages/helia/src/pins.ts b/packages/helia/src/pins.ts
@@ -1,15 +1,15 @@
-import type { AddOptions, IsPinnedOptions, LsOptions, Pin, Pins, RmOptions } from '@helia/interface/pins'
-import { Datastore, Key } from 'interface-datastore'
-import { CID, Version } from 'multiformats/cid'
 import * as cborg from 'cborg'
+import { type Datastore, Key } from 'interface-datastore'
 import { base36 } from 'multiformats/bases/base36'
-import type { Blockstore } from 'interface-blockstore'
+import { CID, type Version } from 'multiformats/cid'
+import defer from 'p-defer'
 import PQueue from 'p-queue'
-import type { AbortOptions } from '@libp2p/interfaces'
 import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
-import defer from 'p-defer'
-import type { DAGWalker } from './index.js'
 import { cborWalker, dagPbWalker, jsonWalker, rawWalker } from './utils/dag-walkers.js'
+import type { DAGWalker } from './index.js'
+import type { AddOptions, IsPinnedOptions, LsOptions, Pin, Pins, RmOptions } from '@helia/interface/pins'
+import type { AbortOptions } from '@libp2p/interfaces'
+import type { Blockstore } from 'interface-blockstore'
 
 const DEFAULT_DAG_WALKERS = [
   rawWalker,
@@ -233,6 +233,6 @@ export class PinsImpl implements Pins {
   async isPinned (cid: CID, options: IsPinnedOptions = {}): Promise<boolean> {
     const blockKey = new Key(`${DATASTORE_BLOCK_PREFIX}${DATASTORE_ENCODING.encode(cid.multihash.bytes)}`)
 
-    return await this.datastore.has(blockKey, options)
+    return this.datastore.has(blockKey, options)
   }
 }
diff --git a/packages/helia/src/storage.ts b/packages/helia/src/storage.ts
@@ -1,15 +1,15 @@
 import filter from 'it-filter'
-import type { Blockstore } from 'interface-blockstore'
+import forEach from 'it-foreach'
+import createMortice from 'mortice'
+import { CustomProgressEvent, type ProgressOptions } from 'progress-events'
 import type { Blocks, Pair, DeleteManyBlocksProgressEvents, DeleteBlockProgressEvents, GetBlockProgressEvents, GetManyBlocksProgressEvents, PutManyBlocksProgressEvents, PutBlockProgressEvents, GetAllBlocksProgressEvents } from '@helia/interface/blocks'
-import type { Bitswap } from 'ipfs-bitswap'
-import type { CID } from 'multiformats/cid'
+import type { Pins } from '@helia/interface/pins'
 import type { AbortOptions } from '@libp2p/interfaces'
+import type { Blockstore } from 'interface-blockstore'
 import type { AwaitIterable } from 'interface-store'
+import type { Bitswap } from 'ipfs-bitswap'
 import type { Mortice } from 'mortice'
-import createMortice from 'mortice'
-import type { Pins } from '@helia/interface/pins'
-import forEach from 'it-foreach'
-import { CustomProgressEvent, ProgressOptions } from 'progress-events'
+import type { CID } from 'multiformats/cid'
 
 export interface BlockStorageInit {
   holdGcLock?: boolean

diff --git a/packages/helia/src/utils/dag-walkers.ts b/packages/helia/src/utils/dag-walkers.ts
@@ -4,10 +4,10 @@ import * as dagPb from '@ipld/dag-pb'
 import * as cborg from 'cborg'
 import { Type, Token } from 'cborg'
 import * as cborgJson from 'cborg/json'
-import type { DAGWalker } from '../index.js'
-import * as raw from 'multiformats/codecs/raw'
 import { CID } from 'multiformats'
 import { base64 } from 'multiformats/bases/base64'
+import * as raw from 'multiformats/codecs/raw'
+import type { DAGWalker } from '../index.js'
 
 /**
  * Dag walker for dag-pb CIDs

diff --git a/packages/helia/src/utils/datastore-version.ts b/packages/helia/src/utils/datastore-version.ts
@@ -1,4 +1,4 @@
-import { Datastore, Key } from 'interface-datastore'
+import { type Datastore, Key } from 'interface-datastore'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 

diff --git a/packages/helia/test/fixtures/create-block.ts b/packages/helia/test/fixtures/create-block.ts
@@ -1,6 +1,6 @@
-import type { Blockstore } from 'interface-blockstore'
 import { CID } from 'multiformats/cid'
 import { sha256 } from 'multiformats/hashes/sha2'
+import type { Blockstore } from 'interface-blockstore'
 
 export async function createBlock <Codec extends number> (codec: Codec, block: Uint8Array): Promise<{ cid: CID<unknown, Codec, 18>, block: Uint8Array }> {
   const mh = await sha256.digest(block)

diff --git a/packages/helia/test/fixtures/create-dag.ts b/packages/helia/test/fixtures/create-dag.ts
@@ -1,7 +1,7 @@
-import type { Blockstore } from 'interface-blockstore'
-import type { CID } from 'multiformats/cid'
 import { fromString as uint8arrayFromString } from 'uint8arrays/from-string'
 import { createAndPutBlock } from './create-block.js'
+import type { Blockstore } from 'interface-blockstore'
+import type { CID } from 'multiformats/cid'
 
 export interface DAGNode {
   cid: CID

diff --git a/packages/helia/test/fixtures/dag-walker.ts b/packages/helia/test/fixtures/dag-walker.ts
@@ -1,6 +1,6 @@
-import type { DAGWalker } from '../../src/index.js'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import type { DAGNode } from './create-dag.js'
+import type { DAGWalker } from '../../src/index.js'
 
 export function dagWalker (codec: number, dag: Record<string, DAGNode>): DAGWalker {
   return {

diff --git a/packages/helia/test/gc.spec.ts b/packages/helia/test/gc.spec.ts
@@ -1,18 +1,18 @@
 /* eslint-env mocha */
+import { noise } from '@chainsafe/libp2p-noise'
+import { yamux } from '@chainsafe/libp2p-yamux'
+import * as dagCbor from '@ipld/dag-cbor'
+import * as dagJson from '@ipld/dag-json'
+import * as dagPb from '@ipld/dag-pb'
+import { webSockets } from '@libp2p/websockets'
 import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
 import { createLibp2p } from 'libp2p'
-import { webSockets } from '@libp2p/websockets'
-import { noise } from '@chainsafe/libp2p-noise'
-import { yamux } from '@chainsafe/libp2p-yamux'
-import { createHelia } from '../src/index.js'
-import type { GcEvents, Helia } from '@helia/interface'
 import * as raw from 'multiformats/codecs/raw'
+import { createHelia } from '../src/index.js'
 import { createAndPutBlock } from './fixtures/create-block.js'
-import * as dagPb from '@ipld/dag-pb'
-import * as dagCbor from '@ipld/dag-cbor'
-import * as dagJson from '@ipld/dag-json'
+import type { GcEvents, Helia } from '@helia/interface'
 
 describe('gc', () => {
   let helia: Helia

diff --git a/packages/helia/test/index.spec.ts b/packages/helia/test/index.spec.ts
@@ -1,15 +1,15 @@
 /* eslint-env mocha */
+import { noise } from '@chainsafe/libp2p-noise'
+import { yamux } from '@chainsafe/libp2p-yamux'
+import { webSockets } from '@libp2p/websockets'
 import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
+import { Key } from 'interface-datastore'
 import { createLibp2p } from 'libp2p'
-import { webSockets } from '@libp2p/websockets'
-import { noise } from '@chainsafe/libp2p-noise'
-import { yamux } from '@chainsafe/libp2p-yamux'
+import { CID } from 'multiformats/cid'
 import { createHelia } from '../src/index.js'
 import type { Helia } from '@helia/interface'
-import { CID } from 'multiformats/cid'
-import { Key } from 'interface-datastore'
 
 describe('helia', () => {
   let helia: Helia

diff --git a/packages/helia/test/pins.depth-limited.spec.ts b/packages/helia/test/pins.depth-limited.spec.ts
@@ -1,15 +1,15 @@
 /* eslint-env mocha */
+import { noise } from '@chainsafe/libp2p-noise'
+import { yamux } from '@chainsafe/libp2p-yamux'
+import { webSockets } from '@libp2p/websockets'
 import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
 import { createLibp2p } from 'libp2p'
-import { webSockets } from '@libp2p/websockets'
-import { noise } from '@chainsafe/libp2p-noise'
-import { yamux } from '@chainsafe/libp2p-yamux'
 import { createHelia } from '../src/index.js'
-import type { Helia } from '@helia/interface'
+import { createDag, type DAGNode } from './fixtures/create-dag.js'
 import { dagWalker } from './fixtures/dag-walker.js'
-import { createDag, DAGNode } from './fixtures/create-dag.js'
+import type { Helia } from '@helia/interface'
 
 const MAX_DEPTH = 3
 

diff --git a/packages/helia/test/pins.recursive.spec.ts b/packages/helia/test/pins.recursive.spec.ts
@@ -1,15 +1,15 @@
 /* eslint-env mocha */
+import { noise } from '@chainsafe/libp2p-noise'
+import { yamux } from '@chainsafe/libp2p-yamux'
+import { webSockets } from '@libp2p/websockets'
 import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
 import { createLibp2p } from 'libp2p'
-import { webSockets } from '@libp2p/websockets'
-import { noise } from '@chainsafe/libp2p-noise'
-import { yamux } from '@chainsafe/libp2p-yamux'
 import { createHelia } from '../src/index.js'
-import type { Helia } from '@helia/interface'
+import { createDag, type DAGNode } from './fixtures/create-dag.js'
 import { dagWalker } from './fixtures/dag-walker.js'
-import { createDag, DAGNode } from './fixtures/create-dag.js'
+import type { Helia } from '@helia/interface'
 
 describe('pins (recursive)', () => {
   let helia: Helia

diff --git a/packages/helia/test/pins.spec.ts b/packages/helia/test/pins.spec.ts
@@ -1,17 +1,17 @@
 /* eslint-env mocha */
+import { noise } from '@chainsafe/libp2p-noise'
+import { yamux } from '@chainsafe/libp2p-yamux'
+import { webSockets } from '@libp2p/websockets'
 import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
+import all from 'it-all'
 import { createLibp2p } from 'libp2p'
-import { webSockets } from '@libp2p/websockets'
-import { noise } from '@chainsafe/libp2p-noise'
-import { yamux } from '@chainsafe/libp2p-yamux'
-import { createHelia } from '../src/index.js'
-import type { Helia } from '@helia/interface'
 import { CID } from 'multiformats/cid'
 import * as raw from 'multiformats/codecs/raw'
+import { createHelia } from '../src/index.js'
 import { createAndPutBlock } from './fixtures/create-block.js'
-import all from 'it-all'
+import type { Helia } from '@helia/interface'
 
 describe('pins', () => {
   let helia: Helia

diff --git a/packages/helia/test/storage.spec.ts b/packages/helia/test/storage.spec.ts
@@ -3,19 +3,19 @@
 import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
+import delay from 'delay'
+import all from 'it-all'
+import drain from 'it-drain'
+import * as raw from 'multiformats/codecs/raw'
+import Sinon from 'sinon'
+import { type StubbedInstance, stubInterface } from 'sinon-ts'
+import { PinsImpl } from '../src/pins.js'
 import { BlockStorage } from '../src/storage.js'
+import { createBlock } from './fixtures/create-block.js'
+import type { Pins } from '@helia/interface/pins'
 import type { Blockstore } from 'interface-blockstore'
 import type { Bitswap } from 'ipfs-bitswap'
-import { StubbedInstance, stubInterface } from 'sinon-ts'
-import type { Pins } from '@helia/interface/pins'
-import { PinsImpl } from '../src/pins.js'
 import type { CID } from 'multiformats/cid'
-import { createBlock } from './fixtures/create-block.js'
-import * as raw from 'multiformats/codecs/raw'
-import all from 'it-all'
-import delay from 'delay'
-import drain from 'it-drain'
-import Sinon from 'sinon'
 
 describe('storage', () => {
   let storage: BlockStorage

diff --git a/packages/interface/package.json b/packages/interface/package.json
@@ -166,7 +166,7 @@
     "progress-events": "^1.0.0"
   },
   "devDependencies": {
-    "aegir": "^38.1.0"
+    "aegir": "^39.0.4"
   },
   "typedoc": {
     "entryPoint": "./src/index.ts"

diff --git a/packages/interface/src/blocks.ts b/packages/interface/src/blocks.ts
@@ -1,7 +1,7 @@
-import type { ProgressEvent, ProgressOptions } from 'progress-events'
-import type { CID } from 'multiformats/cid'
-import type { BitswapNotifyProgressEvents, BitswapWantProgressEvents } from 'ipfs-bitswap'
 import type { Blockstore } from 'interface-blockstore'
+import type { BitswapNotifyProgressEvents, BitswapWantProgressEvents } from 'ipfs-bitswap'
+import type { CID } from 'multiformats/cid'
+import type { ProgressEvent, ProgressOptions } from 'progress-events'
 
 export interface Pair {
   cid: CID

diff --git a/packages/interface/src/index.ts b/packages/interface/src/index.ts
@@ -14,14 +14,14 @@
  * ```
  */
 
+import type { Blocks } from './blocks.js'
+import type { Pins } from './pins.js'
 import type { Libp2p } from '@libp2p/interface-libp2p'
-import type { AbortOptions } from '@libp2p/interfaces'
 import type { PeerId } from '@libp2p/interface-peer-id'
+import type { AbortOptions } from '@libp2p/interfaces'
 import type { Datastore } from 'interface-datastore'
-import type { Pins } from './pins.js'
-import type { ProgressEvent, ProgressOptions } from 'progress-events'
 import type { CID } from 'multiformats/cid'
-import type { Blocks } from './blocks.js'
+import type { ProgressEvent, ProgressOptions } from 'progress-events'
 
 export type { Await, AwaitIterable } from 'interface-store'
 

diff --git a/packages/interop/package.json b/packages/interop/package.json
@@ -58,7 +58,7 @@
     "@libp2p/tcp": "^6.1.2",
     "@libp2p/websockets": "^5.0.3",
     "@multiformats/sha3": "^2.0.15",
-    "aegir": "^38.1.0",
+    "aegir": "^39.0.4",
     "blockstore-core": "^4.0.0",
     "datastore-core": "^9.0.0",
     "go-ipfs": "^0.19.0",

diff --git a/packages/interop/test/blockstore.spec.ts b/packages/interop/test/blockstore.spec.ts
@@ -1,14 +1,14 @@
 /* eslint-env mocha */
 
 import { expect } from 'aegir/chai'
+import toBuffer from 'it-to-buffer'
+import { CID } from 'multiformats/cid'
+import * as raw from 'multiformats/codecs/raw'
+import { sha256 } from 'multiformats/hashes/sha2'
 import { createHeliaNode } from './fixtures/create-helia.js'
 import { createKuboNode } from './fixtures/create-kubo.js'
 import type { Helia } from '@helia/interface'
 import type { Controller } from 'ipfsd-ctl'
-import toBuffer from 'it-to-buffer'
-import { sha256 } from 'multiformats/hashes/sha2'
-import { CID } from 'multiformats/cid'
-import * as raw from 'multiformats/codecs/raw'
 
 describe('blockstore', () => {
   let helia: Helia

diff --git a/packages/interop/test/fixtures/create-helia.browser.ts b/packages/interop/test/fixtures/create-helia.browser.ts
@@ -1,11 +1,11 @@
-import { createHelia, HeliaInit } from 'helia'
-import { createLibp2p } from 'libp2p'
-import { webSockets } from '@libp2p/websockets'
-import { all } from '@libp2p/websockets/filters'
 import { noise } from '@chainsafe/libp2p-noise'
 import { yamux } from '@chainsafe/libp2p-yamux'
+import { webSockets } from '@libp2p/websockets'
+import { all } from '@libp2p/websockets/filters'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
+import { createHelia, type HeliaInit } from 'helia'
+import { createLibp2p } from 'libp2p'
 import type { Helia } from '@helia/interface'
 
 export async function createHeliaNode (init?: Partial<HeliaInit>): Promise<Helia> {