From 11a843f49be8cad89afa1a8bff7efef992216086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Moreau?= <cem.moreau@gmail.com>
Date: Sun, 17 Dec 2017 15:29:47 +0100
Subject: [PATCH] [enh] Refactoring: RouterDependency
---
app/modules/router.ts | 6 ++----
index.ts | 4 ++--
test/integration/network-update.js | 2 +-
test/integration/peer-outdated.js | 2 +-
test/integration/peerings.js | 2 +-
test/integration/peers-same-pubkey.js | 2 +-
test/integration/start_generate_blocks.js | 2 +-
test/integration/tools/toolbox.ts | 7 ++++---
8 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/app/modules/router.ts b/app/modules/router.ts
index d6484f05b..9c7f2b14d 100644
--- a/app/modules/router.ts
+++ b/app/modules/router.ts
@@ -5,9 +5,7 @@ import * as stream from "stream"
import {Multicaster} from "../lib/streams/multicaster"
import {RouterStream} from "../lib/streams/router"
-const constants = require('../lib/constants');
-
-module.exports = {
+export const RouterDependency = {
duniter: {
service: {
output: (server:Server, conf:ConfDTO, logger:any) => new Router(server)
@@ -26,7 +24,7 @@ module.exports = {
* Service which triggers the server's peering generation (actualization of the Peer document).
* @constructor
*/
-class Router extends stream.Transform {
+export class Router extends stream.Transform {
theRouter:any
theMulticaster:Multicaster = new Multicaster()
diff --git a/index.ts b/index.ts
index ecf7be9d6..8eb07ea0d 100644
--- a/index.ts
+++ b/index.ts
@@ -9,6 +9,7 @@ import {BmaDependency} from "./app/modules/bma/index"
import {WS2PDependency} from "./app/modules/ws2p/index"
import {ProverConstants} from "./app/modules/prover/lib/constants"
import { ProxiesConf } from './app/lib/proxy';
+import {RouterDependency} from "./app/modules/router"
const path = require('path');
const _ = require('underscore');
@@ -25,7 +26,6 @@ const reapplyDependency = require('./app/modules/reapply');
const revertDependency = require('./app/modules/revert');
const daemonDependency = require('./app/modules/daemon');
const pSignalDependency = require('./app/modules/peersignal');
-const routerDependency = require('./app/modules/router');
const pluginDependency = require('./app/modules/plugin');
class Stacks {
@@ -102,7 +102,7 @@ const DEFAULT_DEPENDENCIES = MINIMAL_DEPENDENCIES.concat([
{ name: 'duniter-revert', required: revertDependency },
{ name: 'duniter-daemon', required: daemonDependency },
{ name: 'duniter-psignal', required: pSignalDependency },
- { name: 'duniter-router', required: routerDependency },
+ { name: 'duniter-router', required: RouterDependency },
{ name: 'duniter-plugin', required: pluginDependency },
{ name: 'duniter-prover', required: ProverDependency },
{ name: 'duniter-keypair', required: KeypairDependency },
diff --git a/test/integration/network-update.js b/test/integration/network-update.js
index 44c7ce929..7da00b7cf 100644
--- a/test/integration/network-update.js
+++ b/test/integration/network-update.js
@@ -60,7 +60,7 @@ describe("Network updating", function() {
yield [s1, s2].reduce((p, server) => co(function*() {
yield p;
yield server.initDalBmaConnections()
- require('../../app/modules/router').duniter.methods.routeToNetwork(server);
+ require('../../app/modules/router').RouterDependency.duniter.methods.routeToNetwork(server);
}), Promise.resolve());
// Server 1
diff --git a/test/integration/peer-outdated.js b/test/integration/peer-outdated.js
index 3f2cb0e1f..1855c0431 100644
--- a/test/integration/peer-outdated.js
+++ b/test/integration/peer-outdated.js
@@ -42,7 +42,7 @@ describe("Peer document expiry", function() {
yield [s1, s2].reduce((p, server) => co(function*() {
yield p;
yield server.initDalBmaConnections()
- require('../../app/modules/router').duniter.methods.routeToNetwork(server);
+ require('../../app/modules/router').RouterDependency.duniter.methods.routeToNetwork(server);
}), Promise.resolve());
// Server 1
diff --git a/test/integration/peerings.js b/test/integration/peerings.js
index 4b227f631..5fc5d49bf 100644
--- a/test/integration/peerings.js
+++ b/test/integration/peerings.js
@@ -93,7 +93,7 @@ describe("Network", function() {
return bmaAPI.openConnections()
.then(() => {
server.bma = bmaAPI;
- require('../../app/modules/router').duniter.methods.routeToNetwork(server);
+ require('../../app/modules/router').RouterDependency.duniter.methods.routeToNetwork(server);
});
});
});
diff --git a/test/integration/peers-same-pubkey.js b/test/integration/peers-same-pubkey.js
index 41c4b9c19..6375127aa 100644
--- a/test/integration/peers-same-pubkey.js
+++ b/test/integration/peers-same-pubkey.js
@@ -36,7 +36,7 @@ describe("Peer document", function() {
yield [s1, s2, s3].reduce((p, server) => co(function*() {
yield p;
yield server.initDalBmaConnections()
- require('../../app/modules/router').duniter.methods.routeToNetwork(server);
+ require('../../app/modules/router').RouterDependency.duniter.methods.routeToNetwork(server);
}), Promise.resolve());
// Server 1
diff --git a/test/integration/start_generate_blocks.js b/test/integration/start_generate_blocks.js
index 3c79c4834..a8d813cb9 100644
--- a/test/integration/start_generate_blocks.js
+++ b/test/integration/start_generate_blocks.js
@@ -76,7 +76,7 @@ describe("Generation", function() {
yield server.initWithDAL();
server.bma = yield bma(server);
yield server.bma.openConnections();
- require('../../app/modules/router').duniter.methods.routeToNetwork(server);
+ require('../../app/modules/router').RouterDependency.duniter.methods.routeToNetwork(server);
yield server.PeeringService.generateSelfPeer(server.conf);
const prover = require('../../app/modules/prover').ProverDependency.duniter.methods.prover(server);
server.startBlockComputation = () => prover.startService();
diff --git a/test/integration/tools/toolbox.ts b/test/integration/tools/toolbox.ts
index ea81eb794..af71bd3ae 100644
--- a/test/integration/tools/toolbox.ts
+++ b/test/integration/tools/toolbox.ts
@@ -23,6 +23,7 @@ import {WS2PCluster} from "../../../app/modules/ws2p/lib/WS2PCluster"
import {WS2PServer} from "../../../app/modules/ws2p/lib/WS2PServer"
import {WS2PServerMessageHandler} from "../../../app/modules/ws2p/lib/interface/WS2PServerMessageHandler"
import {TestUser} from "./TestUser"
+import {RouterDependency} from "../../../app/modules/router"
const assert = require('assert');
const _ = require('underscore');
@@ -100,8 +101,8 @@ export const simpleNetworkOf2NodesAnd2Users = async (options:any) => {
await tac.join();
// Each server forwards to each other
- require('../../../app/modules/router').duniter.methods.routeToNetwork(s1);
- require('../../../app/modules/router').duniter.methods.routeToNetwork(s2);
+ RouterDependency.duniter.methods.routeToNetwork(s1._server)
+ RouterDependency.duniter.methods.routeToNetwork(s2._server)
return { s1, s2, cat, tac };
}
@@ -601,7 +602,7 @@ export class TestingServer {
const bmaAPI = await bma(this.server);
await bmaAPI.openConnections();
this.bma = bmaAPI;
- require('../../../app/modules/router').duniter.methods.routeToNetwork(this.server);
+ RouterDependency.duniter.methods.routeToNetwork(this.server)
// Extra: for /wot/requirements URL
require('../../../app/modules/prover').ProverDependency.duniter.methods.hookServer(this.server);
}
--
GitLab