From 53d0d8432e99fb22773c58a87e7efe596eba6fbe Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Tue, 2 May 2023 11:43:52 +0200
Subject: [PATCH] subservers+terminal: move overwriting agent name

---
 subservers/loop.go | 5 +++++
 subservers/pool.go | 4 ++++
 terminal.go        | 8 --------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/subservers/loop.go b/subservers/loop.go
index 9eab767c..77a9440e 100644
--- a/subservers/loop.go
+++ b/subservers/loop.go
@@ -5,6 +5,7 @@ import (
 
 	restProxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/lightninglabs/lndclient"
+	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/loopd"
 	"github.com/lightninglabs/loop/looprpc"
 	"github.com/lightningnetwork/lnd/lnrpc"
@@ -27,6 +28,10 @@ var _ SubServer = (*loopSubServer)(nil)
 func NewLoopSubServer(cfg *loopd.Config, remoteCfg *RemoteDaemonConfig,
 	remote bool) SubServer {
 
+	// Overwrite the loop daemon's user agent name, so it sends "litd"
+	// instead of "loopd".
+	loop.AgentName = "litd"
+
 	return &loopSubServer{
 		Daemon:    loopd.New(cfg, nil),
 		cfg:       cfg,
diff --git a/subservers/pool.go b/subservers/pool.go
index f98c0b99..6433139f 100644
--- a/subservers/pool.go
+++ b/subservers/pool.go
@@ -27,6 +27,10 @@ var _ SubServer = (*poolSubServer)(nil)
 func NewPoolSubServer(cfg *pool.Config, remoteCfg *RemoteDaemonConfig,
 	remote bool) SubServer {
 
+	// Overwrite the pool daemon's user agent name, so it sends "litd"
+	// instead of and "poold".
+	pool.SetAgentName("litd")
+
 	return &poolSubServer{
 		Server:    pool.NewServer(cfg),
 		cfg:       cfg,
diff --git a/terminal.go b/terminal.go
index 0225b0ab..37eea4ac 100644
--- a/terminal.go
+++ b/terminal.go
@@ -31,8 +31,6 @@ import (
 	"github.com/lightninglabs/lightning-terminal/session"
 	"github.com/lightninglabs/lightning-terminal/subservers"
 	"github.com/lightninglabs/lndclient"
-	"github.com/lightninglabs/loop"
-	"github.com/lightninglabs/pool"
 	"github.com/lightningnetwork/lnd"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/chainreg"
@@ -1413,16 +1411,10 @@ func (g *LightningTerminal) initSubServers() {
 		g.cfg.faradayRemote,
 	))
 
-	// Overwrite the loop daemon's user agent name so it sends "litd"
-	// instead of "loopd".
-	loop.AgentName = "litd"
 	g.subServerMgr.AddServer(subservers.NewLoopSubServer(
 		g.cfg.Loop, g.cfg.Remote.Loop, g.cfg.loopRemote,
 	))
 
-	// Overwrite the pool daemon's user agent name so it sends "litd"
-	// instead of and "poold".
-	pool.SetAgentName("litd")
 	g.subServerMgr.AddServer(subservers.NewPoolSubServer(
 		g.cfg.Pool, g.cfg.Remote.Pool, g.cfg.poolRemote,
 	))