@streamr/dht 100.0.0-testnet-three.0 → 100.0.0-testnet-three.2

package/test/integration/ConnectivityChecking.test.ts

@@ -0,0 +1,64 @@
+import { MetricsContext } from '@streamr/utils'
+import { ConnectionManager } from '../../src/connection/ConnectionManager'
+import { DefaultConnectorFacade } from '../../src/connection/ConnectorFacade'
+import { MockTransport } from '../utils/mock/Transport'
+import { createMockPeerDescriptor } from '../utils/utils'
+import { sendConnectivityRequest } from '../../src/connection/connectivityChecker'
+import { version } from '../../package.json'
+
+describe('ConnectivityChecking', () => {
+
+    let server: ConnectionManager
+    const PORT = 15000
+    const HOST = '127.0.0.1'
+
+    beforeEach(async () => {
+        server = new ConnectionManager({
+            createConnectorFacade: () => new DefaultConnectorFacade({
+                createLocalPeerDescriptor: () => {
+                    return {
+                        ...createMockPeerDescriptor(),
+                        websocket: {
+                            host: HOST,
+                            port: PORT,
+                            tls: false
+                        }
+                    }
+                },
+                websocketHost: HOST,
+                websocketPortRange: { min: PORT, max: PORT },
+                websocketServerEnableTls: false,
+                transport: new MockTransport()
+            }),
+            metricsContext: new MetricsContext()
+        })
+        await server.start()
+    })
+
+    afterEach(async () => {
+        await server.stop()
+    })
+
+    it('connectivityCheck with compatible version', async () => {
+        const request = {
+            host: HOST,
+            port: PORT,
+            tls: false,
+            selfSigned: false
+        }
+        const response = await sendConnectivityRequest(request, server.getLocalPeerDescriptor(), version)
+        expect(response.version).toEqual(version)
+    })
+
+    it('connectivityCheck with incompatible version', async () => {
+        const request = {
+            host: HOST,
+            port: PORT,
+            tls: false,
+            selfSigned: false
+        }
+        await expect(sendConnectivityRequest(request, server.getLocalPeerDescriptor(), '0.0.1'))
+            .toReject()
+    })
+
+})

package/test/unit/SortedContactList.test.ts

@@ -118,4 +118,17 @@ describe('SortedContactList', () => {
         list.setActive(item4.getNodeId())
         expect(list.getActiveContacts()).toEqual([item2, item3, item4])
     })
+
+    it('does not emit newContact if contact did not fit the structure', () => {
+        const list = new SortedContactList({ referenceId: item0.getNodeId(), maxSize: 2, allowToContainReferenceId: false, emitEvents: true })
+        const onNewContact = jest.fn()
+        list.on('newContact', onNewContact)
+        list.addContact(item1)
+        list.addContact(item2)
+        expect(onNewContact).toBeCalledTimes(2)
+        list.addContact(item3)
+        expect(onNewContact).toBeCalledTimes(2)
+        expect(list.getAllContacts().length).toEqual(2)
+    })
+
 })

package/test/unit/connectivityRequestHandler.test.ts

@@ -6,6 +6,7 @@ import { server as WsServer } from 'websocket'
 import { CONNECTIVITY_CHECKER_SERVICE_ID } from '../../src/connection/connectivityChecker'
 import { attachConnectivityRequestHandler } from '../../src/connection/connectivityRequestHandler'
 import { Message, MessageType } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { version } from '../../package.json'
 
 const HOST = '127.0.0.1'
 const PORT = 15001
@@ -61,7 +62,8 @@ describe('connectivityRequestHandler', () => {
                         port: PORT,
                         tls: false
                     },
-                    ipAddress: ipv4ToNumber(HOST)
+                    ipAddress: ipv4ToNumber(HOST),
+                    version
                 },
                 oneofKind: 'connectivityResponse'
             },