chore: remove redundant interfaces

libp2p · Jun 16, 2023 · acbc997 · acbc997
1 parent 6f7845a
commit acbc997
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 50 deletions.
diff --git a/packages/interface-libp2p-internal/src/registrar/index.ts b/packages/interface-libp2p-internal/src/registrar/index.ts
@@ -1,6 +1,5 @@
 import type { Connection, Stream } from '@libp2p/interface-libp2p/connection'
 import type { Topology } from '@libp2p/interface-libp2p/topology'
-import type { PeerId } from '@libp2p/interface-peer-id'
 
 export interface IncomingStreamData {
   stream: Stream
@@ -70,40 +69,3 @@ export interface Registrar {
    */
   getTopologies: (protocol: string) => Topology[]
 }
-
-export interface onConnectHandler {
-  (peerId: PeerId, conn: Connection): void
-}
-
-export interface onDisconnectHandler {
-  (peerId: PeerId, conn?: Connection): void
-}
-
-export interface TopologyInit {
-  /**
-   * minimum needed connections
-   */
-  min?: number
-
-  /**
-   * maximum needed connections
-   */
-  max?: number
-
-  /**
-   * Invoked when a new peer is connects that supports the configured
-   * protocol
-   */
-  onConnect?: onConnectHandler
-
-  /**
-   * Invoked when a peer that supports the configured protocol disconnects
-   */
-  onDisconnect?: onDisconnectHandler
-}
-
-export const topologySymbol = Symbol.for('@libp2p/topology')
-
-export function isTopology (other: any): other is Topology {
-  return other != null && Boolean(other[topologySymbol])
-}
diff --git a/packages/interface-libp2p/src/topology/index.ts b/packages/interface-libp2p/src/topology/index.ts
@@ -8,9 +8,3 @@ export interface Topology {
   onConnect?: (peerId: PeerId, conn: Connection) => void
   onDisconnect?: (peerId: PeerId) => void
 }
-
-export const topologySymbol = Symbol.for('@libp2p/topology')
-
-export function isTopology (other: any): other is Topology {
-  return other != null && Boolean(other[topologySymbol])
-}
diff --git a/packages/libp2p/src/registrar.ts b/packages/libp2p/src/registrar.ts
@@ -1,5 +1,4 @@
 import { CodeError } from '@libp2p/interface-libp2p/errors'
-import { isTopology, type StreamHandlerOptions, type StreamHandlerRecord, type Registrar, type StreamHandler } from '@libp2p/interface-libp2p-internal/registrar'
 import { logger } from '@libp2p/logger'
 import merge from 'merge-options'
 import { codes } from './errors.js'
@@ -8,6 +7,7 @@ import type { EventEmitter } from '@libp2p/interface-libp2p/events'
 import type { PeerStore } from '@libp2p/interface-libp2p/peer-store'
 import type { Topology } from '@libp2p/interface-libp2p/topology'
 import type { ConnectionManager } from '@libp2p/interface-libp2p-internal/connection-manager'
+import type { StreamHandlerOptions, StreamHandlerRecord, Registrar, StreamHandler } from '@libp2p/interface-libp2p-internal/registrar'
 import type { PeerId } from '@libp2p/interface-peer-id'
 
 const log = logger('libp2p:registrar')
@@ -117,11 +117,6 @@ export class DefaultRegistrar implements Registrar {
    * Register handlers for a set of multicodecs given
    */
   async register (protocol: string, topology: Topology): Promise<string> {
-    if (!isTopology(topology)) {
-      log.error('topology must be an instance of interfaces/topology')
-      throw new CodeError('topology must be an instance of interfaces/topology', codes.ERR_INVALID_PARAMETERS)
-    }
-
     // Create topology
     const id = `${(Math.random() * 1e9).toString(36)}${Date.now()}`