Merge pull request #3502 from joostjager/err-returns

multi: fix dropped errors
This commit is contained in:
Conner Fromknecht
2019-09-13 11:24:04 -07:00
committed by GitHub
6 changed files with 10 additions and 10 deletions

View File

@@ -961,7 +961,7 @@ func decodeIncomingResolution(r io.Reader, h *lnwallet.IncomingHtlcResolution) e
func encodeOutgoingResolution(w io.Writer, o *lnwallet.OutgoingHtlcResolution) error {
if err := binary.Write(w, endian, o.Expiry); err != nil {
return nil
return err
}
if o.SignedTimeoutTx == nil {
@@ -979,7 +979,7 @@ func encodeOutgoingResolution(w io.Writer, o *lnwallet.OutgoingHtlcResolution) e
}
if err := binary.Write(w, endian, o.CsvDelay); err != nil {
return nil
return err
}
if _, err := w.Write(o.ClaimOutpoint.Hash[:]); err != nil {
return err