@@ -11,7 +11,6 @@ import (
11
11
"net"
12
12
"net/http"
13
13
"os"
14
- "path"
15
14
"path/filepath"
16
15
"regexp"
17
16
"strings"
@@ -216,7 +215,7 @@ func (g *LightningTerminal) Run() error {
216
215
)
217
216
g .sessionRpcServer , err = newSessionRPCServer (& sessionRpcServerConfig {
218
217
basicAuth : g .rpcProxy .basicAuth ,
219
- dbDir : path .Join (g .cfg .LitDir , g .cfg .Network ),
218
+ dbDir : filepath .Join (g .cfg .LitDir , g .cfg .Network ),
220
219
grpcOptions : []grpc.ServerOption {
221
220
grpc .CustomCodec (grpcProxy .Codec ()), // nolint: staticcheck,
222
221
grpc .ChainStreamInterceptor (
@@ -424,7 +423,7 @@ func (g *LightningTerminal) startSubservers() error {
424
423
hex .EncodeToString (macData ),
425
424
))
426
425
clientOptions = append (
427
- clientOptions , lndclient .MacFilename (path .Base (macPath )),
426
+ clientOptions , lndclient .MacFilename (filepath .Base (macPath )),
428
427
)
429
428
430
429
// If we're in integrated mode, we can retrieve the macaroon string
@@ -447,7 +446,7 @@ func (g *LightningTerminal) startSubservers() error {
447
446
// subservers have the same requirements.
448
447
var err error
449
448
g .basicClient , err = lndclient .NewBasicClient (
450
- host , tlsPath , path .Dir (macPath ), string (network ),
449
+ host , tlsPath , filepath .Dir (macPath ), string (network ),
451
450
clientOptions ... ,
452
451
)
453
452
return err
@@ -571,7 +570,7 @@ func (g *LightningTerminal) startSubservers() error {
571
570
572
571
g .macaroonService , err = lndclient .NewMacaroonService (
573
572
& lndclient.MacaroonServiceConfig {
574
- DBPath : path .Join (g .cfg .LitDir , g .cfg .Network ),
573
+ DBPath : filepath .Join (g .cfg .LitDir , g .cfg .Network ),
575
574
MacaroonLocation : "litd" ,
576
575
StatelessInit : ! createDefaultMacaroons ,
577
576
RequiredPerms : litPermissions ,
@@ -1352,8 +1351,8 @@ func (g *LightningTerminal) showStartupInfo() error {
1352
1351
// alias. But the wallet might be locked.
1353
1352
host , network , tlsPath , macPath , _ := g .cfg .lndConnectParams ()
1354
1353
basicClient , err := lndclient .NewBasicClient (
1355
- host , tlsPath , path .Dir (macPath ), string (network ),
1356
- lndclient .MacFilename (path .Base (macPath )),
1354
+ host , tlsPath , filepath .Dir (macPath ), string (network ),
1355
+ lndclient .MacFilename (filepath .Base (macPath )),
1357
1356
)
1358
1357
if err != nil {
1359
1358
return fmt .Errorf ("error querying remote node: %v" , err )
0 commit comments