Merge pull request #814 from shocknet/update-tests

v19 tests

.github/workflows/test.yaml

@@ -39,7 +39,7 @@ jobs:
         with:
           # npm cache files are stored in `~/.npm` on Linux/macOS
           path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('package-lock.json', '*/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-

package.json

@@ -5,9 +5,9 @@
   "main": "index.js",
   "scripts": {
     "clean": "rimraf build",
-    "test": "npm run clean && tsc  && node build/src/tests/testRunner.js",
+    "test": "npm run clean && tsc && export NODE_TLS_REJECT_UNAUTHORIZED='0' && node build/src/tests/testRunner.js",
     "start": "npm run clean && tsc && node build/src/index.js",
-    "start:ci": "git reset --hard && git pull && export NODE_TLS_REJECT_UNAUTHORIZED='0' && npm run start",
+    "start:ci": "git reset --hard && git pull && npm run start",
     "gen": "cd proto && rimraf autogenerated && export PATH=$PATH:~/Lightning.Pub/proto && protoc -I ./service --pub_out=. service/*",
     "build_autogenerated": "cd proto && rimraf autogenerated && protoc -I ./service --pub_out=. service/*",
     "build_lnd_client_1": "cd proto && protoc -I ./others --plugin=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=./lnd --ts_proto_opt=esModuleInterop=true others/* ",

src/services/lnd/lnd.ts

@@ -64,7 +64,11 @@ export default class {
             sslCreds,
             macaroonCreds,
         );
-        const transport = new GrpcTransport({ host: lndAddr, channelCredentials: creds })
+        const transport = new GrpcTransport({
+            host: lndAddr, channelCredentials: creds, clientOptions: {
+                //"grpc.ssl_target_name_override"
+            }
+        })
         this.lightning = new LightningClient(transport)
         this.invoices = new InvoicesClient(transport)
         this.router = new RouterClient(transport)

src/tests/.env.test

@@ -1,4 +1,4 @@
-LND_ADDRESS=127.0.0.1:10001 #alice
+LND_ADDRESS=localhost:10001 #alice
 LND_CERT_PATH=alice-tls.cert #alice
 LND_MACAROON_PATH=alice-admin.macaroon
 DATABASE_FILE=db.sqlite
@@ -23,18 +23,18 @@ WATCHDOG_MAX_DIFF_BPS=100
 WATCHDOG_MAX_DIFF_SATS=10000
 
 # dave <--> alice <--> carol <--> bob
-LND_OTHER_ADDR=127.0.0.1:10002
+LND_OTHER_ADDR=localhost:10002
 LND_OTHER_CERT_PATH=bob-tls.cert
 LND_OTHER_MACAROON_PATH=bob-admin.macaroon
 
-LND_THIRD_ADDR=127.0.0.1:10003
+LND_THIRD_ADDR=localhost:10003
 LND_THIRD_CERT_PATH=carol-tls.cert
 LND_THIRD_MACAROON_PATH=carol-admin.macaroon
 
-LND_FOURTH_ADDR=127.0.0.1:10004
+LND_FOURTH_ADDR=localhost:10004
 LND_FOURTH_CERT_PATH=dave-tls.cert
 LND_FOURTH_MACAROON_PATH=dave-admin.macaroon
 
 BITCOIN_CORE_PORT=18443
 BITCOIN_CORE_USER=polaruser
-BITCOIN_CORE_PASS=polarpass
+BITCOIN_CORE_PASS=polarpass

src/tests/docker-compose.yml

@@ -27,7 +27,7 @@ services:
       USERID: ${USERID:-1000}
       GROUPID: ${GROUPID:-1000}
     stop_grace_period: 2m
-    image: polarlightning/lnd:0.18.3-beta
+    image: polarlightning/lnd:0.19.0-beta
     container_name: polar-n2-alice
     hostname: alice
     command: >-
@@ -48,11 +48,11 @@ services:
       USERID: ${USERID:-1000}
       GROUPID: ${GROUPID:-1000}
     stop_grace_period: 2m
-    image: polarlightning/lnd:0.18.3-beta
+    image: polarlightning/lnd:0.19.0-beta
     container_name: polar-n2-bob
     hostname: bob
     command: >-
-      lnd --noseedbackup --trickledelay=5000 --alias=bob --externalip=bob --tlsextradomain=bob --tlsextradomain=polar-n2-bob --tlsextradomain=host.docker.internal --listen=0.0.0.0:9735 --rpclisten=0.0.0.0:10009 --restlisten=0.0.0.0:8080 --bitcoin.active --bitcoin.regtest --bitcoin.node=bitcoind --bitcoind.rpchost=polar-n2-backend1 --bitcoind.rpcuser=polaruser --bitcoind.rpcpass=polarpass --bitcoind.zmqpubrawblock=tcp://polar-n2-backend1:28334 --bitcoind.zmqpubrawtx=tcp://polar-n2-backend1:28335
+      lnd --noseedbackup --trickledelay=5000 --alias=bob --externalip=bob --externalip=127.0.0.1 --tlsextradomain=bob --tlsextradomain=polar-n2-bob --tlsextradomain=host.docker.internal --listen=0.0.0.0:9735 --rpclisten=0.0.0.0:10009 --restlisten=0.0.0.0:8080 --bitcoin.active --bitcoin.regtest --bitcoin.node=bitcoind --bitcoind.rpchost=polar-n2-backend1 --bitcoind.rpcuser=polaruser --bitcoind.rpcpass=polarpass --bitcoind.zmqpubrawblock=tcp://polar-n2-backend1:28334 --bitcoind.zmqpubrawtx=tcp://polar-n2-backend1:28335
     restart: always
     volumes:
       - ./volumes/lnd/bob:/home/lnd/.lnd
@@ -69,7 +69,7 @@ services:
       USERID: ${USERID:-1000}
       GROUPID: ${GROUPID:-1000}
     stop_grace_period: 2m
-    image: polarlightning/lnd:0.18.3-beta
+    image: polarlightning/lnd:0.19.0-beta
     container_name: polar-n2-carol
     hostname: carol
     command: >-
@@ -90,7 +90,7 @@ services:
       USERID: ${USERID:-1000}
       GROUPID: ${GROUPID:-1000}
     stop_grace_period: 2m
-    image: polarlightning/lnd:0.18.3-beta
+    image: polarlightning/lnd:0.19.0-beta
     container_name: polar-n2-dave
     hostname: dave
     command: >-