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

htlcswitch: refactor handleLocalDispatch

Browse Source 
Move creation of the goroutine as a preparation for sync local routing
This commit is contained in:
Joost Jager 2020-04-13 13:28:52 +02:00
parent b6915d9fbf
commit 341308327e
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
1 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
htlcswitch/switch.go
View File

@ -774,49 +774,37 @@ func (s *Switch) routeAsync(packet *htlcPacket, errChan chan error,
} }
} }
// handleLocalDispatch is used at the start/end of the htlc update life cycle. // handleLocalUpdateAddDispatch is used at the start of the htlc update life
// At the start (1) it is used to send the htlc to the channel link without // cycle. It is used to send the htlc to the channel link without creation of
// creation of circuit. At the end (2) it is used to notify the user about the // circuit.
// result of his payment is it was successful or not. func (s *Switch) handleLocalUpdateAddDispatch(pkt *htlcPacket) error {
// htlc, ok := pkt.htlc.(*lnwire.UpdateAddHTLC)
// Alice Bob Carol if !ok {
// o --add----> o ---add----> o return errors.New("not an UpdateAdd packet")
// (1)
//
// (2)
// o <-settle-- o <--settle-- o
// Alice Bob Carol
//
func (s *Switch) handleLocalDispatch(pkt *htlcPacket) error {
// User have created the htlc update therefore we should find the
// appropriate channel link and send the payment over this link.
if htlc, ok := pkt.htlc.(*lnwire.UpdateAddHTLC); ok {
link, err := s.handleLocalAddHTLC(pkt, htlc)
if err != nil {
// Notify the htlc notifier of a link failure on our
// outgoing link. Incoming timelock/amount values are
// not set because they are not present for local sends.
s.cfg.HtlcNotifier.NotifyLinkFailEvent(
newHtlcKey(pkt),
HtlcInfo{
OutgoingTimeLock: htlc.Expiry,
OutgoingAmt: htlc.Amount,
},
HtlcEventTypeSend,
err,
false,
)
return err
}
return link.HandleSwitchPacket(pkt)
} }
s.wg.Add(1) // User have created the htlc update therefore we should find the
go s.handleLocalResponse(pkt) // appropriate channel link and send the payment over this link.
link, err := s.handleLocalAddHTLC(pkt, htlc)
if err != nil {
// Notify the htlc notifier of a link failure on our
// outgoing link. Incoming timelock/amount values are
// not set because they are not present for local sends.
s.cfg.HtlcNotifier.NotifyLinkFailEvent(
newHtlcKey(pkt),
HtlcInfo{
OutgoingTimeLock: htlc.Expiry,
OutgoingAmt: htlc.Amount,
},
HtlcEventTypeSend,
err,
false,
)
return nil return err
}
return link.HandleSwitchPacket(pkt)
} }
// handleLocalAddHTLC handles the addition of a htlc for a send that // handleLocalAddHTLC handles the addition of a htlc for a send that
@ -1065,7 +1053,7 @@ func (s *Switch) handlePacketForward(packet *htlcPacket) error {
if packet.incomingChanID == hop.Source { if packet.incomingChanID == hop.Source {
// A blank incomingChanID indicates that this is // A blank incomingChanID indicates that this is
// a pending user-initiated payment. // a pending user-initiated payment.
return s.handleLocalDispatch(packet) return s.handleLocalUpdateAddDispatch(packet)
} }
// Before we attempt to find a non-strict forwarding path for // Before we attempt to find a non-strict forwarding path for
@ -1268,7 +1256,9 @@ func (s *Switch) handlePacketForward(packet *htlcPacket) error {
// A blank IncomingChanID in a circuit indicates that it is a pending // A blank IncomingChanID in a circuit indicates that it is a pending
// user-initiated payment. // user-initiated payment.
if packet.incomingChanID == hop.Source { if packet.incomingChanID == hop.Source {
return s.handleLocalDispatch(packet) s.wg.Add(1)
go s.handleLocalResponse(packet)
return nil
} }
// Check to see that the source link is online before removing // Check to see that the source link is online before removing