client: added peer related types

Author: holgerd77

packages/client/lib/net/peer/libp2ppeer.ts

@@ -5,6 +5,8 @@ import { parseMultiaddrs } from '../../util'
 import { Libp2pSender } from '../protocol/libp2psender'
 import { Peer, PeerOptions } from './peer'
 import { Libp2pNode } from './libp2pnode'
+import { Protocol } from '../protocol'
+import { Libp2pServer } from '../server'
 
 export interface Libp2pPeerOptions extends Omit<PeerOptions, 'address' | 'transport'> {
   /* Multiaddrs to listen on (can be a comma separated string or list) */
@@ -73,7 +75,7 @@ export class Libp2pPeer extends Peer {
    * @private
    * @return {Promise}
    */
-  async accept(protocol: any, connection: any, server: any): Promise<void> {
+  async accept(protocol: Protocol, connection: any, server: Libp2pServer): Promise<void> {
     await this.bindProtocol(protocol, new Libp2pSender(connection))
     this.inbound = true
     this.server = server
@@ -87,7 +89,7 @@ export class Libp2pPeer extends Peer {
    * @param  {Server}     [server] optional server that initiated connection
    * @return {Promise}
    */
-  async bindProtocols(node: any, peerInfo: any, server: any = null): Promise<void> {
+  async bindProtocols(node: Libp2pNode, peerInfo: any, server?: Libp2pServer): Promise<void> {
     await Promise.all(
       this.protocols.map(async (p: any) => {
         await p.open()

packages/client/lib/net/peer/rlpxpeer.ts

@@ -8,6 +8,7 @@ import {
 } from '@ethereumjs/devp2p'
 import { Protocol, RlpxSender } from '../protocol'
 import { Peer, PeerOptions } from './peer'
+import { RlpxServer } from '../server'
 
 const devp2pCapabilities: any = {
   eth63: Devp2pETH.eth63,
@@ -140,7 +141,7 @@ export class RlpxPeer extends Peer {
    * @private
    * @return {Promise}
    */
-  async accept(rlpxPeer: Devp2pRlpxPeer, server: any): Promise<void> {
+  async accept(rlpxPeer: Devp2pRlpxPeer, server: RlpxServer): Promise<void> {
     if (this.connected) {
       return
     }

packages/client/lib/net/server/libp2pserver.ts

@@ -85,7 +85,7 @@ export class Libp2pServer extends Server {
           return
         }
         const peer = this.createPeer(peerInfo)
-        await peer.bindProtocols(this.node, peerInfo, this)
+        await peer.bindProtocols(this.node as Libp2pNode, peerInfo, this)
         this.config.logger.debug(`Peer discovered: ${peer}`)
         this.emit('connected', peer)
       } catch (e) {

packages/client/test/net/peer/libp2ppeer.spec.ts

@@ -59,9 +59,9 @@ tape('[Libp2pPeer]', async (t) => {
 
   t.test('should connect to peer', async (t) => {
     const config = new Config({ loglevel: 'error' })
-    const peer = new Libp2pPeer({ config })
+    const peer: any = new Libp2pPeer({ config })
     peer.bindProtocols = td.func<typeof peer['bindProtocol']>()
-    td.when(peer.bindProtocols(td.matchers.anything(), peerInfo)).thenResolve()
+    td.when(peer.bindProtocols(td.matchers.anything(), peerInfo)).thenResolve(null)
     peer.on('connected', () => {
       t.pass('connected')
       t.end()
@@ -71,9 +71,9 @@ tape('[Libp2pPeer]', async (t) => {
 
   t.test('should accept peer connection', async (t) => {
     const config = new Config({ loglevel: 'error' })
-    const peer = new Libp2pPeer({ config })
+    const peer: any = new Libp2pPeer({ config })
     peer.bindProtocol = td.func<typeof peer['bindProtocol']>()
-    td.when(peer.bindProtocol('proto' as any, 'conn' as any)).thenResolve()
+    td.when(peer.bindProtocol('proto' as any, 'conn' as any)).thenResolve(null)
     await peer.accept('proto', 'conn', 'server')
     t.equals(peer.server, 'server', 'server set')
     t.ok(peer.inbound, 'inbound set to true')
@@ -84,12 +84,12 @@ tape('[Libp2pPeer]', async (t) => {
     const config = new Config({ loglevel: 'error' })
     const protocol = { name: 'proto', versions: [1], open: () => {} } as Protocol
     const badProto = { name: 'bad', versions: [1], open: () => {} } as Protocol
-    const peer = new Libp2pPeer({ config, protocols: [protocol, badProto] })
+    const peer: any = new Libp2pPeer({ config, protocols: [protocol, badProto] })
     const node = new Libp2pNode() as any
     peer.bindProtocol = td.func<typeof peer['bindProtocol']>()
     protocol.open = td.func<Protocol['open']>()
     badProto.open = td.func<Protocol['open']>()
-    td.when(peer.bindProtocol(protocol, td.matchers.isA(Libp2pSender))).thenResolve()
+    td.when(peer.bindProtocol(protocol, td.matchers.isA(Libp2pSender))).thenResolve(null)
     td.when(protocol.open()).thenResolve()
     td.when(node.asyncDialProtocol(peerInfo, '/proto/1')).thenResolve(null)
     td.when(node.asyncDialProtocol(peerInfo, '/bad/1')).thenReject(new Error('bad'))

packages/client/test/net/peer/rlpxpeer.spec.ts

@@ -98,9 +98,9 @@ tape('[RlpxPeer]', async (t) => {
 
   t.test('should accept peer connection', async (t) => {
     const config = new Config({ transports: [], loglevel: 'error' })
-    const peer = new RlpxPeer({ config, id: 'abcdef0123', host: '10.0.0.1', port: 1234 })
+    const peer: any = new RlpxPeer({ config, id: 'abcdef0123', host: '10.0.0.1', port: 1234 })
     peer.bindProtocols = td.func<typeof peer['bindProtocols']>()
-    td.when(peer.bindProtocols('rlpxpeer' as any)).thenResolve()
+    td.when(peer.bindProtocols('rlpxpeer' as any)).thenResolve(null)
     await peer.accept('rlpxpeer' as any, 'server')
     t.equals(peer.server, 'server', 'server set')
     t.end()