From 5ed57d34f0184635c83f8415d54191e9f0514806 Mon Sep 17 00:00:00 2001 From: Dirk McCormick Date: Mon, 26 Oct 2020 11:09:56 +0100 Subject: [PATCH] fix: race in paych manager add funds --- paychmgr/paychget_test.go | 5 ++++- paychmgr/simple.go | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/paychmgr/paychget_test.go b/paychmgr/paychget_test.go index 9f19dd13db1..e6b94db57ca 100644 --- a/paychmgr/paychget_test.go +++ b/paychmgr/paychget_test.go @@ -663,6 +663,7 @@ func TestPaychGetMergeAddFunds(t *testing.T) { defer addFundsSent.Done() // Request add funds - should block until create channel has completed + var err error addFundsCh1, addFundsMcid1, err = mgr.GetPaych(ctx, from, to, addFundsAmt1) require.NoError(t, err) }() @@ -671,6 +672,7 @@ func TestPaychGetMergeAddFunds(t *testing.T) { defer addFundsSent.Done() // Request add funds again - should merge with waiting add funds request + var err error addFundsCh2, addFundsMcid2, err = mgr.GetPaych(ctx, from, to, addFundsAmt2) require.NoError(t, err) }() @@ -766,6 +768,7 @@ func TestPaychGetMergeAddFundsCtxCancelOne(t *testing.T) { defer addFundsSent.Done() // Request add funds again - should merge with waiting add funds request + var err error addFundsCh2, addFundsMcid2, err = mgr.GetPaych(ctx, from, to, addFundsAmt2) require.NoError(t, err) }() @@ -861,7 +864,6 @@ func TestPaychGetMergeAddFundsCtxCancelAll(t *testing.T) { // Request add funds again - should merge with waiting add funds request _, _, addFundsErr2 = mgr.GetPaych(addFundsCtx2, from, to, big.NewInt(3)) - require.NoError(t, err) }() // Wait for add funds requests to be queued up waitForQueueSize(t, mgr, from, to, 2) @@ -950,6 +952,7 @@ func TestPaychAvailableFunds(t *testing.T) { defer addFundsSent.Done() // Request add funds - should block until create channel has completed + var err error _, addFundsMcid, err = mgr.GetPaych(ctx, from, to, addFundsAmt) require.NoError(t, err) }() diff --git a/paychmgr/simple.go b/paychmgr/simple.go index 25307560454..afa1ae1f704 100644 --- a/paychmgr/simple.go +++ b/paychmgr/simple.go @@ -101,10 +101,13 @@ type mergedFundsReq struct { func newMergedFundsReq(reqs []*fundsReq) *mergedFundsReq { ctx, cancel := context.WithCancel(context.Background()) + + rqs := make([]*fundsReq, len(reqs)) + copy(rqs, reqs) m := &mergedFundsReq{ ctx: ctx, cancel: cancel, - reqs: reqs, + reqs: rqs, } for _, r := range m.reqs { @@ -201,7 +204,7 @@ func (ca *channelAccessor) processQueue(channelID string) (*api.ChannelAvailable // Merge all pending requests into one. // For example if there are pending requests for 3, 2, 4 then // amt = 3 + 2 + 4 = 9 - merged := newMergedFundsReq(ca.fundsReqQueue[:]) + merged := newMergedFundsReq(ca.fundsReqQueue) amt := merged.sum() if amt.IsZero() { // Note: The amount can be zero if requests are cancelled as we're