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

fix: remove extra fields #153

Merged
merged 2 commits into from
Jan 29, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export default (test: TestSetup<Connection>) => {

it('should have properties set', () => {
expect(connection.id).to.exist()
expect(connection.localPeer).to.exist()
expect(connection.remotePeer).to.exist()
expect(connection.localAddr).to.exist()
expect(connection.remoteAddr).to.exist()
expect(connection.stat.status).to.equal('OPEN')
expect(connection.stat.timeline.open).to.exist()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export function createMaConnPair (): [MultiaddrConnection, MultiaddrConnection]
const output: MultiaddrConnection = {
...duplex,
close: async () => {},
conn: {},
remoteAddr: new Multiaddr('/ip4/127.0.0.1/tcp/4001'),
timeline: {
open: Date.now()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,8 @@ export function mockUpgrader () {
}

async function createConnection (maConn: MultiaddrConnection, direction: 'inbound' | 'outbound'): Promise<Connection> {
const localAddr = maConn.localAddr
const remoteAddr = maConn.remoteAddr

if (localAddr == null) {
throw new Error('No localAddr found on MultiaddrConnection')
}

const localPeerIdStr = localAddr.getPeerId()
const remotePeerIdStr = remoteAddr.getPeerId()
const localPeer = localPeerIdStr != null ? PeerId.fromString(localPeerIdStr) : await PeerIdFactory.createEd25519PeerId()
const remotePeer = remotePeerIdStr != null ? PeerId.fromString(remotePeerIdStr) : await PeerIdFactory.createEd25519PeerId()

const streams: MuxedStream[] = []
Expand All @@ -65,9 +57,7 @@ async function createConnection (maConn: MultiaddrConnection, direction: 'inboun

return {
id: 'mock-connection',
localAddr,
remoteAddr,
localPeer,
remotePeer,
stat: {
status: 'OPEN',
Expand Down
2 changes: 0 additions & 2 deletions packages/libp2p-interfaces/src/connection/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ export interface Stream {
export interface Connection {
id: string
stat: ConnectionStat
localAddr: Multiaddr
remoteAddr: Multiaddr
localPeer: PeerId
remotePeer: PeerId
registry: Map<string, StreamData>
tags: string[]
Expand Down
4 changes: 2 additions & 2 deletions packages/libp2p-interfaces/src/peer-id/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { CID } from 'multiformats/cid'
import type { MultihashDigest } from 'multiformats/types/hashes/interface'
import type { MultibaseEncoder } from 'multiformats/types/bases/interface'
import type { MultihashDigest } from 'multiformats/hashes/interface'
import type { MultibaseEncoder } from 'multiformats/bases/interface'

export interface PeerId {
readonly type: 'RSA' | 'Ed25519' | 'secp256k1'
Expand Down
8 changes: 3 additions & 5 deletions packages/libp2p-interfaces/src/transport/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type events from 'events'
import type { EventEmitter } from 'events'
import type { Multiaddr } from '@multiformats/multiaddr'
import type { Connection } from '../connection/index.js'
import type { AbortOptions } from '../index.js'
Expand Down Expand Up @@ -34,7 +34,7 @@ export interface Transport <DialOptions extends AbortOptions = AbortOptions, Cre
filter: MultiaddrFilter
}

export interface Listener extends events.EventEmitter {
export interface Listener extends EventEmitter {
/**
* Start a listener
*/
Expand Down Expand Up @@ -69,10 +69,8 @@ export interface MultiaddrConnectionTimeline {
close?: number
}

export interface MultiaddrConnection extends Duplex<Uint8Array, Uint8Array, Promise<void>> {
export interface MultiaddrConnection extends Duplex<Uint8Array> {
close: (err?: Error) => Promise<void>
conn: unknown
remoteAddr: Multiaddr
localAddr?: Multiaddr
timeline: MultiaddrConnectionTimeline
}
4 changes: 2 additions & 2 deletions packages/libp2p-peer-id/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { base58btc } from 'multiformats/bases/base58'
import * as Digest from 'multiformats/hashes/digest'
import { identity } from 'multiformats/hashes/identity'
import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
import type { MultibaseDecoder, MultibaseEncoder } from 'multiformats/types/bases/interface'
import type { MultihashDigest } from 'multiformats/types/hashes/interface'
import type { MultibaseDecoder, MultibaseEncoder } from 'multiformats/bases/interface'
import type { MultihashDigest } from 'multiformats/hashes/interface'
import { sha256 } from 'multiformats/hashes/sha2'

const baseDecoder = Object
Expand Down