routing: Add context to requestRoute
This commit is contained in:
2 files changed
+6
-8
No files matched your search
@@ -288,7 +288,7 @@ lifecycle:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Now request a route to be used to create our HTLC attempt.
|
// Now request a route to be used to create our HTLC attempt.
|
||||||
rt, err := p.requestRoute(ps)
|
rt, err := p.requestRoute(cleanupCtx, ps)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return exitWithErr(err)
|
return exitWithErr(err)
|
||||||
}
|
}
|
||||||
@@ -399,11 +399,9 @@ func (p *paymentLifecycle) checkContext(ctx context.Context) error {
|
|||||||
|
|
||||||
// requestRoute is responsible for finding a route to be used to create an HTLC
|
// requestRoute is responsible for finding a route to be used to create an HTLC
|
||||||
// attempt.
|
// attempt.
|
||||||
func (p *paymentLifecycle) requestRoute(
|
func (p *paymentLifecycle) requestRoute(ctx context.Context,
|
||||||
ps *paymentsdb.MPPaymentState) (*route.Route, error) {
|
ps *paymentsdb.MPPaymentState) (*route.Route, error) {
|
||||||
|
|
||||||
ctx := context.TODO()
|
|
||||||
|
|
||||||
remainingFees := p.calcFeeBudget(ps.FeesPaid)
|
remainingFees := p.calcFeeBudget(ps.FeesPaid)
|
||||||
|
|
||||||
// Query our payment session to construct a route.
|
// Query our payment session to construct a route.
|
||||||
|
|||||||
@@ -393,7 +393,7 @@ func TestRequestRouteSucceed(t *testing.T) {
|
|||||||
mock.Anything,
|
mock.Anything,
|
||||||
).Return(dummyRoute, nil)
|
).Return(dummyRoute, nil)
|
||||||
|
|
||||||
result, err := p.requestRoute(ps)
|
result, err := p.requestRoute(t.Context(), ps)
|
||||||
require.NoError(t, err, "expect no error")
|
require.NoError(t, err, "expect no error")
|
||||||
require.Equal(t, dummyRoute, result, "returned route not matched")
|
require.Equal(t, dummyRoute, result, "returned route not matched")
|
||||||
|
|
||||||
@@ -430,7 +430,7 @@ func TestRequestRouteHandleCriticalErr(t *testing.T) {
|
|||||||
mock.Anything,
|
mock.Anything,
|
||||||
).Return(nil, errDummy)
|
).Return(nil, errDummy)
|
||||||
|
|
||||||
result, err := p.requestRoute(ps)
|
result, err := p.requestRoute(t.Context(), ps)
|
||||||
|
|
||||||
// Expect an error is returned since it's critical.
|
// Expect an error is returned since it's critical.
|
||||||
require.ErrorIs(t, err, errDummy, "error not matched")
|
require.ErrorIs(t, err, errDummy, "error not matched")
|
||||||
@@ -470,7 +470,7 @@ func TestRequestRouteHandleNoRouteErr(t *testing.T) {
|
|||||||
p.identifier, paymentsdb.FailureReasonNoRoute,
|
p.identifier, paymentsdb.FailureReasonNoRoute,
|
||||||
).Return(nil).Once()
|
).Return(nil).Once()
|
||||||
|
|
||||||
result, err := p.requestRoute(ps)
|
result, err := p.requestRoute(t.Context(), ps)
|
||||||
|
|
||||||
// Expect no error is returned since it's not critical.
|
// Expect no error is returned since it's not critical.
|
||||||
require.NoError(t, err, "expected no error")
|
require.NoError(t, err, "expected no error")
|
||||||
@@ -513,7 +513,7 @@ func TestRequestRouteFailPaymentError(t *testing.T) {
|
|||||||
mock.Anything,
|
mock.Anything,
|
||||||
).Return(nil, errNoTlvPayload)
|
).Return(nil, errNoTlvPayload)
|
||||||
|
|
||||||
result, err := p.requestRoute(ps)
|
result, err := p.requestRoute(t.Context(), ps)
|
||||||
|
|
||||||
// Expect an error is returned.
|
// Expect an error is returned.
|
||||||
require.ErrorIs(t, err, errDummy, "error not matched")
|
require.ErrorIs(t, err, errDummy, "error not matched")
|
||||||
|
|||||||
Reference in new issue
Block a user