highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-12-19 20:25:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

htlcswitch: Remove constructor functions for htlcPacket.

Browse Source 
The constructor functions have no additional logic other than passing
function parameters into struct fields. Given the large function
signatures, it is more clear to directly construct the htlcPacket in
client code than call a function with lots of positional arguments.
This commit is contained in:
Jim Posen
2017-10-23 23:18:26 -07:00
committed by Olaoluwa Osuntokun
parent bead1ba31d
commit bc8d674958
4 changed files with 106 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
htlcswitch/switch.go
View File

@@ -202,7 +202,10 @@ func (s *Switch) SendHTLC(nextNode [33]byte, htlc *lnwire.UpdateAddHTLC,
// Generate and send new update packet, if error will be received on
// this stage it means that packet haven't left boundaries of our
// system and something wrong happened.
packet := newInitPacket(nextNode, htlc)
packet := &htlcPacket{
destNode: nextNode,
htlc: htlc,
}
if err := s.forward(packet); err != nil {
s.removePendingPayment(payment.amount, payment.paymentHash)
return zeroPreimage, err
@@ -477,13 +480,14 @@ func (s *Switch) handlePacketForward(packet *htlcPacket) error {
return err
}
source.HandleSwitchPacket(newFailPacket(
packet.src,
&lnwire.UpdateFailHTLC{
source.HandleSwitchPacket(&htlcPacket{
src: packet.src,
payHash: htlc.PaymentHash,
isObfuscated: true,
htlc: &lnwire.UpdateFailHTLC{
Reason: reason,
},
htlc.PaymentHash, 0, true,
))
})
err = errors.Errorf("unable to find link with "+
"destination %v", packet.dest)
log.Error(err)
@@ -524,14 +528,14 @@ func (s *Switch) handlePacketForward(packet *htlcPacket) error {
return err
}
source.HandleSwitchPacket(newFailPacket(
packet.src,
&lnwire.UpdateFailHTLC{
source.HandleSwitchPacket(&htlcPacket{
src: packet.src,
payHash: htlc.PaymentHash,
isObfuscated: true,
htlc: &lnwire.UpdateFailHTLC{
Reason: reason,
},
htlc.PaymentHash,
0, true,
))
})
err = errors.Errorf("unable to find appropriate "+
"channel link insufficient capacity, need "+
@@ -558,13 +562,14 @@ func (s *Switch) handlePacketForward(packet *htlcPacket) error {
return err
}
source.HandleSwitchPacket(newFailPacket(
packet.src,
&lnwire.UpdateFailHTLC{
source.HandleSwitchPacket(&htlcPacket{
src: packet.src,
payHash: htlc.PaymentHash,
isObfuscated: true,
htlc: &lnwire.UpdateFailHTLC{
Reason: reason,
},
htlc.PaymentHash, 0, true,
))
})
err = errors.Errorf("unable to add circuit: "+
"%v", err)
log.Error(err)