challenger: change NewLndChallenger client parameter

- Alters NewLndChallenger so that it takes challenger.InvoiceClient in
as a parameter. (This is useful in the case of using NewLndChallenger
in the lnd watchtower project, to avoid having to import lndclient,
which leads to an import cycle.)
- Also deletes the AuthConfig parameter. Since we now pass the LND
client directly into the function, the AuthConfig parameter is no
longer needed.

Author: orbitalturtle

aperture.go

@@ -23,6 +23,7 @@ import (
 	"github.com/lightninglabs/aperture/proxy"
 	"github.com/lightninglabs/aperture/secrets"
 	"github.com/lightninglabs/lightning-node-connect/hashmailrpc"
+	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/cert"
@@ -223,15 +224,17 @@ func (a *Aperture) Start(errChan chan error) error {
 	}
 
 	if !a.cfg.Authenticator.Disable {
-		challengerAuth := &challenger.AuthConfig{
-			LndHost: a.cfg.Authenticator.LndHost,
-			TLSPath: a.cfg.Authenticator.TLSPath,
-			MacDir:  a.cfg.Authenticator.MacDir,
-			Network: a.cfg.Authenticator.Network,
-			Disable: a.cfg.Authenticator.Disable,
+		client, err := lndclient.NewBasicClient(
+			a.cfg.Authenticator.LndHost, a.cfg.Authenticator.TLSPath,
+			a.cfg.Authenticator.MacDir, a.cfg.Authenticator.Network,
+			lndclient.MacFilename(challenger.InvoiceMacaroonName),
+		)
+		if err != nil {
+			return err
 		}
+
 		a.challenger, err = challenger.NewLndChallenger(
-			challengerAuth, genInvoiceReq, errChan,
+			genInvoiceReq, client, errChan,
 		)
 		if err != nil {
 			return err

challenger/challenger.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/lightninglabs/aperture/auth"
 	"github.com/lightninglabs/aperture/mint"
-	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"google.golang.org/grpc"
@@ -55,19 +54,6 @@ type LndChallenger struct {
 	wg   sync.WaitGroup
 }
 
-type AuthConfig struct {
-	// LndHost is the hostname of the LND instance to connect to.
-	LndHost string `long:"lndhost" description:"Hostname of the LND instance to connect to"`
-
-	TLSPath string `long:"tlspath" description:"Path to LND instance's tls certificate"`
-
-	MacDir string `long:"macdir" description:"Directory containing LND instance's macaroons"`
-
-	Network string `long:"network" description:"The network LND is connected to." choice:"regtest" choice:"simnet" choice:"testnet" choice:"mainnet"`
-
-	Disable bool `long:"disable" description:"Whether to disable LND auth."`
-}
-
 // A compile time flag to ensure the LndChallenger satisfies the
 // mint.Challenger and auth.InvoiceChecker interface.
 var _ mint.Challenger = (*LndChallenger)(nil)
@@ -81,21 +67,13 @@ const (
 
 // NewLndChallenger creates a new challenger that uses the given connection
 // details to connect to an lnd backend to create payment challenges.
-func NewLndChallenger(cfg *AuthConfig, genInvoiceReq InvoiceRequestGenerator,
-	errChan chan<- error) (*LndChallenger, error) {
+func NewLndChallenger(genInvoiceReq InvoiceRequestGenerator,
+	client InvoiceClient, errChan chan<- error) (*LndChallenger, error) {
 
 	if genInvoiceReq == nil {
 		return nil, fmt.Errorf("genInvoiceReq cannot be nil")
 	}
 
-	client, err := lndclient.NewBasicClient(
-		cfg.LndHost, cfg.TLSPath, cfg.MacDir, cfg.Network,
-		lndclient.MacFilename(InvoiceMacaroonName),
-	)
-	if err != nil {
-		return nil, err
-	}
-
 	invoicesMtx := &sync.Mutex{}
 	return &LndChallenger{
 		client:        client,