diff --git a/app/lib/dal/fileDAL.ts b/app/lib/dal/fileDAL.ts index a8d4208dd8c6269304d1ce9761aabf84bfe78d91..883e3318a68c0e94eab4225115d301234b4a3c55 100644 --- a/app/lib/dal/fileDAL.ts +++ b/app/lib/dal/fileDAL.ts @@ -22,7 +22,6 @@ const _ = require('underscore'); const common = require('duniter-common'); const indexer = require('../indexer').Indexer const logger = require('../logger').NewLogger('filedal'); -const Configuration = require('../entity/configuration'); const Transaction = require('../entity/transaction'); const constants = require('../constants'); @@ -815,7 +814,7 @@ export class FileDAL { } async loadConf(overrideConf:ConfDTO, defaultConf = false) { - let conf = Configuration.statics.complete(overrideConf || {}); + let conf = ConfDTO.complete(overrideConf || {}); if (!defaultConf) { const savedConf = await this.confDAL.loadConf(); conf = _(savedConf).extend(overrideConf || {}); diff --git a/app/lib/dal/fileDALs/ConfDAL.ts b/app/lib/dal/fileDALs/ConfDAL.ts index 4ae01250212b0ab82bde948f36c70ac9ad3ab398..494f86de4b4a73d473da4088de90d31ab0e9cfd1 100644 --- a/app/lib/dal/fileDALs/ConfDAL.ts +++ b/app/lib/dal/fileDALs/ConfDAL.ts @@ -1,8 +1,6 @@ -import {CFSCore} from "./CFSCore"; -import {AbstractCFS} from "./AbstractCFS"; -import {ConfDTO} from "../../dto/ConfDTO"; +import {AbstractCFS} from "./AbstractCFS" +import {ConfDTO} from "../../dto/ConfDTO" -const Configuration = require('../../entity/configuration'); const _ = require('underscore'); export class ConfDAL extends AbstractCFS { @@ -48,7 +46,7 @@ export class ConfDAL extends AbstractCFS { async loadConf() { const data = await this.coreFS.readJSON('conf.json'); if (data) { - return _(Configuration.statics.defaultConf()).extend(data); + return _(ConfDTO.defaultConf()).extend(data); } else { // Silent error this.logger.warn('No configuration loaded'); diff --git a/app/lib/dto/ConfDTO.ts b/app/lib/dto/ConfDTO.ts index 9b88165faa591cde17fa3ca50b8d77051fe03713..37ee8e5c86afabd40f3353e5fb5c020717c20c3d 100644 --- a/app/lib/dto/ConfDTO.ts +++ b/app/lib/dto/ConfDTO.ts @@ -1,3 +1,6 @@ +const _ = require('underscore'); +const constants = require('../constants'); + export interface Keypair { pub: string sec: string @@ -82,4 +85,37 @@ export class ConfDTO implements CurrencyConfDTO { static mock() { return new ConfDTO("", "", [], [], 0, 0, 0.6, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false, 0, false, 0, 0, 0, 0, 0, { pub:'', sec:'' }, 0, "", "", "", 0, "", "", "", true) } + + static defaultConf() { + return { + "currency": null, + "endpoints": [], + "rmEndpoints": [], + "upInterval": 3600 * 1000, + "c": constants.CONTRACT.DEFAULT.C, + "dt": constants.CONTRACT.DEFAULT.DT, + "dtReeval": constants.CONTRACT.DEFAULT.DT_REEVAL, + "ud0": constants.CONTRACT.DEFAULT.UD0, + "stepMax": constants.CONTRACT.DEFAULT.STEPMAX, + "sigPeriod": constants.CONTRACT.DEFAULT.SIGPERIOD, + "sigValidity": constants.CONTRACT.DEFAULT.SIGVALIDITY, + "msValidity": constants.CONTRACT.DEFAULT.MSVALIDITY, + "sigQty": constants.CONTRACT.DEFAULT.SIGQTY, + "xpercent": constants.CONTRACT.DEFAULT.X_PERCENT, + "percentRot": constants.CONTRACT.DEFAULT.PERCENTROT, + "powDelay": constants.CONTRACT.DEFAULT.POWDELAY, + "avgGenTime": constants.CONTRACT.DEFAULT.AVGGENTIME, + "dtDiffEval": constants.CONTRACT.DEFAULT.DTDIFFEVAL, + "medianTimeBlocks": constants.CONTRACT.DEFAULT.MEDIANTIMEBLOCKS, + "httplogs": false, + "udid2": false, + "timeout": 3000, + "isolate": false, + "forksize": constants.BRANCHES.DEFAULT_WINDOW_SIZE + }; + } + + static complete(conf:any) { + return _(ConfDTO.defaultConf()).extend(conf); + } } \ No newline at end of file diff --git a/app/lib/entity/configuration.js b/app/lib/entity/configuration.js deleted file mode 100644 index e2793622e9d98b7bd73f98a4479863de244c6855..0000000000000000000000000000000000000000 --- a/app/lib/entity/configuration.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; -const _ = require('underscore'); -const constants = require('../constants'); - -const defaultConf = function() { - return { - "currency": null, - "endpoints": [], - "rmEndpoints": [], - "upInterval": 3600 * 1000, - "c": constants.CONTRACT.DEFAULT.C, - "dt": constants.CONTRACT.DEFAULT.DT, - "dtReeval": constants.CONTRACT.DEFAULT.DT_REEVAL, - "ud0": constants.CONTRACT.DEFAULT.UD0, - "stepMax": constants.CONTRACT.DEFAULT.STEPMAX, - "sigPeriod": constants.CONTRACT.DEFAULT.SIGPERIOD, - "sigValidity": constants.CONTRACT.DEFAULT.SIGVALIDITY, - "msValidity": constants.CONTRACT.DEFAULT.MSVALIDITY, - "sigQty": constants.CONTRACT.DEFAULT.SIGQTY, - "xpercent": constants.CONTRACT.DEFAULT.X_PERCENT, - "percentRot": constants.CONTRACT.DEFAULT.PERCENTROT, - "powDelay": constants.CONTRACT.DEFAULT.POWDELAY, - "avgGenTime": constants.CONTRACT.DEFAULT.AVGGENTIME, - "dtDiffEval": constants.CONTRACT.DEFAULT.DTDIFFEVAL, - "medianTimeBlocks": constants.CONTRACT.DEFAULT.MEDIANTIMEBLOCKS, - "httplogs": false, - "udid2": false, - "timeout": 3000, - "isolate": false, - "forksize": constants.BRANCHES.DEFAULT_WINDOW_SIZE - }; -}; - -const Configuration = function(json) { - - _(this).extend(defaultConf); - _(this).extend(json); -}; - -Configuration.statics = {}; - -Configuration.statics.defaultConf = function () { - return defaultConf(); -}; - -Configuration.statics.complete = function (conf) { - return _(defaultConf()).extend(conf); -}; - -module.exports = Configuration; diff --git a/test/integration/tools/node.js b/test/integration/tools/node.js index b5823cfca8146f44d318c8360a43e02245a2cc81..2ae154985c77842ff103be57c5c6da5d691052fe 100644 --- a/test/integration/tools/node.js +++ b/test/integration/tools/node.js @@ -6,7 +6,7 @@ var request = require('request'); var contacter = require('duniter-crawler').duniter.methods.contacter; var duniter = require('../../../index'); var multicaster = require('../../../app/lib/streams/multicaster'); -var Configuration = require('../../../app/lib/entity/configuration'); +var ConfDTO = require('../../../app/lib/dto/ConfDTO').ConfDTO var Peer = require('../../../app/lib/entity/peer'); var user = require('./user'); var http = require('./http'); @@ -161,7 +161,7 @@ function Node (dbName, options) { options.remoteipv4 = options.remoteipv4 || null; options.remoteipv6 = options.remoteipv6 || null; options.remoteport = options.remoteport || 10901; - const overConf = Configuration.statics.complete(options); + const overConf = ConfDTO.complete(options); _.extend(conf, overConf); }) },