Skip to content

Commit 074e78b

Browse files
dependabot[bot]achingbrain
dependabot[bot]
and
achingbrain
authored
deps(dev): bump aegir from 38.1.8 to 39.0.10 (#146)
* deps(dev): bump aegir from 38.1.8 to 39.0.10 Bumps [aegir](https://github.com/ipfs/aegir) from 38.1.8 to 39.0.10. - [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.10) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore: fix linting --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: achingbrain <[email protected]>
1 parent f032696 commit 074e78b

14 files changed

+54
-53
lines changed

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@
198198
},
199199
"devDependencies": {
200200
"@libp2p/peer-id-factory": "^2.0.3",
201-
"aegir": "^38.1.6",
201+
"@types/sinon": "^10.0.15",
202+
"aegir": "^39.0.10",
202203
"delay": "^5.0.0",
203204
"it-pair": "^2.0.6",
204205
"p-defer": "^4.0.0",

‎src/index.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import { logger } from '@libp2p/logger'
2-
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
1+
import { type PubSub, type Message, type StrictNoSign, type StrictSign, type PubSubInit, type PubSubEvents, type PeerStreams, type PubSubRPCMessage, type PubSubRPC, type PubSubRPCSubscription, type SubscriptionChangeData, type PublishResult, type TopicValidatorFn, TopicValidatorResult } from '@libp2p/interface-pubsub'
32
import { CodeError } from '@libp2p/interfaces/errors'
3+
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
4+
import { logger } from '@libp2p/logger'
5+
import { PeerMap, PeerSet } from '@libp2p/peer-collections'
6+
import { createTopology } from '@libp2p/topology'
47
import { pipe } from 'it-pipe'
58
import Queue from 'p-queue'
6-
import { createTopology } from '@libp2p/topology'
79
import { codes } from './errors.js'
810
import { PeerStreams as PeerStreamsImpl } from './peer-streams.js'
9-
import { toMessage, ensureArray, noSignMsgId, msgId, toRpcMessage, randomSeqno } from './utils.js'
1011
import {
1112
signMessage,
1213
verifySignature
1314
} from './sign.js'
15+
import { toMessage, ensureArray, noSignMsgId, msgId, toRpcMessage, randomSeqno } from './utils.js'
16+
import type { Connection } from '@libp2p/interface-connection'
1417
import type { PeerId } from '@libp2p/interface-peer-id'
1518
import type { IncomingStreamData, Registrar } from '@libp2p/interface-registrar'
16-
import type { Connection } from '@libp2p/interface-connection'
17-
import { PubSub, Message, StrictNoSign, StrictSign, PubSubInit, PubSubEvents, PeerStreams, PubSubRPCMessage, PubSubRPC, PubSubRPCSubscription, SubscriptionChangeData, PublishResult, TopicValidatorFn, TopicValidatorResult } from '@libp2p/interface-pubsub'
18-
import { PeerMap, PeerSet } from '@libp2p/peer-collections'
1919
import type { Uint8ArrayList } from 'uint8arraylist'
2020

2121
const log = logger('libp2p:pubsub')
@@ -132,7 +132,7 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
132132
onConnect: this._onPeerConnected,
133133
onDisconnect: this._onPeerDisconnected
134134
})
135-
this._registrarTopologyIds = await Promise.all(this.multicodecs.map(async multicodec => await registrar.register(multicodec, topology)))
135+
this._registrarTopologyIds = await Promise.all(this.multicodecs.map(async multicodec => registrar.register(multicodec, topology)))
136136

