• Home
  • Features
  • Pricing
  • Docs
  • Announcements
  • Sign In

lightningnetwork / lnd / 13536249039

26 Feb 2025 03:42AM UTC coverage: 57.462% (-1.4%) from 58.835%
13536249039

Pull #8453

github

Roasbeef
peer: update chooseDeliveryScript to gen script if needed

In this commit, we update `chooseDeliveryScript` to generate a new
script if needed. This allows us to fold in a few other lines that
always followed this function into this expanded function.

The tests have been updated accordingly.
Pull Request #8453: [4/4] - multi: integrate new rbf coop close FSM into the existing peer flow

275 of 1318 new or added lines in 22 files covered. (20.86%)

19521 existing lines in 257 files now uncovered.

103858 of 180741 relevant lines covered (57.46%)

24750.23 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

6.4
/log.go
1
package lnd
2

3
import (
4
        "github.com/btcsuite/btcd/connmgr"
5
        "github.com/btcsuite/btcd/rpcclient"
6
        btclogv1 "github.com/btcsuite/btclog"
7
        "github.com/btcsuite/btclog/v2"
8
        "github.com/lightninglabs/neutrino"
9
        sphinx "github.com/lightningnetwork/lightning-onion"
10
        "github.com/lightningnetwork/lnd/autopilot"
11
        "github.com/lightningnetwork/lnd/build"
12
        "github.com/lightningnetwork/lnd/chainio"
13
        "github.com/lightningnetwork/lnd/chainntnfs"
14
        "github.com/lightningnetwork/lnd/chainreg"
15
        "github.com/lightningnetwork/lnd/chanacceptor"
16
        "github.com/lightningnetwork/lnd/chanbackup"
17
        "github.com/lightningnetwork/lnd/chanfitness"
18
        "github.com/lightningnetwork/lnd/channeldb"
19
        "github.com/lightningnetwork/lnd/channelnotifier"
20
        "github.com/lightningnetwork/lnd/cluster"
21
        "github.com/lightningnetwork/lnd/contractcourt"
22
        "github.com/lightningnetwork/lnd/discovery"
23
        "github.com/lightningnetwork/lnd/funding"
24
        "github.com/lightningnetwork/lnd/graph"
25
        graphdb "github.com/lightningnetwork/lnd/graph/db"
26
        "github.com/lightningnetwork/lnd/healthcheck"
27
        "github.com/lightningnetwork/lnd/htlcswitch"
28
        "github.com/lightningnetwork/lnd/invoices"
29
        "github.com/lightningnetwork/lnd/kvdb/sqlbase"
30
        "github.com/lightningnetwork/lnd/lncfg"
31
        "github.com/lightningnetwork/lnd/lnrpc/autopilotrpc"
32
        "github.com/lightningnetwork/lnd/lnrpc/chainrpc"
33
        "github.com/lightningnetwork/lnd/lnrpc/devrpc"
34
        "github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
35
        "github.com/lightningnetwork/lnd/lnrpc/neutrinorpc"
36
        "github.com/lightningnetwork/lnd/lnrpc/peersrpc"
37
        "github.com/lightningnetwork/lnd/lnrpc/routerrpc"
38
        "github.com/lightningnetwork/lnd/lnrpc/signrpc"
39
        "github.com/lightningnetwork/lnd/lnrpc/verrpc"
40
        "github.com/lightningnetwork/lnd/lnrpc/walletrpc"
41
        "github.com/lightningnetwork/lnd/lnwallet"
42
        "github.com/lightningnetwork/lnd/lnwallet/btcwallet"
43
        "github.com/lightningnetwork/lnd/lnwallet/chancloser"
44
        "github.com/lightningnetwork/lnd/lnwallet/chanfunding"
45
        "github.com/lightningnetwork/lnd/lnwallet/rpcwallet"
46
        "github.com/lightningnetwork/lnd/monitoring"
47
        "github.com/lightningnetwork/lnd/netann"
48
        "github.com/lightningnetwork/lnd/peer"
49
        "github.com/lightningnetwork/lnd/peernotifier"
50
        "github.com/lightningnetwork/lnd/protofsm"
51
        "github.com/lightningnetwork/lnd/routing"
52
        "github.com/lightningnetwork/lnd/routing/blindedpath"
53
        "github.com/lightningnetwork/lnd/routing/localchans"
54
        "github.com/lightningnetwork/lnd/rpcperms"
55
        "github.com/lightningnetwork/lnd/signal"
56
        "github.com/lightningnetwork/lnd/sweep"
57
        "github.com/lightningnetwork/lnd/tor"
58
        "github.com/lightningnetwork/lnd/watchtower"
59
        "github.com/lightningnetwork/lnd/watchtower/wtclient"
60
)
61

