mirror/lnd
1
0 Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

multi: fix fmt.Errorf error wrapping

Browse Source 
Refactor fmt.Errorf usage to correctly wrap errors instead of using
non-wrapping format verbs.
This commit is contained in:
ffranr committed 2024-02-27 11:13:40 +00:00
1 parent 581c16d72f
commit cd566eb097
103 files changed
+426 -390
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

watchtower/lookout/justice_descriptor.go
+1 -1
View File
@@ -196,7 +196,7 @@ func (p *JusticeDescriptor) assembleJusticeTxn(txWeight int64,
if err := vm.Execute(); err != nil {
log.Debugf("Failed to validate justice transaction: %s",
spew.Sdump(justiceTxn))
return nil, fmt.Errorf("error validating TX: %v", err)
return nil, fmt.Errorf("error validating TX: %w", err)
}
}
watchtower/wtclient/client.go
+5 -5
View File
@@ -982,7 +982,7 @@ func (c *client) readMessage(peer wtserver.Peer) (wtwire.Message, error) {
// received in a timely manner.
err := peer.SetReadDeadline(time.Now().Add(c.cfg.ReadTimeout))
if err != nil {
err = fmt.Errorf("unable to set read deadline: %v", err)
err = fmt.Errorf("unable to set read deadline: %w", err)
c.log.Errorf("Unable to read msg: %v", err)
return nil, err
}
@@ -990,7 +990,7 @@ func (c *client) readMessage(peer wtserver.Peer) (wtwire.Message, error) {
// Pull the next message off the wire,
rawMsg, err := peer.ReadNextMessage()
if err != nil {
err = fmt.Errorf("unable to read message: %v", err)
err = fmt.Errorf("unable to read message: %w", err)
c.log.Errorf("Unable to read msg: %v", err)
return nil, err
}
@@ -1000,7 +1000,7 @@ func (c *client) readMessage(peer wtserver.Peer) (wtwire.Message, error) {
msgReader := bytes.NewReader(rawMsg)
msg, err := wtwire.ReadMessage(msgReader, 0)
if err != nil {
err = fmt.Errorf("unable to parse message: %v", err)
err = fmt.Errorf("unable to parse message: %w", err)
c.log.Errorf("Unable to read msg: %v", err)
return nil, err
}
@@ -1019,7 +1019,7 @@ func (c *client) sendMessage(peer wtserver.Peer,
var b bytes.Buffer
_, err := wtwire.WriteMessage(&b, msg, 0)
if err != nil {
err = fmt.Errorf("Unable to encode msg: %v", err)
err = fmt.Errorf("unable to encode msg: %w", err)
c.log.Errorf("Unable to send msg: %v", err)
return err
}
@@ -1028,7 +1028,7 @@ func (c *client) sendMessage(peer wtserver.Peer,
// connection if nothing is sent in a timely manner.
err = peer.SetWriteDeadline(time.Now().Add(c.cfg.WriteTimeout))
if err != nil {
err = fmt.Errorf("unable to set write deadline: %v", err)
err = fmt.Errorf("unable to set write deadline: %w", err)
c.log.Errorf("Unable to send msg: %v", err)
return err
}
watchtower/wtclient/session_negotiator.go
+4 -4
View File
@@ -413,13 +413,13 @@ func (n *sessionNegotiator) tryAddress(sessionKey keychain.SingleKeyECDH,
// Send local Init message.
err = n.cfg.SendMessage(conn, n.localInit)
if err != nil {
return fmt.Errorf("unable to send Init: %v", err)
return fmt.Errorf("unable to send Init: %w", err)
}
// Receive remote Init message.
remoteMsg, err := n.cfg.ReadMessage(conn)
if err != nil {
return fmt.Errorf("unable to read Init: %v", err)
return fmt.Errorf("unable to read Init: %w", err)
}
// Check that returned message is wtwire.Init.
@@ -446,13 +446,13 @@ func (n *sessionNegotiator) tryAddress(sessionKey keychain.SingleKeyECDH,
// Send CreateSession message.
err = n.cfg.SendMessage(conn, createSession)
if err != nil {
return fmt.Errorf("unable to send CreateSession: %v", err)
return fmt.Errorf("unable to send CreateSession: %w", err)
}
// Receive CreateSessionReply message.
remoteMsg, err = n.cfg.ReadMessage(conn)
if err != nil {
return fmt.Errorf("unable to read CreateSessionReply: %v", err)
return fmt.Errorf("unable to read CreateSessionReply: %w", err)
}
// Check that returned message is wtwire.CreateSessionReply.
watchtower/wtdb/client_db.go
+1 -1
View File
@@ -233,7 +233,7 @@ func NewBoltBackendCreator(active bool, dbPath,
db, err := kvdb.GetBoltBackend(cfg)
if err != nil {
return nil, fmt.Errorf("could not open boltdb: %v", err)
return nil, fmt.Errorf("could not open boltdb: %w", err)
}
return db, nil
watchtower/wtserver/server.go
+5 -5
View File
@@ -313,7 +313,7 @@ func (s *Server) readMessage(peer Peer) (wtwire.Message, error) {
// timely manner.
err := peer.SetReadDeadline(time.Now().Add(s.cfg.ReadTimeout))
if err != nil {
err = fmt.Errorf("unable to set read deadline: %v", err)
err = fmt.Errorf("unable to set read deadline: %w", err)
return nil, err
}
@@ -321,14 +321,14 @@ func (s *Server) readMessage(peer Peer) (wtwire.Message, error) {
// watchtower wire specification.
rawMsg, err := peer.ReadNextMessage()
if err != nil {
err = fmt.Errorf("unable to read message: %v", err)
err = fmt.Errorf("unable to read message: %w", err)
return nil, err
}
msgReader := bytes.NewReader(rawMsg)
msg, err := wtwire.ReadMessage(msgReader, 0)
if err != nil {
err = fmt.Errorf("unable to parse message: %v", err)
err = fmt.Errorf("unable to parse message: %w", err)
return nil, err
}
@@ -344,13 +344,13 @@ func (s *Server) sendMessage(peer Peer, msg wtwire.Message) error {
var b bytes.Buffer
_, err := wtwire.WriteMessage(&b, msg, 0)
if err != nil {
err = fmt.Errorf("unable to encode msg: %v", err)
err = fmt.Errorf("unable to encode msg: %w", err)
return err
}
err = peer.SetWriteDeadline(time.Now().Add(s.cfg.WriteTimeout))
if err != nil {
err = fmt.Errorf("unable to set write deadline: %v", err)
err = fmt.Errorf("unable to set write deadline: %w", err)
return err
}