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

routing: newRoute now expects the path in forwards order

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-03-20 18:11:22 -07:00
parent 9f96ceb1e0
commit fd18c2d036
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
routing/pathfind.go
View File

@ -109,8 +109,8 @@ func computeFee(amt btcutil.Amount, edge *ChannelHop) btcutil.Amount {
// computed. If the route is too long, or the selected path cannot support the // computed. If the route is too long, or the selected path cannot support the
// fully payment including fees, then a non-nil error is returned. // fully payment including fees, then a non-nil error is returned.
// //
// NOTE: The passed slice of ChannelHops MUST be sorted in reverse order: from // NOTE: The passed slice of ChannelHops MUST be sorted in forward order: from
// the target to the source node of the path finding aattempt. // the source to the target node of the path finding attempt.
func newRoute(amtToSend btcutil.Amount, pathEdges []*ChannelHop) (*Route, error) { func newRoute(amtToSend btcutil.Amount, pathEdges []*ChannelHop) (*Route, error) {
route := &Route{ route := &Route{
Hops: make([]*Hop, len(pathEdges)), Hops: make([]*Hop, len(pathEdges)),
@ -122,7 +122,9 @@ func newRoute(amtToSend btcutil.Amount, pathEdges []*ChannelHop) (*Route, error)
// larger as we compute the fees going backwards. // larger as we compute the fees going backwards.
runningAmt := amtToSend runningAmt := amtToSend
pathLength := len(pathEdges) pathLength := len(pathEdges)
for i, edge := range pathEdges { for i := pathLength - 1; i >= 0; i-- {
edge := pathEdges[i]
// Now we create the hop struct for this point in the route. // Now we create the hop struct for this point in the route.
// The amount to forward is the running amount, and we compute // The amount to forward is the running amount, and we compute
// the required fee based on this amount. // the required fee based on this amount.
@ -164,10 +166,7 @@ func newRoute(amtToSend btcutil.Amount, pathEdges []*ChannelHop) (*Route, error)
route.TotalTimeLock += uint32(nextHop.TimeLockDelta) route.TotalTimeLock += uint32(nextHop.TimeLockDelta)
// Finally, as we're currently talking the route backwards, we route.Hops[i] = nextHop
// reverse the index in order to place this hop at the proper
// spot in the forward direction of the route.
route.Hops[pathLength-1-i] = nextHop
} }
// The total amount required for this route will be the value the // The total amount required for this route will be the value the