From e0d94b545c8ff208d417d2a856905f151af13c95 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Mon, 26 Dec 2016 22:00:35 -0600
Subject: [PATCH] channeldb: return true for HasChannelEdge unconditionally if
 edge exists

This commit modifies the HasChannelEdge function to _always_ return
true if we know of the channel edge, meaning that it was previously
added on announce.

This change fixes a minor bug present in the code which would result in
extraneous re-transmissions of updates received by the new routing
package.
---
 channeldb/graph.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/channeldb/graph.go b/channeldb/graph.go
index 72dd0d17d..38ab863e1 100644
--- a/channeldb/graph.go
+++ b/channeldb/graph.go
@@ -439,7 +439,7 @@ func (c *ChannelGraph) HasChannelEdge(chanID uint64) (time.Time, time.Time, bool
 		exists          bool
 	)
 
-	err := c.db.View(func(tx *bolt.Tx) error {
+	if err := c.db.View(func(tx *bolt.Tx) error {
 		edges := tx.Bucket(edgeBucket)
 		if edges == nil {
 			return ErrGraphNoEdgesFound
@@ -456,6 +456,8 @@ func (c *ChannelGraph) HasChannelEdge(chanID uint64) (time.Time, time.Time, bool
 			return nil
 		}
 
+		exists = true
+
 		// If the channel has been found in the graph, then retrieve
 		// the edges itself so we can return the last updated
 		// timestmaps.
@@ -469,21 +471,18 @@ func (c *ChannelGraph) HasChannelEdge(chanID uint64) (time.Time, time.Time, bool
 		if err != nil {
 			// TODO(roasbeef): hack fix to return false until both
 			// edges are populated
-			exists = false
 			return nil
 		}
 
 		node1UpdateTime = e1.LastUpdate
 		node2UpdateTime = e2.LastUpdate
-		exists = true
 
 		return nil
-	})
-	if err != nil {
+	}); err != nil {
 		return time.Time{}, time.Time{}, exists, err
 	}
 
-	return node1UpdateTime, node2UpdateTime, exists, err
+	return node1UpdateTime, node2UpdateTime, exists, nil
 }
 
 const (
@@ -889,6 +888,8 @@ func (c *ChannelGraph) HasLightningNode(pub *btcec.PublicKey) (time.Time, bool,
 // Otherwise the first argument should be nil and a fresh transaction will be
 // created to execute the graph traversal.
 func (l *LightningNode) ForEachChannel(tx *bolt.Tx, cb func(*ChannelEdge) error) error {
+	// TODO(roasbeef): remove the option to pass in a transaction after
+	// all?
 	nodePub := l.PubKey.SerializeCompressed()
 
 	traversal := func(tx *bolt.Tx) error {