Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Commit fe57bbf

Browse files
Remove macaroon-related parameters across codebase since they should always be enabled.
1 parent eef45c5 commit fe57bbf

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

public/electron.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const { startLndProcess, startBtcdProcess } = require('./lnd-child-process');
99
const grcpClient = require('./grpc-client');
1010
const {
1111
PREFIX_NAME,
12-
MACAROONS_ENABLED,
1312
LND_PORT,
1413
LND_PEER_PORT,
1514
LND_INIT_DELAY,
@@ -123,7 +122,6 @@ function createWindow() {
123122
ipcMain,
124123
lndSettingsDir,
125124
lndPort: LND_PORT,
126-
macaroonsEnabled: MACAROONS_ENABLED,
127125
});
128126
}
129127

@@ -138,7 +136,6 @@ const startLnd = async () => {
138136
lndProcess = await startLndProcess({
139137
isDev,
140138
lndSettingsDir,
141-
macaroonsEnabled: MACAROONS_ENABLED,
142139
lndPort: LND_PORT,
143140
lndPeerPort: LND_PEER_PORT,
144141
logger: Logger,

public/lnd-child-process.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ function startBlockingProcess(name, args, logger) {
4747

4848
module.exports.startLndProcess = async function({
4949
isDev,
50-
macaroonsEnabled,
5150
lndSettingsDir,
5251
lndPort,
5352
lndPeerPort,
@@ -61,7 +60,6 @@ module.exports.startLndProcess = async function({
6160
'--bitcoin.active',
6261
'--debuglevel=info',
6362
`--lnddir=${lndSettingsDir}`,
64-
macaroonsEnabled ? '' : '--no-macaroons',
6563
lndPort ? `--rpclisten=localhost:${lndPort}` : '',
6664
lndPeerPort ? `--listen=localhost:${lndPeerPort}` : '',
6765
lndRestPort ? `--restlisten=localhost:${lndRestPort}` : '',

src/config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ module.exports.RATE_DELAY = 15 * 60 * 1000;
99

1010
module.exports.LND_PORT = 10009;
1111
module.exports.LND_PEER_PORT = 10019;
12-
module.exports.MACAROONS_ENABLED = false;
1312
module.exports.BTCD_MINING_ADDRESS = 'rfu4i1Mo2NF7TQsN9bMVLFSojSzcyQCEH5';
1413

1514
const prefixName = 'lightning';

0 commit comments

Comments
 (0)