diff --git a/test/integration/ws2p_client_limitations.ts b/test/integration/ws2p_client_limitations.ts
index 1da2eabea515c7f72158fe5dc0027407e03cd403..7f5bc868d0b86165153e2a553b233bd21ff9c646 100644
--- a/test/integration/ws2p_client_limitations.ts
+++ b/test/integration/ws2p_client_limitations.ts
@@ -9,6 +9,7 @@ import {
} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
+import {hashf} from "../../app/lib/common";
const assert = require('assert')
@@ -112,7 +113,7 @@ describe("WS2P client limitations", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
- 'WS2P 11111111 127.0.0.1 ' + portWS1
+ 'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
await (s1._server.ws2pCluster as WS2PCluster).startCrawling(true)
@@ -231,7 +232,7 @@ describe("WS2P client limitations", function() {
// A server
conf1.ws2p = {
upnp: false,
- uuid: '11111111',
+ uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
@@ -239,7 +240,7 @@ describe("WS2P client limitations", function() {
privilegedNodes: []
}
const server = simpleTestingServer(conf1)
- server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
+ server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})
diff --git a/test/integration/ws2p_cluster.ts b/test/integration/ws2p_cluster.ts
index 08c976f75661a43b40cfe6a6c8a0e5551a3e2e5a..50cc2c1d9ecdbbc01ee8d00767122845022aae4d 100644
--- a/test/integration/ws2p_cluster.ts
+++ b/test/integration/ws2p_cluster.ts
@@ -8,6 +8,7 @@ import {
} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
+import {hashf} from "../../app/lib/common";
const assert = require('assert')
@@ -89,7 +90,7 @@ describe("WS2P cluster", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
- 'WS2P 11111111 127.0.0.1 ' + portWS1
+ 'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
WS2PCluster.plugOn(s2._server);
@@ -144,14 +145,14 @@ describe("WS2P cluster", function() {
// A server
conf1.ws2p = {
upnp: false,
- uuid: '11111111',
+ uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
remoteport: portWS
}
const server = simpleTestingServer(conf1)
- server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
+ server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})
diff --git a/test/integration/ws2p_heads.ts b/test/integration/ws2p_heads.ts
index 7f0e78e50fa47b3e4fa08c96f9eac99718480356..143670f37c877c00539c36709b19976e263d92bb 100644
--- a/test/integration/ws2p_heads.ts
+++ b/test/integration/ws2p_heads.ts
@@ -1,6 +1,7 @@
import {getNewTestingPort, simpleTestingConf, simpleTestingServer, simpleUser, TestingServer} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
+import {hashf} from "../../app/lib/common";
const assert = require('assert')
const should = require('should')
@@ -67,7 +68,7 @@ describe("WS2P heads propagation", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
- 'WS2P 11111111 127.0.0.1 ' + portWS1
+ 'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
await (s1._server.ws2pCluster as WS2PCluster).startCrawling(true)
@@ -110,7 +111,7 @@ describe("WS2P heads propagation", function() {
// A server
conf1.ws2p = {
upnp: false,
- uuid: '11111111',
+ uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
@@ -118,7 +119,7 @@ describe("WS2P heads propagation", function() {
privilegedNodes: []
}
const server = simpleTestingServer(conf1)
- server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
+ server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})
diff --git a/test/integration/ws2p_server_limitations.ts b/test/integration/ws2p_server_limitations.ts
index 8130d186258fb6a94f927ad2e0baaf58bbf7f63d..515a2347dc5bedb3cb310f7cfd258ac7c7d4dcee 100644
--- a/test/integration/ws2p_server_limitations.ts
+++ b/test/integration/ws2p_server_limitations.ts
@@ -9,6 +9,7 @@ import {
} from "./tools/toolbox"
import {WS2PCluster} from "../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PConstants} from "../../app/modules/ws2p/lib/constants"
+import {hashf} from "../../app/lib/common";
const assert = require('assert')
@@ -115,7 +116,7 @@ describe("WS2P server limitations", function() {
const p1 = await s1.getPeer()
assert.deepEqual(p1.endpoints, [
'BASIC_MERKLED_API 127.0.0.1 ' + portBMA1,
- 'WS2P 11111111 127.0.0.1 ' + portWS1
+ 'WS2P '+hashf(catKeyring.pub).slice(0, 8).toUpperCase()+' 127.0.0.1 ' + portWS1
])
await s2.writePeer(p1)
await (s1._server.ws2pCluster as WS2PCluster).startCrawling(true)
@@ -208,7 +209,7 @@ describe("WS2P server limitations", function() {
// A server
conf1.ws2p = {
upnp: false,
- uuid: '11111111',
+ uuid: hashf(keyring.pub).slice(0, 8).toUpperCase(),
host: '127.0.0.1',
port: portWS,
remotehost: '127.0.0.1',
@@ -216,7 +217,7 @@ describe("WS2P server limitations", function() {
privilegedNodes: []
}
const server = simpleTestingServer(conf1)
- server._server.addEndpointsDefinitions(async () => 'WS2P 11111111 127.0.0.1 ' + portWS)
+ server._server.addEndpointsDefinitions(async () => 'WS2P '+conf1.ws2p.uuid+' 127.0.0.1 ' + portWS)
return { server, portWS, portBMA }
}
})