akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1643 from cfromknecht/fail-expiry-too-soon

Browse Source 
[htlcswitch/link] use FailFinalExpiryTooSoon as exit hop
This commit is contained in:
Olaoluwa Osuntokun 2018-07-29 23:05:35 -04:00 committed by GitHub
commit 804598057d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htlcswitch/link.go
View File

@ -9,6 +9,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/go-errors/errors" "github.com/go-errors/errors"
"github.com/lightningnetwork/lnd/channeldb" "github.com/lightningnetwork/lnd/channeldb"
@ -17,7 +18,6 @@ import (
"github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnpeer"
"github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
"github.com/btcsuite/btcd/chaincfg/chainhash"
) )
func init() { func init() {
@ -2155,7 +2155,7 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg,
"soon: expiry=%v, best_height=%v", "soon: expiry=%v, best_height=%v",
pd.RHash[:], pd.Timeout, heightNow) pd.RHash[:], pd.Timeout, heightNow)
failure := lnwire.FailFinalIncorrectCltvExpiry{} failure := lnwire.FailFinalExpiryTooSoon{}
l.sendHTLCError( l.sendHTLCError(
pd.HtlcIndex, &failure, obfuscator, pd.SourceRef, pd.HtlcIndex, &failure, obfuscator, pd.SourceRef,
) )

10
htlcswitch/link_test.go
View File

@ -15,6 +15,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"github.com/coreos/bbolt" "github.com/coreos/bbolt"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/go-errors/errors" "github.com/go-errors/errors"
@ -24,10 +28,6 @@ import (
"github.com/lightningnetwork/lnd/lnpeer" "github.com/lightningnetwork/lnd/lnpeer"
"github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
"github.com/btcsuite/btcd/btcec"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
) )
const ( const (
@ -1247,7 +1247,7 @@ func TestChannelLinkExpiryTooSoonExitNode(t *testing.T) {
} }
switch ferr.FailureMessage.(type) { switch ferr.FailureMessage.(type) {
case *lnwire.FailFinalIncorrectCltvExpiry: case *lnwire.FailFinalExpiryTooSoon:
default: default:
t.Fatalf("incorrect error, expected final time lock too "+ t.Fatalf("incorrect error, expected final time lock too "+
"early, instead have: %v", err) "early, instead have: %v", err)