From ff443a389b80167e194c4b2320fbddfe4aa93190 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Thu, 19 Dec 2019 03:35:16 -0800
Subject: [PATCH] routing/pathfind_test: constructed sorted edge policies

This commit fixes a potential bug in our test harness, by ensuring that
the constructed node policies are configured _after_ sorting. Currently
the node pubkeys are sorted, but additional parameters (max htlc,
disabled, etc) are applied using the unsorted policies.

Most of the constructors used today use the symmetric channel
constructor, so this shouldn't cause an issue with the majority of our
tests. We recently introduced an asymmetric channel constructor for
which this could have been an issue, however, no known issues were
discovered.

Lastly, we remove the direction from the configuration altogether, and
derive it purely from the final sorting of the pubkeys.
---
 routing/pathfind_test.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/routing/pathfind_test.go b/routing/pathfind_test.go
index acff0d2bb..1e2cbb32f 100644
--- a/routing/pathfind_test.go
+++ b/routing/pathfind_test.go
@@ -339,7 +339,6 @@ type testChannelPolicy struct {
 	FeeRate     lnwire.MilliSatoshi
 	LastUpdate  time.Time
 	Disabled    bool
-	Direction   bool
 	Features    *lnwire.FeatureVector
 }
 
@@ -359,7 +358,6 @@ func symmetricTestChannel(alias1, alias2 string, capacity btcutil.Amount,
 	}
 
 	policy2 := *policy
-	policy2.Direction = !policy.Direction
 
 	return asymmetricTestChannel(
 		alias1, alias2, capacity, policy, &policy2, id,
@@ -554,18 +552,16 @@ func createTestGraphFromChannels(testChannels []*testChannel, source string) (
 			return nil, err
 		}
 
-		if testChannel.Node1.testChannelPolicy != nil {
+		if node1.testChannelPolicy != nil {
 			var msgFlags lnwire.ChanUpdateMsgFlags
-			if testChannel.Node1.MaxHTLC != 0 {
+			if node1.MaxHTLC != 0 {
 				msgFlags |= lnwire.ChanUpdateOptionMaxHtlc
 			}
 			var channelFlags lnwire.ChanUpdateChanFlags
-			if testChannel.Node1.Disabled {
+			if node1.Disabled {
 				channelFlags |= lnwire.ChanUpdateDisabled
 			}
-			if testChannel.Node1.Direction {
-				channelFlags |= lnwire.ChanUpdateDirection
-			}
+
 			edgePolicy := &channeldb.ChannelEdgePolicy{
 				SigBytes:                  testSig.Serialize(),
 				MessageFlags:              msgFlags,
@@ -583,18 +579,17 @@ func createTestGraphFromChannels(testChannels []*testChannel, source string) (
 			}
 		}
 
-		if testChannel.Node2.testChannelPolicy != nil {
+		if node2.testChannelPolicy != nil {
 			var msgFlags lnwire.ChanUpdateMsgFlags
-			if testChannel.Node2.MaxHTLC != 0 {
+			if node2.MaxHTLC != 0 {
 				msgFlags |= lnwire.ChanUpdateOptionMaxHtlc
 			}
-			channelFlags := lnwire.ChanUpdateChanFlags(0)
-			if testChannel.Node2.Disabled {
+			var channelFlags lnwire.ChanUpdateChanFlags
+			if node2.Disabled {
 				channelFlags |= lnwire.ChanUpdateDisabled
 			}
-			if testChannel.Node2.Direction {
-				channelFlags |= lnwire.ChanUpdateDirection
-			}
+			channelFlags |= lnwire.ChanUpdateDirection
+
 			edgePolicy := &channeldb.ChannelEdgePolicy{
 				SigBytes:                  testSig.Serialize(),
 				MessageFlags:              msgFlags,