Get rid of global var

rkfg · Jan 14, 2023 · 0015103 · 0015103
1 parent ff679c9
commit 0015103
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/channels.go b/channels.go
@@ -64,7 +64,7 @@ func (r *regolancer) getChannelCandidates(fromPerc, toPerc, amount int64) error
 
 	for _, c := range r.channels {
 
-		if params.ExcludeChannelAge != 0 && uint64(info.BlockHeight)-getChannelAge(c.ChanId) < params.ExcludeChannelAge {
+		if params.ExcludeChannelAge != 0 && uint64(r.blockHeight)-getChannelAge(c.ChanId) < params.ExcludeChannelAge {
 			continue
 		}
 

diff --git a/main.go b/main.go
@@ -69,7 +69,6 @@ type configParams struct {
 }
 
 var params, cfgParams configParams
-var info *lnrpc.GetInfoResponse
 
 type failedRoute struct {
 	channelPair [2]*lnrpc.Channel
@@ -85,6 +84,7 @@ type regolancer struct {
 	lnClient      lnrpc.LightningClient
 	routerClient  routerrpc.RouterClient
 	myPK          string
+	blockHeight   uint32
 	channels      []*lnrpc.Channel
 	fromChannels  []*lnrpc.Channel
 	fromChannelId map[uint64]struct{}
@@ -318,11 +318,12 @@ func main() {
 	defer mainCtxCancel()
 	infoCtx, infoCtxCancel := context.WithTimeout(mainCtx, time.Second*time.Duration(params.TimeoutInfo))
 	defer infoCtxCancel()
-	info, err = r.lnClient.GetInfo(infoCtx, &lnrpc.GetInfoRequest{})
+	info, err := r.lnClient.GetInfo(infoCtx, &lnrpc.GetInfoRequest{})
 	if err != nil {
 		log.Fatal(err)
 	}
 	r.myPK = info.IdentityPubkey
+	r.blockHeight = info.BlockHeight
 	err = r.getChannels(infoCtx)
 	if err != nil {
 		log.Fatal("Error listing own channels: ", err)