Skip to content

chore: update imports and remove unnecessary pending dial interfaces #1696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"@libp2p/interface-content-routing": "^2.0.0",
"@libp2p/interface-dht": "^2.0.0",
"@libp2p/interface-keychain": "^2.0.4",
"@libp2p/interface-libp2p": "^1.0.0",
"@libp2p/interface-libp2p": "^1.3.0",
"@libp2p/interface-metrics": "^4.0.0",
"@libp2p/interface-peer-discovery": "^1.0.1",
"@libp2p/interface-peer-id": "^2.0.1",
Expand Down
3 changes: 1 addition & 2 deletions src/connection-manager/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { codes } from '../errors.js'
import type { PeerId } from '@libp2p/interface-peer-id'
import { setMaxListeners } from 'events'
import type { Connection, MultiaddrConnection } from '@libp2p/interface-connection'
import type { ConnectionManager, ConnectionManagerEvents } from '@libp2p/interface-connection-manager'
import type { ConnectionManager, ConnectionManagerEvents, PendingDial } from '@libp2p/interface-connection-manager'
import type { AddressSorter, PeerStore } from '@libp2p/interface-peer-store'
import { Multiaddr, Resolver, multiaddr } from '@multiformats/multiaddr'
import { KEEP_ALIVE } from '@libp2p/interface-peer-store/tags'
Expand All @@ -23,7 +23,6 @@ import { PeerMap } from '@libp2p/peer-collections'
import { publicAddressesFirst } from '@libp2p/utils/address-sort'
import { AUTO_DIAL_CONCURRENCY, AUTO_DIAL_PRIORITY, DIAL_TIMEOUT, INBOUND_CONNECTION_THRESHOLD, MAX_CONNECTIONS, MAX_INCOMING_PENDING_CONNECTIONS, MAX_PARALLEL_DIALS, MAX_PEER_ADDRS_TO_DIAL, MIN_CONNECTIONS } from './constants.js'
import { dnsaddrResolver } from '@multiformats/multiaddr/resolvers'
import type { PendingDial } from '../libp2p.js'

const log = logger('libp2p:connection-manager')

Expand Down
10 changes: 1 addition & 9 deletions src/libp2p.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,10 @@ import type { Datastore } from 'interface-datastore'
import type { KeyChain } from '@libp2p/interface-keychain'
import mergeOptions from 'merge-options'
import type { CircuitRelayService } from './circuit-relay/index.js'
import type { PendingDial } from '@libp2p/interface-libp2p'

const log = logger('libp2p')

export type PendingDialStatus = 'queued' | 'active' | 'error' | 'success'

export interface PendingDial {
id: string
status: PendingDialStatus
peerId?: PeerId
multiaddrs: Multiaddr[]
}

export class Libp2pNode extends EventEmitter<Libp2pEvents> implements Libp2p {
public peerId: PeerId
public dht: DualDHT
Expand Down