akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

routing/router: remove sendToSwitch method

Browse Source
This commit is contained in:
Johan T. Halseth 2019-05-16 15:27:28 +02:00
parent c9e8ff6a34
commit ed81cec0fa
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
routing/router.go
View File

@ -1670,24 +1670,6 @@ func (r *ChannelRouter) sendPaymentAttempt(paySession *paymentSession,
}), }),
) )
preimage, err := r.sendToSwitch(route, paymentHash)
if err == nil {
return preimage, true, nil
}
log.Errorf("Attempt to send payment %x failed: %v",
paymentHash, err)
finalOutcome := r.processSendError(paySession, route, err)
return [32]byte{}, finalOutcome, err
}
// sendToSwitch sends a payment along the specified route and returns the
// obtained preimage.
func (r *ChannelRouter) sendToSwitch(route *route.Route, paymentHash [32]byte) (
[32]byte, error) {
// Generate the raw encoded sphinx packet to be included along // Generate the raw encoded sphinx packet to be included along
// with the htlcAdd message that we send directly to the // with the htlcAdd message that we send directly to the
// switch. // switch.
@ -1695,7 +1677,7 @@ func (r *ChannelRouter) sendToSwitch(route *route.Route, paymentHash [32]byte) (
route, paymentHash[:], route, paymentHash[:],
) )
if err != nil { if err != nil {
return [32]byte{}, err return [32]byte{}, true, err
} }
// Craft an HTLC packet to send to the layer 2 switch. The // Craft an HTLC packet to send to the layer 2 switch. The
@ -1726,12 +1708,22 @@ func (r *ChannelRouter) sendToSwitch(route *route.Route, paymentHash [32]byte) (
// this HTLC. // this HTLC.
paymentID, err := r.cfg.NextPaymentID() paymentID, err := r.cfg.NextPaymentID()
if err != nil { if err != nil {
return [32]byte{}, err return [32]byte{}, true, err
} }
return r.cfg.Payer.SendHTLC( preimage, err := r.cfg.Payer.SendHTLC(
firstHop, paymentID, htlcAdd, errorDecryptor, firstHop, paymentID, htlcAdd, errorDecryptor,
) )
if err == nil {
return preimage, true, nil
}
log.Errorf("Attempt to send payment %x failed: %v",
paymentHash, err)
finalOutcome := r.processSendError(paySession, route, err)
return [32]byte{}, finalOutcome, err
} }
// processSendError analyzes the error for the payment attempt received from the // processSendError analyzes the error for the payment attempt received from the