From db69720acc7e1dced29ad2b28f405a0c9376e517 Mon Sep 17 00:00:00 2001
From: Joost Jager <joost.jager@gmail.com>
Date: Tue, 16 Jun 2020 11:37:11 +0200
Subject: [PATCH] lndclient: extract basic connection

---
 lndclient/basic_client.go | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/lndclient/basic_client.go b/lndclient/basic_client.go
index f4f18c1..ad70c65 100644
--- a/lndclient/basic_client.go
+++ b/lndclient/basic_client.go
@@ -52,9 +52,29 @@ func (bc *basicClientOptions) applyBasicClientOptions(options ...BasicClientOpti
 // NewBasicClient creates a new basic gRPC client to lnd. We call this client
 // "basic" as it falls back to expected defaults if the arguments aren't
 // provided.
-func NewBasicClient(lndHost, tlsPath, macDir, network string, basicOptions ...BasicClientOption) (
+func NewBasicClient(lndHost, tlsPath, macDir, network string,
+	basicOptions ...BasicClientOption) (
+
 	lnrpc.LightningClient, error) {
 
+	conn, err := NewBasicConn(
+		lndHost, tlsPath, macDir, network, basicOptions...,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return lnrpc.NewLightningClient(conn), nil
+}
+
+// NewBasicConn creates a new basic gRPC connection to lnd. We call this
+// connection "basic" as it falls back to expected defaults if the arguments
+// aren't provided.
+func NewBasicConn(lndHost, tlsPath, macDir, network string,
+	basicOptions ...BasicClientOption) (
+
+	*grpc.ClientConn, error) {
+
 	if tlsPath == "" {
 		tlsPath = defaultTLSCertPath
 	}
@@ -112,5 +132,5 @@ func NewBasicClient(lndHost, tlsPath, macDir, network string, basicOptions ...Ba
 		return nil, fmt.Errorf("unable to connect to RPC server: %v", err)
 	}
 
-	return lnrpc.NewLightningClient(conn), nil
+	return conn, nil
 }