highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-10-06 22:43:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

routing+routerrpc: remove redudant error check

Browse Source 
Since `SendPaymentAsync` now never returns an error, there's no need to
catch it and check it in `SendPaymentV2`.
This commit is contained in:
yyforyongyu
2024-01-05 18:11:04 +08:00
parent 708bd05df3
commit 58677569b5
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lnrpc/routerrpc/router_server.go
View File

@@ -347,30 +347,13 @@ func (s *Server) SendPaymentV2(req *SendPaymentRequest,
return err return err
} }
// Send the payment. // Send the payment asynchronously.
err = s.cfg.Router.SendPaymentAsync(payment, paySession, shardTracker) s.cfg.Router.SendPaymentAsync(payment, paySession, shardTracker)
if err == nil {
// If the payment was sent successfully, we can start tracking
// the events.
return s.trackPayment(
sub, payHash, stream, req.NoInflightUpdates,
)
}
// Otherwise, transform user errors to grpc code. // Track the payment and return.
if errors.Is(err, channeldb.ErrPaymentInFlight) || return s.trackPayment(
errors.Is(err, channeldb.ErrAlreadyPaid) { sub, payHash, stream, req.NoInflightUpdates,
)
log.Debugf("SendPayment async result for payment %x: %v",
payment.Identifier(), err)
return status.Error(codes.AlreadyExists, err.Error())
}
log.Errorf("SendPayment async error for payment %x: %v",
payment.Identifier(), err)
return err
} }
// EstimateRouteFee allows callers to obtain a lower bound w.r.t how much it // EstimateRouteFee allows callers to obtain a lower bound w.r.t how much it

4
routing/router.go
View File

@@ -2386,7 +2386,7 @@ func (r *ChannelRouter) SendPayment(payment *LightningPayment) ([32]byte,
// SendPaymentAsync is the non-blocking version of SendPayment. The payment // SendPaymentAsync is the non-blocking version of SendPayment. The payment
// result needs to be retrieved via the control tower. // result needs to be retrieved via the control tower.
func (r *ChannelRouter) SendPaymentAsync(payment *LightningPayment, func (r *ChannelRouter) SendPaymentAsync(payment *LightningPayment,
ps PaymentSession, st shards.ShardTracker) error { ps PaymentSession, st shards.ShardTracker) {
// Since this is the first time this payment is being made, we pass nil // Since this is the first time this payment is being made, we pass nil
// for the existing attempt. // for the existing attempt.
@@ -2406,8 +2406,6 @@ func (r *ChannelRouter) SendPaymentAsync(payment *LightningPayment,
payment.Identifier(), err) payment.Identifier(), err)
} }
}() }()
return nil
} }
// spewPayment returns a log closures that provides a spewed string // spewPayment returns a log closures that provides a spewed string