Skip to content
This repository was archived by the owner on Jun 26, 2023. It is now read-only.

Commit a909d41

Browse files
tabcatmpetrunic
andauthored
fix: replace err-code with CodeError (#334)
* chore: replace err-code with CodeError Replaces [err-code](https://github.com/IndigoUnited/js-err-code/blob/master/index.js) with [CodeError](#314) Related: [js-libp2p#1269](libp2p/js-libp2p#1269) Changes - removes err-code from dependencies - adds @libp2p/interfaces@3.2.0 to dependencies - uses CodeError in place of err-code * remove err-code dep --------- Co-authored-by: Marin Petrunic <marin.petrunic@gmail.com>
1 parent fc1f2cb commit a909d41

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

packages/interface-mocks/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@
158158
"@multiformats/multiaddr": "^11.0.0",
159159
"abortable-iterator": "^4.0.2",
160160
"any-signal": "^3.0.1",
161-
"err-code": "^3.0.1",
162161
"it-handshake": "^4.0.0",
163162
"it-map": "^2.0.0",
164163
"it-ndjson": "^1.0.0",

packages/interface-mocks/src/connection-manager.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type { Connection } from '@libp2p/interface-connection'
44
import type { PeerId } from '@libp2p/interface-peer-id'
55
import type { ConnectionManager, ConnectionManagerEvents } from '@libp2p/interface-connection-manager'
66
import { connectionPair } from './connection.js'
7-
import errCode from 'err-code'
7+
import { CodeError } from '@libp2p/interfaces/errors'
88
import type { Registrar } from '@libp2p/interface-registrar'
99
import type { PubSub } from '@libp2p/interface-pubsub'
1010
import { isMultiaddr, Multiaddr } from '@multiformats/multiaddr'
@@ -30,7 +30,7 @@ class MockNetwork {
3030
}
3131
}
3232

33-
throw errCode(new Error('Peer not found'), 'ERR_PEER_NOT_FOUND')
33+
throw new CodeError('Peer not found', 'ERR_PEER_NOT_FOUND')
3434
}
3535

3636
reset (): void {
@@ -78,11 +78,11 @@ class MockConnectionManager extends EventEmitter<ConnectionManagerEvents> implem
7878

7979
async openConnection (peerId: PeerId | Multiaddr): Promise<Connection> {
8080
if (this.components == null) {
81-
throw errCode(new Error('Not initialized'), 'ERR_NOT_INITIALIZED')
81+
throw new CodeError('Not initialized', 'ERR_NOT_INITIALIZED')
8282
}
8383

8484
if (isMultiaddr(peerId)) {
85-
throw errCode(new Error('Dialing multiaddrs not supported'), 'ERR_NOT_SUPPORTED')
85+
throw new CodeError('Dialing multiaddrs not supported', 'ERR_NOT_SUPPORTED')
8686
}
8787

8888
const existingConnections = this.getConnections(peerId)
@@ -124,7 +124,7 @@ class MockConnectionManager extends EventEmitter<ConnectionManagerEvents> implem
124124

125125
async closeConnections (peerId: PeerId): Promise<void> {
126126
if (this.components == null) {
127-
throw errCode(new Error('Not initialized'), 'ERR_NOT_INITIALIZED')
127+
throw new CodeError('Not initialized', 'ERR_NOT_INITIALIZED')
128128
}
129129

130130
const connections = this.getConnections(peerId)

packages/interface-mocks/src/connection.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import * as STATUS from '@libp2p/interface-connection/status'
1414
import type { Multiaddr } from '@multiformats/multiaddr'
1515
import type { StreamMuxer, StreamMuxerFactory } from '@libp2p/interface-stream-muxer'
1616
import type { AbortOptions } from '@libp2p/interfaces'
17-
import errCode from 'err-code'
17+
import { CodeError } from '@libp2p/interfaces/errors'
1818
import type { Uint8ArrayList } from 'uint8arraylist'
1919

2020
const log = logger('libp2p:mock-connection')
@@ -75,7 +75,7 @@ class MockConnection implements Connection {
7575
}
7676

7777
if (this.stat.status !== STATUS.OPEN) {
78-
throw errCode(new Error('connection must be open to create streams'), 'ERR_CONNECTION_CLOSED')
78+
throw new CodeError('connection must be open to create streams', 'ERR_CONNECTION_CLOSED')
7979
}
8080

8181
const id = `${Math.random()}`

packages/interface-mocks/src/muxer.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
33
import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
44
import { abortableSource } from 'abortable-iterator'
55
import { anySignal } from 'any-signal'
6-
import errCode from 'err-code'
6+
import { CodeError } from '@libp2p/interfaces/errors'
77
import { Logger, logger } from '@libp2p/logger'
88
import * as ndjson from 'it-ndjson'
99
import type { Stream } from '@libp2p/interface-connection'
@@ -125,7 +125,7 @@ class MuxedStream {
125125
id,
126126
sink: async (source) => {
127127
if (this.sinkEnded) {
128-
throw errCode(new Error('stream closed for writing'), 'ERR_SINK_ENDED')
128+
throw new CodeError('stream closed for writing', 'ERR_SINK_ENDED')
129129
}
130130

131131
source = abortableSource(source, anySignal([
@@ -243,7 +243,7 @@ class MuxedStream {
243243

244244
// Close immediately for reading and writing (remote error)
245245
reset: () => {
246-
const err = errCode(new Error('stream reset'), 'ERR_STREAM_RESET')
246+
const err = new CodeError('stream reset', 'ERR_STREAM_RESET')
247247
this.resetController.abort()
248248
this.input.end(err)
249249
onSinkEnd(err)

0 commit comments

Comments
 (0)