highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-09-08 14:57:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6353 from bhandras/interceptor-race-fix

Browse Source 
switch+test: fix race condition in the interceptor unit test
This commit is contained in:
Oliver Gugger
2022-03-23 18:16:13 +01:00
committed by GitHub
parent 802544b62a 64ea883105
commit c0a282bc4a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/release-notes-0.15.0.md
View File

@@ -101,6 +101,10 @@
* [Make etcd leader election session * [Make etcd leader election session
TTL](https://github.com/lightningnetwork/lnd/pull/6342) configurable. TTL](https://github.com/lightningnetwork/lnd/pull/6342) configurable.
* [Fix race condition in the htlc interceptor unit
test](https://github.com/lightningnetwork/lnd/pull/6353).
## RPC Server ## RPC Server
* [Add value to the field * [Add value to the field

12
htlcswitch/switch_test.go
View File

@@ -3287,7 +3287,7 @@ func TestSwitchHoldForward(t *testing.T) {
assertNumCircuits(t, s, 0, 0) assertNumCircuits(t, s, 0, 0)
assertOutgoingLinkReceive(t, bobChannelLink, false) assertOutgoingLinkReceive(t, bobChannelLink, false)
require.NoError(t, switchForwardInterceptor.resolve(&FwdResolution{ require.NoError(t, switchForwardInterceptor.Resolve(&FwdResolution{
Action: FwdActionResume, Action: FwdActionResume,
Key: forwardInterceptor.getIntercepted().IncomingCircuit, Key: forwardInterceptor.getIntercepted().IncomingCircuit,
})) }))
@@ -3347,7 +3347,7 @@ func TestSwitchHoldForward(t *testing.T) {
assertNumCircuits(t, s, 0, 0) assertNumCircuits(t, s, 0, 0)
assertOutgoingLinkReceive(t, bobChannelLink, false) assertOutgoingLinkReceive(t, bobChannelLink, false)
require.NoError(t, switchForwardInterceptor.resolve(&FwdResolution{ require.NoError(t, switchForwardInterceptor.Resolve(&FwdResolution{
Action: FwdActionFail, Action: FwdActionFail,
Key: forwardInterceptor.getIntercepted().IncomingCircuit, Key: forwardInterceptor.getIntercepted().IncomingCircuit,
FailureCode: lnwire.CodeTemporaryChannelFailure, FailureCode: lnwire.CodeTemporaryChannelFailure,
@@ -3364,7 +3364,7 @@ func TestSwitchHoldForward(t *testing.T) {
assertOutgoingLinkReceive(t, bobChannelLink, false) assertOutgoingLinkReceive(t, bobChannelLink, false)
reason := lnwire.OpaqueReason([]byte{1, 2, 3}) reason := lnwire.OpaqueReason([]byte{1, 2, 3})
require.NoError(t, switchForwardInterceptor.resolve(&FwdResolution{ require.NoError(t, switchForwardInterceptor.Resolve(&FwdResolution{
Action: FwdActionFail, Action: FwdActionFail,
Key: forwardInterceptor.getIntercepted().IncomingCircuit, Key: forwardInterceptor.getIntercepted().IncomingCircuit,
FailureMessage: reason, FailureMessage: reason,
@@ -3385,7 +3385,7 @@ func TestSwitchHoldForward(t *testing.T) {
assertOutgoingLinkReceive(t, bobChannelLink, false) assertOutgoingLinkReceive(t, bobChannelLink, false)
code := lnwire.CodeInvalidOnionKey code := lnwire.CodeInvalidOnionKey
require.NoError(t, switchForwardInterceptor.resolve(&FwdResolution{ require.NoError(t, switchForwardInterceptor.Resolve(&FwdResolution{
Action: FwdActionFail, Action: FwdActionFail,
Key: forwardInterceptor.getIntercepted().IncomingCircuit, Key: forwardInterceptor.getIntercepted().IncomingCircuit,
FailureCode: code, FailureCode: code,
@@ -3413,7 +3413,7 @@ func TestSwitchHoldForward(t *testing.T) {
assertNumCircuits(t, s, 0, 0) assertNumCircuits(t, s, 0, 0)
assertOutgoingLinkReceive(t, bobChannelLink, false) assertOutgoingLinkReceive(t, bobChannelLink, false)
require.NoError(t, switchForwardInterceptor.resolve(&FwdResolution{ require.NoError(t, switchForwardInterceptor.Resolve(&FwdResolution{
Key: forwardInterceptor.getIntercepted().IncomingCircuit, Key: forwardInterceptor.getIntercepted().IncomingCircuit,
Action: FwdActionSettle, Action: FwdActionSettle,
Preimage: preimage, Preimage: preimage,
@@ -3473,7 +3473,7 @@ func TestSwitchHoldForward(t *testing.T) {
intercepted := forwardInterceptor.getIntercepted() intercepted := forwardInterceptor.getIntercepted()
// Settle the packet. // Settle the packet.
require.NoError(t, switchForwardInterceptor.resolve(&FwdResolution{ require.NoError(t, switchForwardInterceptor.Resolve(&FwdResolution{
Key: intercepted.IncomingCircuit, Key: intercepted.IncomingCircuit,
Action: FwdActionSettle, Action: FwdActionSettle,
Preimage: preimage, Preimage: preimage,