Commit 11a843f4 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

[enh] Refactoring: RouterDependency

parent f7c36eff

app/modules/router.ts

+2 −4
Original line number Diff line number Diff line
@@ -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()

index.ts

+2 −2
Original line number Diff line number Diff line
@@ -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 },

test/integration/network-update.js

+1 −1
Original line number Diff line number Diff line
@@ -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

test/integration/peer-outdated.js

+1 −1
Original line number Diff line number Diff line
@@ -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

test/integration/peerings.js

+1 −1
Original line number Diff line number Diff line
@@ -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);

                });

            });

        });