From 71b304cafdea6f21f7464123dee2ba0c423f05d0 Mon Sep 17 00:00:00 2001 From: softsimon Date: Wed, 6 Jul 2022 13:55:21 +0200 Subject: [PATCH] Renaming config LND_NODE_AUTH to LND --- backend/mempool-config.sample.json | 2 +- backend/src/api/lightning/lnd/lnd-api.ts | 6 +++--- backend/src/config.ts | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/mempool-config.sample.json b/backend/mempool-config.sample.json index 9fe8ca36a..eea54ae46 100644 --- a/backend/mempool-config.sample.json +++ b/backend/mempool-config.sample.json @@ -70,7 +70,7 @@ "ENABLED": false, "BACKEND": "lnd" }, - "LND_NODE_AUTH": { + "LND": { "TLS_CERT_PATH": "tls.cert", "MACAROON_PATH": "admin.macaroon", "SOCKET": "localhost:10009" diff --git a/backend/src/api/lightning/lnd/lnd-api.ts b/backend/src/api/lightning/lnd/lnd-api.ts index 87c182a42..7d4e8c96e 100644 --- a/backend/src/api/lightning/lnd/lnd-api.ts +++ b/backend/src/api/lightning/lnd/lnd-api.ts @@ -12,13 +12,13 @@ class LndApi implements AbstractLightningApi { return; } try { - const tls = fs.readFileSync(config.LND_NODE_AUTH.TLS_CERT_PATH).toString('base64'); - const macaroon = fs.readFileSync(config.LND_NODE_AUTH.MACAROON_PATH).toString('base64'); + const tls = fs.readFileSync(config.LND.TLS_CERT_PATH).toString('base64'); + const macaroon = fs.readFileSync(config.LND.MACAROON_PATH).toString('base64'); const { lnd } = lnService.authenticatedLndGrpc({ cert: tls, macaroon: macaroon, - socket: config.LND_NODE_AUTH.SOCKET, + socket: config.LND.SOCKET, }); this.lnd = lnd; diff --git a/backend/src/config.ts b/backend/src/config.ts index acc0b30a0..c9ec65e76 100644 --- a/backend/src/config.ts +++ b/backend/src/config.ts @@ -31,7 +31,7 @@ interface IConfig { ENABLED: boolean; BACKEND: 'lnd' | 'cln' | 'ldk'; }; - LND_NODE_AUTH: { + LND: { TLS_CERT_PATH: string; MACAROON_PATH: string; SOCKET: string; @@ -171,7 +171,7 @@ const defaults: IConfig = { 'ENABLED': false, 'BACKEND': 'lnd' }, - 'LND_NODE_AUTH': { + 'LND': { 'TLS_CERT_PATH': '', 'MACAROON_PATH': '', 'SOCKET': 'localhost:10009', @@ -209,7 +209,7 @@ class Config implements IConfig { STATISTICS: IConfig['STATISTICS']; BISQ: IConfig['BISQ']; LIGHTNING: IConfig['LIGHTNING']; - LND_NODE_AUTH: IConfig['LND_NODE_AUTH']; + LND: IConfig['LND']; SOCKS5PROXY: IConfig['SOCKS5PROXY']; PRICE_DATA_SERVER: IConfig['PRICE_DATA_SERVER']; EXTERNAL_DATA_SERVER: IConfig['EXTERNAL_DATA_SERVER']; @@ -226,7 +226,7 @@ class Config implements IConfig { this.STATISTICS = configs.STATISTICS; this.BISQ = configs.BISQ; this.LIGHTNING = configs.LIGHTNING; - this.LND_NODE_AUTH = configs.LND_NODE_AUTH; + this.LND = configs.LND; this.SOCKS5PROXY = configs.SOCKS5PROXY; this.PRICE_DATA_SERVER = configs.PRICE_DATA_SERVER; this.EXTERNAL_DATA_SERVER = configs.EXTERNAL_DATA_SERVER;