62
// replaceableLogger is a thin wrapper around a logger that is used so the
63
// logger can be replaced easily without some black pointer magic.
64
type replaceableLogger struct {
65
        btclog.Logger
66
        subsystem string
67
}
68

69
// Loggers can not be used before the log rotator has been initialized with a
70
// log file. This must be performed early during application startup by
71
// calling InitLogRotator() on the main log writer instance in the config.
72
var (
73
        // lndPkgLoggers is a list of all lnd package level loggers that are
74
        // registered. They are tracked here so they can be replaced once the
75
        // SetupLoggers function is called with the final root logger.
76
        lndPkgLoggers []*replaceableLogger
77

78
        // addLndPkgLogger is a helper function that creates a new replaceable
79
        // main lnd package level logger and adds it to the list of loggers that
80
        // are replaced again later, once the final root logger is ready.
81
        addLndPkgLogger = func(subsystem string) *replaceableLogger {
12✔
82
                l := &replaceableLogger{
12✔
83
                        Logger:    build.NewSubLogger(subsystem, nil),
12✔
84
                        subsystem: subsystem,
12✔
85
                }
12✔
86
                lndPkgLoggers = append(lndPkgLoggers, l)
12✔
87
                return l
12✔
88
        }
12✔
89

90
        // Loggers that need to be accessible from the lnd package can be placed
91
        // here. Loggers that are only used in sub modules can be added directly
92
        // by using the addSubLogger method. We declare all loggers so we never
93
        // run into a nil reference if they are used early. But the SetupLoggers
94
        // function should always be called as soon as possible to finish
95
        // setting them up properly with a root logger.
96
        ltndLog = addLndPkgLogger("LTND")
97
        rpcsLog = addLndPkgLogger("RPCS")
98
        srvrLog = addLndPkgLogger("SRVR")
99
        atplLog = addLndPkgLogger("ATPL")
100
)
101

102
// genSubLogger creates a logger for a subsystem. We provide an instance of
103
// a signal.Interceptor to be able to shutdown in the case of a critical error.
104
func genSubLogger(root *build.SubLoggerManager,
UNCOV
105
        interceptor signal.Interceptor) func(string) btclog.Logger {
×
UNCOV
106

×
UNCOV
107
        // Create a shutdown function which will request shutdown from our
×
UNCOV
108
        // interceptor if it is listening.
×
UNCOV
109
        shutdown := func() {
×
110
                if !interceptor.Listening() {
×
111
                        return
×
112
                }
×
113

114
                interceptor.RequestShutdown()
×
115
        }
116

117
        // Return a function which will create a sublogger from our root
118
        // logger without shutdown fn.
UNCOV
119
        return func(tag string) btclog.Logger {
×
UNCOV
120
                return root.GenSubLogger(tag, shutdown)
×
UNCOV
121
        }
×
122
}
123

