chore: linting

libp2p · Nov 30, 2023 · 81e3fcb · 81e3fcb
1 parent ee39905
commit 81e3fcb
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 22 deletions.
diff --git a/packages/libp2p-daemon-client/src/dht.ts b/packages/libp2p-daemon-client/src/dht.ts
@@ -4,13 +4,12 @@ import {
   DHTRequest,
   DHTResponse
 } from '@libp2p/daemon-protocol'
-import { CodeError } from '@libp2p/interface/errors'
-import { isPeerId, type PeerId } from '@libp2p/interface/peer-id'
+import { CodeError } from '@libp2p/interface'
+import { isPeerId, type PeerId, type PeerInfo } from '@libp2p/interface'
 import { peerIdFromBytes } from '@libp2p/peer-id'
 import { multiaddr } from '@multiformats/multiaddr'
 import { CID } from 'multiformats/cid'
 import type { DaemonClient } from './index.js'
-import type { PeerInfo } from '@libp2p/interface/peer-info'
 
 export class DHT {
   private readonly client: DaemonClient

diff --git a/packages/libp2p-daemon-client/src/index.ts b/packages/libp2p-daemon-client/src/index.ts
@@ -1,17 +1,14 @@
 import { type PSMessage, Request, Response, StreamInfo } from '@libp2p/daemon-protocol'
 import { StreamHandler } from '@libp2p/daemon-protocol/stream-handler'
 import { passThroughUpgrader } from '@libp2p/daemon-protocol/upgrader'
-import { CodeError } from '@libp2p/interface/errors'
-import { isPeerId, type PeerId } from '@libp2p/interface/peer-id'
-import { defaultLogger, logger } from '@libp2p/logger'
+import { CodeError } from '@libp2p/interface'
+import { isPeerId, type PeerId, type MultiaddrConnection, type PeerInfo, type Transport } from '@libp2p/interface'
+import { logger } from '@libp2p/logger'
 import { peerIdFromBytes } from '@libp2p/peer-id'
 import { tcp } from '@libp2p/tcp'
 import { multiaddr, isMultiaddr } from '@multiformats/multiaddr'
 import { DHT } from './dht.js'
 import { Pubsub } from './pubsub.js'
-import type { MultiaddrConnection } from '@libp2p/interface/connection'
-import type { PeerInfo } from '@libp2p/interface/peer-info'
-import type { Transport } from '@libp2p/interface/transport'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { Duplex, Source } from 'it-stream-types'
 import type { CID } from 'multiformats/cid'

diff --git a/packages/libp2p-daemon-client/src/pubsub.ts b/packages/libp2p-daemon-client/src/pubsub.ts
@@ -4,10 +4,10 @@ import {
   PSRequest,
   PSMessage
 } from '@libp2p/daemon-protocol'
-import { CodeError } from '@libp2p/interface/errors'
+import { CodeError } from '@libp2p/interface'
 import { peerIdFromBytes } from '@libp2p/peer-id'
 import type { DaemonClient, Subscription } from './index.js'
-import type { PeerId } from '@libp2p/interface/peer-id'
+import type { PeerId } from '@libp2p/interface'
 
 export class Pubsub {
   private readonly client: DaemonClient

diff --git a/packages/libp2p-daemon-client/test/index.spec.ts b/packages/libp2p-daemon-client/test/index.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 
 import { createServer, type Libp2pServer } from '@libp2p/daemon-server'
-import { isPeerId } from '@libp2p/interface/peer-id'
+import { isPeerId } from '@libp2p/interface'
 import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
 import { peerIdFromString } from '@libp2p/peer-id'
 import { multiaddr } from '@multiformats/multiaddr'
@@ -10,8 +10,7 @@ import sinon from 'sinon'
 import { type StubbedInstance, stubInterface } from 'sinon-ts'
 import { createClient, type DaemonClient } from '../src/index.js'
 import type { GossipSub } from '@chainsafe/libp2p-gossipsub'
-import type { Libp2p } from '@libp2p/interface'
-import type { PeerStore } from '@libp2p/interface/peer-store'
+import type { Libp2p, PeerStore } from '@libp2p/interface'
 import type { KadDHT } from '@libp2p/kad-dht'
 
 const defaultMultiaddr = multiaddr('/ip4/0.0.0.0/tcp/0')

diff --git a/packages/libp2p-daemon-client/test/stream.spec.ts b/packages/libp2p-daemon-client/test/stream.spec.ts
@@ -13,8 +13,7 @@ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { createClient, type DaemonClient } from '../src/index.js'
 import type { GossipSub } from '@chainsafe/libp2p-gossipsub'
-import type { Libp2p } from '@libp2p/interface'
-import type { PeerStore } from '@libp2p/interface/peer-store'
+import type { Libp2p, PeerStore } from '@libp2p/interface'
 import type { KadDHT } from '@libp2p/kad-dht'
 
 const defaultMultiaddr = multiaddr('/ip4/0.0.0.0/tcp/0')

diff --git a/packages/libp2p-daemon-protocol/src/upgrader.ts b/packages/libp2p-daemon-protocol/src/upgrader.ts
@@ -1,4 +1,4 @@
-import type { Upgrader } from '@libp2p/interface/transport'
+import type { Upgrader } from '@libp2p/interface'
 
 export const passThroughUpgrader: Upgrader = {
   // @ts-expect-error should return a connection

diff --git a/packages/libp2p-daemon-server/src/dht.ts b/packages/libp2p-daemon-server/src/dht.ts
@@ -6,7 +6,7 @@ import {
 import { logger } from '@libp2p/logger'
 import drain from 'it-drain'
 import { ErrorResponse, OkResponse } from './responses.js'
-import type { PeerId } from '@libp2p/interface/peer-id'
+import type { PeerId } from '@libp2p/interface'
 import type { KadDHT } from '@libp2p/kad-dht'
 import type { CID } from 'multiformats/cid'
 

diff --git a/packages/libp2p-daemon-server/src/index.ts b/packages/libp2p-daemon-server/src/index.ts
@@ -20,9 +20,7 @@ import { DHTOperations } from './dht.js'
 import { PubSubOperations } from './pubsub.js'
 import { ErrorResponse, OkResponse } from './responses.js'
 import type { GossipSub } from '@chainsafe/libp2p-gossipsub'
-import type { Libp2p } from '@libp2p/interface'
-import type { Connection, MultiaddrConnection, Stream } from '@libp2p/interface/connection'
-import type { Listener, Transport } from '@libp2p/interface/transport'
+import type { Libp2p, Connection, MultiaddrConnection, Stream, Listener, Transport } from '@libp2p/interface'
 import type { KadDHT } from '@libp2p/kad-dht'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
@@ -59,7 +57,6 @@ export class Server implements Libp2pServer {
     this.multiaddr = multiaddr
     this.libp2p = libp2pNode
     this.tcp = tcp()({
-      // @ts-expect-error this field will be present post v1
       logger: defaultLogger()
     })
     this.listener = this.tcp.createListener({