Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ services:
command:
- '--noseedbackup'
- '--alias=lnd'
- '--externalip=127.0.0.1'
- '--externalip=${LND_EXTERNAL_IP:-127.0.0.1}'
- '--bitcoin.active'
- '--bitcoin.regtest'
- '--bitcoin.node=bitcoind'
Expand Down Expand Up @@ -147,7 +147,7 @@ services:
environment:
- NODE_ENV=production
- PORT=3000
- DOMAIN=http://localhost:${LNURL_SERVER_PORT:-30001}
- DOMAIN=${LNURL_DOMAIN:-http://localhost:${LNURL_SERVER_PORT:-30001}}
- DATABASE_URL=sqlite:///data/lnurl.db
- BITCOIN_RPC_HOST=bitcoind
- BITCOIN_RPC_PORT=43782
Expand Down
14 changes: 9 additions & 5 deletions test/helpers/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,14 @@ export type LndConfig = {
macaroonPath: string;
};

export const lndHost = process.env.LND_HOST ?? 'localhost';

export const lndConfig: LndConfig = {
server: 'localhost:10009',
restHost: 'localhost',
restPort: 8080,
tls: `${__dirname}/../../docker/lnd/tls.cert`,
macaroonPath: `${__dirname}/../../docker/lnd/data/chain/bitcoin/regtest/admin.macaroon`,
server: `${lndHost}:${process.env.LND_GRPC_PORT ?? '10009'}`,
restHost: lndHost,
restPort: Number.parseInt(process.env.LND_REST_PORT ?? '8080', 10),
tls: process.env.LND_TLS_PATH ?? `${__dirname}/../../docker/lnd/tls.cert`,
macaroonPath:
process.env.LND_MACAROON_PATH ??
`${__dirname}/../../docker/lnd/data/chain/bitcoin/regtest/admin.macaroon`,
};
6 changes: 3 additions & 3 deletions test/helpers/lnd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
tap,
typeText,
} from './actions';
import { LndConfig } from './constants';
import { LndConfig, lndHost } from './constants';
import { openSettings } from './navigation';
import createLndRpc, { LnRpc, WalletUnlockerRpc } from '@radar/lnrpc';

Expand Down Expand Up @@ -112,8 +112,8 @@ export async function connectToLND(lndNodeID: string, { navigationClose = true }
await tap('NavigationAction');
await tap('FundManual');
await typeText('NodeIdInput', lndNodeID);
await typeText('PortInput', '9735');
await typeText('HostInput', '0.0.0.0');
await typeText('PortInput', process.env.LND_P2P_PORT ?? '9735');
await typeText('HostInput', lndHost === 'localhost' ? '0.0.0.0' : lndHost);
await confirmInputOnKeyboard();
await tap('ExternalContinue');
await sleep(1000);
Expand Down
7 changes: 7 additions & 0 deletions wdio.conf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,13 @@ export const config: WebdriverIO.Config = {
'appium:app': iosApp,
'appium:autoGrantPermissions': true,
'appium:autoAcceptAlerts': false,
...(process.env.E2E_LOCAL_HOST
? {
'appium:processArguments': {
env: { E2E_LOCAL_HOST: process.env.E2E_LOCAL_HOST },
},
}
: {}),
// 'appium:fullReset': true,
'appium:noReset': false,

Expand Down