124
// SetupLoggers initializes all package-global logger variables.
125
//
126
//nolint:ll
UNCOV
127
func SetupLoggers(root *build.SubLoggerManager, interceptor signal.Interceptor) {
×
UNCOV
128
        genLogger := genSubLogger(root, interceptor)
×
UNCOV
129

×
UNCOV
130
        // Now that we have the proper root logger, we can replace the
×
UNCOV
131
        // placeholder lnd package loggers.
×
UNCOV
132
        for _, l := range lndPkgLoggers {
×
UNCOV
133
                l.Logger = build.NewSubLogger(l.subsystem, genLogger)
×
UNCOV
134
                SetSubLogger(root, l.subsystem, l.Logger)
×
UNCOV
135
        }
×
136

137
        // Initialize loggers from packages outside of `lnd` first. The
138
        // packages below will overwrite the names of the loggers they import.
139
        // For instance, the logger in `neutrino.query` is overwritten by
140
        // `btcwallet.chain`, which is overwritten by `lnwallet`. To ensure the
141
        // overwriting works, we need to initialize the loggers here so they
142
        // can be overwritten later.
UNCOV
143
        AddV1SubLogger(root, "BTCN", interceptor, neutrino.UseLogger)
×
UNCOV
144
        AddV1SubLogger(root, "CMGR", interceptor, connmgr.UseLogger)
×
UNCOV
145
        AddV1SubLogger(root, "RPCC", interceptor, rpcclient.UseLogger)
×
UNCOV
146

×
UNCOV
147
        // Some of the loggers declared in the main lnd package are also used
×
UNCOV
148
        // in sub packages.
×
UNCOV
149
        signal.UseLogger(ltndLog)
×
UNCOV
150
        autopilot.UseLogger(atplLog)
×
UNCOV
151

×
UNCOV
152
        AddSubLogger(root, "LNWL", interceptor, lnwallet.UseLogger)
×
UNCOV
153
        AddSubLogger(root, "DISC", interceptor, discovery.UseLogger)
×
UNCOV
154
        AddSubLogger(root, "NTFN", interceptor, chainntnfs.UseLogger)
×
UNCOV
155
        AddSubLogger(root, "CHDB", interceptor, channeldb.UseLogger)
×
UNCOV
156
        AddSubLogger(root, "SQLB", interceptor, sqlbase.UseLogger)
×
UNCOV
157
        AddSubLogger(root, "HSWC", interceptor, htlcswitch.UseLogger)
×
UNCOV
158
        AddSubLogger(root, "CNCT", interceptor, contractcourt.UseLogger)
×
UNCOV
159
        AddSubLogger(root, "UTXN", interceptor, contractcourt.UseNurseryLogger)
×
UNCOV
160
        AddSubLogger(root, "BRAR", interceptor, contractcourt.UseBreachLogger)
×
UNCOV
161
        AddV1SubLogger(root, "SPHX", interceptor, sphinx.UseLogger)
×
UNCOV
162
        AddSubLogger(root, "SWPR", interceptor, sweep.UseLogger)
×
UNCOV
163
        AddSubLogger(root, "SGNR", interceptor, signrpc.UseLogger)
×
UNCOV
164
        AddSubLogger(root, "WLKT", interceptor, walletrpc.UseLogger)
×
UNCOV
165
        AddSubLogger(root, "ARPC", interceptor, autopilotrpc.UseLogger)
×
UNCOV
166
        AddSubLogger(root, "NRPC", interceptor, neutrinorpc.UseLogger)
×
UNCOV
167
        AddSubLogger(root, "DRPC", interceptor, devrpc.UseLogger)
×
UNCOV
168
        AddSubLogger(root, "INVC", interceptor, invoices.UseLogger)
×
UNCOV
169
        AddSubLogger(root, "NANN", interceptor, netann.UseLogger)
×
UNCOV
170
        AddSubLogger(root, "WTWR", interceptor, watchtower.UseLogger)
×
UNCOV
171
        AddSubLogger(root, "NTFR", interceptor, chainrpc.UseLogger)
×
UNCOV
172
        AddSubLogger(root, "IRPC", interceptor, invoicesrpc.UseLogger)
×
UNCOV
173
        AddSubLogger(root, "CHNF", interceptor, channelnotifier.UseLogger)
×
UNCOV
174
        AddSubLogger(root, "CHBU", interceptor, chanbackup.UseLogger)
×
UNCOV
175
        AddSubLogger(root, "PROM", interceptor, monitoring.UseLogger)
×
UNCOV
176
        AddSubLogger(root, "WTCL", interceptor, wtclient.UseLogger)
×
UNCOV
177
        AddSubLogger(root, "PRNF", interceptor, peernotifier.UseLogger)
×
UNCOV
178
        AddSubLogger(root, "CHFD", interceptor, chanfunding.UseLogger)
×
UNCOV
179
        AddSubLogger(root, "PEER", interceptor, peer.UseLogger)
×
UNCOV
180
        AddSubLogger(root, "CHCL", interceptor, chancloser.UseLogger)
×
UNCOV
181
        AddSubLogger(root, "LCHN", interceptor, localchans.UseLogger)
×
NEW
182
        AddSubLogger(root, "PFSM", interceptor, protofsm.UseLogger)
×
UNCOV
183

×
UNCOV
184
        AddSubLogger(root, routing.Subsystem, interceptor, routing.UseLogger)
×
UNCOV
185
        AddSubLogger(root, routerrpc.Subsystem, interceptor, routerrpc.UseLogger)
×
UNCOV
186
        AddSubLogger(root, chanfitness.Subsystem, interceptor, chanfitness.UseLogger)
×
UNCOV
187
        AddSubLogger(root, verrpc.Subsystem, interceptor, verrpc.UseLogger)
×
UNCOV
188
        AddSubLogger(root, healthcheck.Subsystem, interceptor, healthcheck.UseLogger)
×
UNCOV
189
        AddSubLogger(root, chainreg.Subsystem, interceptor, chainreg.UseLogger)
×
UNCOV
190
        AddSubLogger(root, chanacceptor.Subsystem, interceptor, chanacceptor.UseLogger)
×
UNCOV
191
        AddSubLogger(root, funding.Subsystem, interceptor, funding.UseLogger)
×
UNCOV
192
        AddSubLogger(root, cluster.Subsystem, interceptor, cluster.UseLogger)
×
UNCOV
193
        AddSubLogger(root, rpcperms.Subsystem, interceptor, rpcperms.UseLogger)
×
UNCOV
194
        AddSubLogger(root, tor.Subsystem, interceptor, tor.UseLogger)
×
UNCOV
195
        AddSubLogger(root, btcwallet.Subsystem, interceptor, btcwallet.UseLogger)
×
UNCOV
196
        AddSubLogger(root, rpcwallet.Subsystem, interceptor, rpcwallet.UseLogger)
×
UNCOV
197
        AddSubLogger(root, peersrpc.Subsystem, interceptor, peersrpc.UseLogger)
×
UNCOV
198
        AddSubLogger(root, graph.Subsystem, interceptor, graph.UseLogger)
×
UNCOV
199
        AddSubLogger(root, lncfg.Subsystem, interceptor, lncfg.UseLogger)
×
UNCOV
200
        AddSubLogger(
×
UNCOV
201
                root, blindedpath.Subsystem, interceptor, blindedpath.UseLogger,
×
UNCOV
202
        )
×
UNCOV
203
        AddV1SubLogger(root, graphdb.Subsystem, interceptor, graphdb.UseLogger)
×
UNCOV
204
        AddSubLogger(root, chainio.Subsystem, interceptor, chainio.UseLogger)
×
205
}
206

