cmd/litcli: refactor client conn

As a preparation to add more litd specific RPCs, we refactor the client
connection to use the generic interface instead of a specific type.

Author: guggero

cmd/litcli/main.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 
 	terminal "github.com/lightninglabs/lightning-terminal"
-	"github.com/lightninglabs/lightning-terminal/litrpc"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/protobuf-hex-display/jsonpb"
 	"github.com/lightninglabs/protobuf-hex-display/proto"
@@ -97,7 +96,7 @@ func fatal(err error) {
 	os.Exit(1)
 }
 
-func getClient(ctx *cli.Context) (litrpc.SessionsClient, func(), error) {
+func connectClient(ctx *cli.Context) (grpc.ClientConnInterface, func(), error) {
 	rpcServer := ctx.GlobalString("rpcserver")
 	tlsCertPath, macPath, err := extractPathArgs(ctx)
 	if err != nil {
@@ -109,8 +108,7 @@ func getClient(ctx *cli.Context) (litrpc.SessionsClient, func(), error) {
 	}
 	cleanup := func() { _ = conn.Close() }
 
-	sessionsClient := litrpc.NewSessionsClient(conn)
-	return sessionsClient, cleanup, nil
+	return conn, cleanup, nil
 }
 
 func getClientConn(address, tlsCertPath, macaroonPath string) (*grpc.ClientConn,

cmd/litcli/sessions.go

@@ -69,11 +69,12 @@ var addSessionCommand = cli.Command{
 }
 
 func addSession(ctx *cli.Context) error {
-	client, cleanup, err := getClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx)
 	if err != nil {
 		return err
 	}
 	defer cleanup()
+	client := litrpc.NewSessionsClient(clientConn)
 
 	label := ctx.String("label")
 	if label == "" {
@@ -192,11 +193,12 @@ var sessionStateMap = map[litrpc.SessionState]sessionFilter{
 
 func listSessions(filter sessionFilter) func(ctx *cli.Context) error {
 	return func(ctx *cli.Context) error {
-		client, cleanup, err := getClient(ctx)
+		clientConn, cleanup, err := connectClient(ctx)
 		if err != nil {
 			return err
 		}
 		defer cleanup()
+		client := litrpc.NewSessionsClient(clientConn)
 
 		ctxb := context.Background()
 		resp, err := client.ListSessions(
@@ -240,11 +242,12 @@ var revokeSessionCommand = cli.Command{
 }
 
 func revokeSession(ctx *cli.Context) error {
-	client, cleanup, err := getClient(ctx)
+	clientConn, cleanup, err := connectClient(ctx)
 	if err != nil {
 		return err
 	}
 	defer cleanup()
+	client := litrpc.NewSessionsClient(clientConn)
 
 	pubkey, err := hex.DecodeString(ctx.String("localpubkey"))
 	if err != nil {