Skip to content

Commit 2d7745e

Browse files
committed
loopd/daemon: rename createDefaultMacaroonFile
Rename createDefaultMacaroonFile to withMacaroonService since this is now a more appropriate name.
1 parent ad7cdc8 commit 2d7745e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

loopd/daemon.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func (d *Daemon) Start() error {
163163
// for REST (if enabled), instead of creating an own mux and HTTP server, we
164164
// register to an existing one.
165165
func (d *Daemon) StartAsSubserver(lndGrpc *lndclient.GrpcLndServices,
166-
createDefaultMacaroonFile bool) error {
166+
withMacaroonService bool) error {
167167

168168
// There should be no reason to start the daemon twice. Therefore return
169169
// an error if that's tried. This is mostly to guard against Start and
@@ -180,7 +180,7 @@ func (d *Daemon) StartAsSubserver(lndGrpc *lndclient.GrpcLndServices,
180180
// the swap server client, the RPC server instance and our main swap
181181
// handlers. If this fails, then nothing has been started yet and we can
182182
// just return the error.
183-
err := d.initialize(createDefaultMacaroonFile)
183+
err := d.initialize(withMacaroonService)
184184
if errors.Is(err, bbolt.ErrTimeout) {
185185
// We're trying to be started inside LiT so there most likely is
186186
// another standalone Loop process blocking the DB.
@@ -347,7 +347,7 @@ func (d *Daemon) startWebServers() error {
347347
// the swap client RPC server instance and our main swap and error handlers. If
348348
// this method fails with an error then no goroutine was started yet and no
349349
// cleanup is necessary. If it succeeds, then goroutines have been spawned.
350-
func (d *Daemon) initialize(createDefaultMacaroonFile bool) error {
350+
func (d *Daemon) initialize(withMacaroonService bool) error {
351351
// If no swap server is specified, use the default addresses for mainnet
352352
// and testnet.
353353
if d.cfg.Server.Host == "" {
@@ -382,7 +382,7 @@ func (d *Daemon) initialize(createDefaultMacaroonFile bool) error {
382382
RequiredPermissions[endpoint] = perm
383383
}
384384

385-
if createDefaultMacaroonFile {
385+
if withMacaroonService {
386386
// Start the macaroon service and let it create its default
387387
// macaroon in case it doesn't exist yet.
388388
d.macaroonService, err = lndclient.NewMacaroonService(

0 commit comments

Comments
 (0)