207
// AddSubLogger is a helper method to conveniently create and register the
208
// logger of one or more sub systems.
209
func AddSubLogger(root *build.SubLoggerManager, subsystem string,
UNCOV
210
        interceptor signal.Interceptor, useLoggers ...func(btclog.Logger)) {
×
UNCOV
211

×
UNCOV
212
        // genSubLogger will return a callback for creating a logger instance,
×
UNCOV
213
        // which we will give to the root logger.
×
UNCOV
214
        genLogger := genSubLogger(root, interceptor)
×
UNCOV
215

×
UNCOV
216
        // Create and register just a single logger to prevent them from
×
UNCOV
217
        // overwriting each other internally.
×
UNCOV
218
        logger := build.NewSubLogger(subsystem, genLogger)
×
UNCOV
219
        SetSubLogger(root, subsystem, logger, useLoggers...)
×
UNCOV
220
}
×
221

222
// SetSubLogger is a helper method to conveniently register the logger of a
223
// sub system.
224
func SetSubLogger(root *build.SubLoggerManager, subsystem string,
UNCOV
225
        logger btclog.Logger, useLoggers ...func(btclog.Logger)) {
×
UNCOV
226

×
UNCOV
227
        root.RegisterSubLogger(subsystem, logger)
×
UNCOV
228
        for _, useLogger := range useLoggers {
×
UNCOV
229
                useLogger(logger)
×
UNCOV
230
        }
×
231
}
232

233
// AddV1SubLogger is a helper method to conveniently create and register the
234
// logger of one or more sub systems.
235
func AddV1SubLogger(root *build.SubLoggerManager, subsystem string,
UNCOV
236
        interceptor signal.Interceptor, useLoggers ...func(btclogv1.Logger)) {
×
UNCOV
237

×
UNCOV
238
        // genSubLogger will return a callback for creating a logger instance,
×
UNCOV
239
        // which we will give to the root logger.
×
UNCOV
240
        genLogger := genSubLogger(root, interceptor)
×
UNCOV
241

×
UNCOV
242
        // Create and register just a single logger to prevent them from
×
UNCOV
243
        // overwriting each other internally.
×
UNCOV
244
        logger := build.NewSubLogger(subsystem, genLogger)
×
UNCOV
245
        SetV1SubLogger(root, subsystem, logger, useLoggers...)
×
UNCOV
246
}
×
247

248
// SetV1SubLogger is a helper method to conveniently register the logger of a
249
// sub system. Note that the btclog v2 logger implements the btclog v1 logger
250
// which is why we can pass the v2 logger to the UseLogger call-backs that
251
// expect the v1 logger.
252
func SetV1SubLogger(root *build.SubLoggerManager, subsystem string,
UNCOV
253
        logger btclog.Logger, useLoggers ...func(btclogv1.Logger)) {
×
UNCOV
254

×
UNCOV
255
        root.RegisterSubLogger(subsystem, logger)
×
UNCOV
256
        for _, useLogger := range useLoggers {
×
UNCOV
257
                useLogger(logger)
×
UNCOV
258
        }
×
259
}
STATUS · Troubleshooting · Open an Issue · Sales · Support · CAREERS · ENTERPRISE · START FREE · SCHEDULE DEMO
ANNOUNCEMENTS · TWITTER · TOS & SLA · Supported CI Services · What's a CI service? · Automated Testing

© 2025 Coveralls, Inc