highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-27 17:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

htlcswitch/test: isolate test packets

Browse Source 
Decouple the tests somewhat and fix a bug along the way where the test
passed because of a left-over package from a prior test.
This commit is contained in:
Joost Jager 2022-03-23 15:25:02 +01:00
parent 2fd900b172
commit bae0b6bdf9
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
2 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htlcswitch/mock.go
View File

@ -690,11 +690,13 @@ func (f *mockChannelLink) completeCircuit(pkt *htlcPacket) error {
f.htlcID++
case *lnwire.UpdateFulfillHTLC, *lnwire.UpdateFailHTLC:
if pkt.circuit != nil {
err := f.htlcSwitch.teardownCircuit(pkt)
if err != nil {
return err
}
}
}
f.mailBox.AckPacket(pkt.inKey())

64
htlcswitch/switch_test.go
View File

@ -3257,9 +3257,14 @@ func TestSwitchHoldForward(t *testing.T) {
preimage := [sha256.Size]byte{1}
rhash := sha256.Sum256(preimage[:])
onionBlob := [1366]byte{4, 5, 6}
ogPacket := &htlcPacket{
incomingHtlcID := uint64(0)
createTestPacket := func() *htlcPacket {
incomingHtlcID++
return &htlcPacket{
incomingChanID: aliceChannelLink.ShortChanID(),
incomingHTLCID: 0,
incomingHTLCID: incomingHtlcID,
outgoingChanID: bobChannelLink.ShortChanID(),
obfuscator: NewMockObfuscator(),
htlc: &lnwire.UpdateAddHTLC{
@ -3268,6 +3273,18 @@ func TestSwitchHoldForward(t *testing.T) {
OnionBlob: onionBlob,
},
}
}
createSettlePacket := func(outgoingHTLCID uint64) *htlcPacket {
return &htlcPacket{
outgoingChanID: bobChannelLink.ShortChanID(),
outgoingHTLCID: outgoingHTLCID,
amount: 1,
htlc: &lnwire.UpdateFulfillHTLC{
PaymentPreimage: preimage,
},
}
}
forwardInterceptor := &mockForwardInterceptor{
t: t,
@ -3281,7 +3298,9 @@ func TestSwitchHoldForward(t *testing.T) {
// Test resume a hold forward.
assertNumCircuits(t, s, 0, 0)
err = switchForwardInterceptor.ForwardPackets(linkQuit, false, ogPacket)
err = switchForwardInterceptor.ForwardPackets(
linkQuit, false, createTestPacket(),
)
require.NoError(t, err)
assertNumCircuits(t, s, 0, 0)
@ -3291,19 +3310,14 @@ func TestSwitchHoldForward(t *testing.T) {
Action: FwdActionResume,
Key: forwardInterceptor.getIntercepted().IncomingCircuit,
}))
assertOutgoingLinkReceive(t, bobChannelLink, true)
receivedPkt := assertOutgoingLinkReceive(t, bobChannelLink, true)
assertNumCircuits(t, s, 1, 1)
// settling the htlc to close the circuit.
settle := &htlcPacket{
outgoingChanID: bobChannelLink.ShortChanID(),
outgoingHTLCID: 0,
amount: 1,
htlc: &lnwire.UpdateFulfillHTLC{
PaymentPreimage: preimage,
},
}
err = switchForwardInterceptor.ForwardPackets(linkQuit, false, settle)
err = switchForwardInterceptor.ForwardPackets(
linkQuit, false,
createSettlePacket(receivedPkt.outgoingHTLCID),
)
require.NoError(t, err)
assertOutgoingLinkReceive(t, aliceChannelLink, true)
@ -3311,7 +3325,7 @@ func TestSwitchHoldForward(t *testing.T) {
// Test resume a hold forward after disconnection.
require.NoError(t, switchForwardInterceptor.ForwardPackets(
linkQuit, false, ogPacket,
linkQuit, false, createTestPacket(),
))
// Wait until the packet is offered to the interceptor.
@ -3324,13 +3338,13 @@ func TestSwitchHoldForward(t *testing.T) {
// Disconnect should resume the forwarding.
switchForwardInterceptor.SetInterceptor(nil)
assertOutgoingLinkReceive(t, bobChannelLink, true)
receivedPkt = assertOutgoingLinkReceive(t, bobChannelLink, true)
assertNumCircuits(t, s, 1, 1)
// Settle the htlc to close the circuit.
settle.outgoingHTLCID = 1
require.NoError(t, switchForwardInterceptor.ForwardPackets(
linkQuit, false, settle,
linkQuit, false,
createSettlePacket(receivedPkt.outgoingHTLCID),
))
assertOutgoingLinkReceive(t, aliceChannelLink, true)
@ -3342,7 +3356,7 @@ func TestSwitchHoldForward(t *testing.T) {
)
require.NoError(t, switchForwardInterceptor.ForwardPackets(
linkQuit, false, ogPacket,
linkQuit, false, createTestPacket(),
))
assertNumCircuits(t, s, 0, 0)
assertOutgoingLinkReceive(t, bobChannelLink, false)
@ -3358,7 +3372,9 @@ func TestSwitchHoldForward(t *testing.T) {
// Test failing a hold forward with a failure message.
require.NoError(t,
switchForwardInterceptor.ForwardPackets(linkQuit, false, ogPacket),
switchForwardInterceptor.ForwardPackets(
linkQuit, false, createTestPacket(),
),
)
assertNumCircuits(t, s, 0, 0)
assertOutgoingLinkReceive(t, bobChannelLink, false)
@ -3378,7 +3394,9 @@ func TestSwitchHoldForward(t *testing.T) {
assertNumCircuits(t, s, 0, 0)
// Test failing a hold forward with a malformed htlc failure.
err = switchForwardInterceptor.ForwardPackets(linkQuit, false, ogPacket)
err = switchForwardInterceptor.ForwardPackets(
linkQuit, false, createTestPacket(),
)
require.NoError(t, err)
assertNumCircuits(t, s, 0, 0)
@ -3408,7 +3426,7 @@ func TestSwitchHoldForward(t *testing.T) {
// Test settling a hold forward
require.NoError(t, switchForwardInterceptor.ForwardPackets(
linkQuit, false, ogPacket,
linkQuit, false, createTestPacket(),
))
assertNumCircuits(t, s, 0, 0)
assertOutgoingLinkReceive(t, bobChannelLink, false)
@ -3431,7 +3449,7 @@ func TestSwitchHoldForward(t *testing.T) {
// Forward a fresh packet. It is expected to be failed immediately,
// because there is no interceptor registered.
require.NoError(t, switchForwardInterceptor.ForwardPackets(
linkQuit, false, ogPacket,
linkQuit, false, createTestPacket(),
))
assertOutgoingLinkReceive(t, bobChannelLink, false)
@ -3444,7 +3462,7 @@ func TestSwitchHoldForward(t *testing.T) {
errChan := make(chan error)
go func() {
errChan <- switchForwardInterceptor.ForwardPackets(
linkQuit, true, ogPacket,
linkQuit, true, createTestPacket(),
)
}()