137137
log('started')
138138
this.started = true
@@ -589,9 +589,9 @@ export abstract class PubSubBaseProtocol<Events extends Record<string, any> = Pu
589589
const signaturePolicy = this.globalSignaturePolicy
590590
switch (signaturePolicy) {
591591
case 'StrictSign':
592-
return await signMessage(this.components.peerId, message, this.encodeMessage.bind(this))
592+
return signMessage(this.components.peerId, message, this.encodeMessage.bind(this))
593593
case 'StrictNoSign':
594-
return await Promise.resolve({
594+
return Promise.resolve({
595595
type: 'unsigned',
596596
...message
597597
})

‎src/peer-streams.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { logger } from '@libp2p/logger'
21
import { EventEmitter, CustomEvent } from '@libp2p/interfaces/events'
2+
import { logger } from '@libp2p/logger'
3+
import { abortableSource } from 'abortable-iterator'
34
import * as lp from 'it-length-prefixed'
4-
import { pushable } from 'it-pushable'
55
import { pipe } from 'it-pipe'
6-
import { abortableSource } from 'abortable-iterator'
7-
import type { PeerId } from '@libp2p/interface-peer-id'
6+
import { pushable } from 'it-pushable'
7+
import { Uint8ArrayList } from 'uint8arraylist'
88
import type { Stream } from '@libp2p/interface-connection'
9-
import type { Pushable } from 'it-pushable'
9+
import type { PeerId } from '@libp2p/interface-peer-id'
1010
import type { PeerStreamEvents } from '@libp2p/interface-pubsub'
11-
import { Uint8ArrayList } from 'uint8arraylist'
11+
import type { Pushable } from 'it-pushable'
1212

1313
const log = logger('libp2p-pubsub:peer-streams')
1414

‎src/sign.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { keys } from '@libp2p/crypto'
2+
import { peerIdFromKeys } from '@libp2p/peer-id'
13
import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
24
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
35
import { toRpcMessage } from './utils.js'
46
import type { PeerId } from '@libp2p/interface-peer-id'
5-
import { keys } from '@libp2p/crypto'
67
import type { PubSubRPCMessage, SignedMessage } from '@libp2p/interface-pubsub'
7-
import { peerIdFromKeys } from '@libp2p/peer-id'
88

99
export const SignPrefix = uint8ArrayFromString('libp2p-pubsub:')
1010

@@ -73,7 +73,7 @@ export async function verifySignature (message: SignedMessage, encode: (rpc: Pub
7373
const pubKey = keys.unmarshalPublicKey(pubKeyBytes)
7474

7575
// verify the base message
76-
return await pubKey.verify(bytes, message.signature)
76+
return pubKey.verify(bytes, message.signature)
7777
}
7878

7979
/**

‎src/utils.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { randomBytes } from '@libp2p/crypto'
2+
import { CodeError } from '@libp2p/interfaces/errors'
3+
import { peerIdFromBytes, peerIdFromKeys } from '@libp2p/peer-id'
4+
import { sha256 } from 'multiformats/hashes/sha2'
25
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
36
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
4-
import { sha256 } from 'multiformats/hashes/sha2'
5-
import type { Message, PubSubRPCMessage } from '@libp2p/interface-pubsub'
6-
import { peerIdFromBytes, peerIdFromKeys } from '@libp2p/peer-id'
77
import { codes } from './errors.js'
8-
import { CodeError } from '@libp2p/interfaces/errors'
8+
import type { Message, PubSubRPCMessage } from '@libp2p/interface-pubsub'
99

1010
/**
1111
* Generate a random sequence number

‎test/emit-self.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { expect } from 'aegir/chai'
2+
import delay from 'delay'
3+
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
24
import {
35
createPeerId,
46
MockRegistrar,
57
PubsubImplementation
68
} from './utils/index.js'
7-
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
8-
import delay from 'delay'
99

1010
const protocol = '/pubsub/1.0.0'
1111
const topic = 'foo'

‎test/instance.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { createEd25519PeerId } from '@libp2p/peer-id-factory'
12
import { expect } from 'aegir/chai'
23
import { PubSubBaseProtocol } from '../src/index.js'
4+
import { MockRegistrar } from './utils/index.js'
35
import type { PublishResult, PubSubRPC, PubSubRPCMessage } from '@libp2p/interface-pubsub'
46
import type { Uint8ArrayList } from 'uint8arraylist'
5-
import { MockRegistrar } from './utils/index.js'
6-
import { createEd25519PeerId } from '@libp2p/peer-id-factory'
77

88
class PubsubProtocol extends PubSubBaseProtocol {
99
decodeRpc (bytes: Uint8Array): PubSubRPC {

‎test/lifecycle.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect } from 'aegir/chai'
2+
import delay from 'delay'
23
import sinon from 'sinon'
34
import { PubSubBaseProtocol } from '../src/index.js'
45
import {
@@ -9,10 +10,9 @@ import {
910
mockIncomingStreamEvent
1011
} from './utils/index.js'
1112
import type { PeerId } from '@libp2p/interface-peer-id'
12-
import type { Registrar } from '@libp2p/interface-registrar'
1313
import type { PublishResult, PubSubRPC, PubSubRPCMessage } from '@libp2p/interface-pubsub'
14+
import type { Registrar } from '@libp2p/interface-registrar'
1415
import type { Uint8ArrayList } from 'uint8arraylist'
15-
import delay from 'delay'
1616

1717
class PubsubProtocol extends PubSubBaseProtocol {
1818
decodeRpc (bytes: Uint8Array): PubSubRPC {

‎test/message.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
import { expect } from 'aegir/chai'
33
import sinon from 'sinon'
44
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
5+
import { randomSeqno } from '../src/utils.js'
56
import {
67
createPeerId,
78
MockRegistrar,
89
PubsubImplementation
910
} from './utils/index.js'
1011
import type { PeerId } from '@libp2p/interface-peer-id'
1112
import type { Message } from '@libp2p/interface-pubsub'
12-
import { randomSeqno } from '../src/utils.js'
1313

1414
describe('pubsub base messages', () => {
1515
let peerId: PeerId

‎test/pubsub.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
/* eslint max-nested-callbacks: ["error", 6] */
2+
import { PeerSet } from '@libp2p/peer-collections'
3+
import { createEd25519PeerId } from '@libp2p/peer-id-factory'
24
import { expect } from 'aegir/chai'
3-
import sinon from 'sinon'
5+
import delay from 'delay'
6+
import pDefer from 'p-defer'
47
import pWaitFor from 'p-wait-for'
8+
import sinon from 'sinon'
59
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
610
import { PeerStreams } from '../src/peer-streams.js'
11+
import { noSignMsgId } from '../src/utils.js'
712
import {
813
createPeerId,
914
MockRegistrar,
@@ -12,12 +17,7 @@ import {
1217
mockIncomingStreamEvent
1318
} from './utils/index.js'
1419
import type { PeerId } from '@libp2p/interface-peer-id'
15-
import { PeerSet } from '@libp2p/peer-collections'
16-
import { createEd25519PeerId } from '@libp2p/peer-id-factory'
17-
import { noSignMsgId } from '../src/utils.js'
1820
import type { Message, PubSubRPC } from '@libp2p/interface-pubsub'
19-
import delay from 'delay'
20-
import pDefer from 'p-defer'
2121

2222
const protocol = '/pubsub/1.0.0'
2323
const topic = 'test-topic'

‎test/sign.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1+
import { keys } from '@libp2p/crypto'
2+
import * as PeerIdFactory from '@libp2p/peer-id-factory'
13
import { expect } from 'aegir/chai'
24
import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
35
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
4-
import { RPC } from './message/rpc.js'
56
import {
67
signMessage,
78
SignPrefix,
89
verifySignature
910
} from '../src/sign.js'
10-
import * as PeerIdFactory from '@libp2p/peer-id-factory'
1111
import { randomSeqno, toRpcMessage } from '../src/utils.js'
12-
import { keys } from '@libp2p/crypto'
13-
import type { PubSubRPCMessage } from '@libp2p/interface-pubsub'
12+
import { RPC } from './message/rpc.js'
1413
import type { PeerId } from '@libp2p/interface-peer-id'
14+
import type { PubSubRPCMessage } from '@libp2p/interface-pubsub'
1515

1616
function encodeMessage (message: PubSubRPCMessage): Uint8Array {
1717
return RPC.Message.encode(message)

‎test/topic-validators.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { type PubSubRPC, TopicValidatorResult } from '@libp2p/interface-pubsub'
2+
import { createEd25519PeerId } from '@libp2p/peer-id-factory'
13
import { expect } from 'aegir/chai'
2-
import sinon from 'sinon'
34
import pWaitFor from 'p-wait-for'
4-
import { createEd25519PeerId } from '@libp2p/peer-id-factory'
5+
import sinon from 'sinon'
56
import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
67
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
78
import { PeerStreams } from '../src/peer-streams.js'
@@ -10,7 +11,6 @@ import {
1011
PubsubImplementation
1112
} from './utils/index.js'
1213
import type { PeerId } from '@libp2p/interface-peer-id'
13-
import { PubSubRPC, TopicValidatorResult } from '@libp2p/interface-pubsub'
1414

1515
const protocol = '/pubsub/1.0.0'
1616

‎test/utils.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import { peerIdFromBytes, peerIdFromString } from '@libp2p/peer-id'
2+
import * as PeerIdFactory from '@libp2p/peer-id-factory'
13
import { expect } from 'aegir/chai'
2-
import * as utils from '../src/utils.js'
34
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
5+
import * as utils from '../src/utils.js'
46
import type { Message, PubSubRPCMessage } from '@libp2p/interface-pubsub'
5-
import { peerIdFromBytes, peerIdFromString } from '@libp2p/peer-id'
6-
import * as PeerIdFactory from '@libp2p/peer-id-factory'
77

88
describe('utils', () => {
99
it('randomSeqno', () => {

‎test/utils/index.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { duplexPair } from 'it-pair/duplex'
21
import * as PeerIdFactory from '@libp2p/peer-id-factory'
2+
import { duplexPair } from 'it-pair/duplex'
33
import { PubSubBaseProtocol } from '../../src/index.js'
44
import { RPC } from '../message/rpc.js'
5-
import type { IncomingStreamData, Registrar, StreamHandler, StreamHandlerRecord, Topology } from '@libp2p/interface-registrar'
65
import type { Connection } from '@libp2p/interface-connection'
76
import type { PeerId } from '@libp2p/interface-peer-id'
87
import type { PublishResult, PubSubRPC, PubSubRPCMessage } from '@libp2p/interface-pubsub'
8+
import type { IncomingStreamData, Registrar, StreamHandler, StreamHandlerRecord, Topology } from '@libp2p/interface-registrar'
99

1010
export const createPeerId = async (): Promise<PeerId> => {
1111
const peerId = await PeerIdFactory.createEd25519PeerId()
@@ -38,8 +38,8 @@ export class PubsubImplementation extends PubSubBaseProtocol {
3838
}
3939

4040
export class MockRegistrar implements Registrar {
41-
private readonly topologies: Map<string, { topology: Topology, protocols: string[] }> = new Map()
42-
private readonly handlers: Map<string, StreamHandler> = new Map()
41+
private readonly topologies = new Map<string, { topology: Topology, protocols: string[] }>()
42+
private readonly handlers = new Map<string, StreamHandler>()
4343

4444
getProtocols (): string[] {
4545
const protocols = new Set<string>()
@@ -131,7 +131,7 @@ export const ConnectionPair = (): [Connection, Connection] => {
131131
return [
132132
{
133133
// @ts-expect-error incomplete implementation
134-
newStream: async (protocol: string[]) => await Promise.resolve({
134+
newStream: async (protocol: string[]) => Promise.resolve({
135135
...d0,
136136
stat: {
137137
protocol: protocol[0]
@@ -140,7 +140,7 @@ export const ConnectionPair = (): [Connection, Connection] => {
140140
},
141141
{
142142
// @ts-expect-error incomplete implementation
143-
newStream: async (protocol: string[]) => await Promise.resolve({
143+
newStream: async (protocol: string[]) => Promise.resolve({
144144
...d1,
145145
stat: {
146146
protocol: protocol[0]

0 commit comments

Comments
 (0)