RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #563 from tuxcanfly/fix-config-file

Browse Source 
multi: pass new Node option `file` to wallet plugin
This commit is contained in:
Javed Khan 2018-08-13 17:50:39 +05:30 committed by GitHub
commit b3fd9656f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/node
View File

@ -22,7 +22,7 @@ if (process.argv.indexOf('--version') !== -1
const FullNode = require('../lib/node/fullnode'); const FullNode = require('../lib/node/fullnode');
const node = new FullNode({ const node = new FullNode({
config: true, file: true,
argv: true, argv: true,
env: true, env: true,
logFile: true, logFile: true,

2
bin/wallet
View File

@ -22,7 +22,7 @@ if (process.argv.indexOf('--version') !== -1
const Node = require('../lib/wallet/node'); const Node = require('../lib/wallet/node');
const node = new Node({ const node = new Node({
config: true, file: true,
argv: true, argv: true,
env: true, env: true,
logFile: true, logFile: true,

2
lib/node/node.js
View File

@ -43,7 +43,7 @@ class Node extends EventEmitter {
this.config.inject(options); this.config.inject(options);
this.config.load(options); this.config.load(options);
if (options.config) if (options.file || options.config)
this.config.open(config); this.config.open(config);
this.network = Network.get(this.config.getSuffix()); this.network = Network.get(this.config.getSuffix());

4
lib/wallet/plugin.js
View File

@ -34,7 +34,9 @@ class Plugin extends EventEmitter {
super(); super();
this.config = node.config.filter('wallet'); this.config = node.config.filter('wallet');
this.config.open('wallet.conf');
if (node.config.options.file)
this.config.open('wallet.conf');
this.network = node.network; this.network = node.network;
this.logger = node.logger; this.logger = node.logger;