lit: change the signature of bakeSuperMac to take an LND client

So that we have control over which LND client the rpcProxy should use
for various calls.

Author: ellemouton

rpc_proxy.go

@@ -189,7 +189,8 @@ type rpcProxy struct {
 }
 
 // bakeSuperMac can be used to bake a new super macaroon.
-type bakeSuperMac func(ctx context.Context, rootKeyID uint32) (string, error)
+type bakeSuperMac func(ctx context.Context, lndClient lnrpc.LightningClient,
+	rootKeyID uint32) (string, error)
 
 // Start creates initial connection to lnd.
 func (p *rpcProxy) Start(lndConn *grpc.ClientConn,
@@ -259,7 +260,7 @@ func (p *rpcProxy) BakeSuperMacaroon(ctx context.Context,
 		return nil, ErrWaitingToStart
 	}
 
-	superMac, err := p.bakeSuperMac(ctx, req.RootKeyIdSuffix)
+	superMac, err := p.bakeSuperMac(ctx, p.basicClient, req.RootKeyIdSuffix)
 	if err != nil {
 		return nil, err
 	}

terminal.go

@@ -579,16 +579,17 @@ func (g *LightningTerminal) start() error {
 
 	// bakeSuperMac is a closure that can be used to bake a new super
 	// macaroon that contains all active permissions.
-	bakeSuperMac := func(ctx context.Context, rootKeyIDSuffix uint32) (
-		string, error) {
+	bakeSuperMac := func(ctx context.Context,
+		lndClient lnrpc.LightningClient,
+		rootKeyIDSuffix uint32) (string, error) {
 
 		var suffixBytes [4]byte
 		binary.BigEndian.PutUint32(suffixBytes[:], rootKeyIDSuffix)
 
 		rootKeyID := session.NewSuperMacaroonRootKeyID(suffixBytes)
 
 		return BakeSuperMacaroon(
-			ctx, g.basicClient, rootKeyID,
+			ctx, lndClient, rootKeyID,
 			g.permsMgr.ActivePermissions(false), nil,
 		)
 	}