Cleanup piecemeal

autopilot/graph.go

@@ -12,6 +12,7 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2/ecdsa"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightningnetwork/lnd/channeldb"
+	"github.com/lightningnetwork/lnd/channeldb/models"
 	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing/route"
@@ -53,6 +54,8 @@ func ChannelGraphFromDatabase(db *channeldb.ChannelGraph) ChannelGraph {
 // channeldb.LightningNode. The wrapper method implement the autopilot.Node
 // interface.
 type dbNode struct {
+	db kvdb.Backend
+
 	tx kvdb.RTx
 
 	node *channeldb.LightningNode
@@ -86,8 +89,9 @@ func (d dbNode) Addrs() []net.Addr {
 //
 // NOTE: Part of the autopilot.Node interface.
 func (d dbNode) ForEachChannel(cb func(ChannelEdge) error) error {
-	return d.node.ForEachChannel(d.tx, func(tx kvdb.RTx,
-		ei *channeldb.ChannelEdgeInfo, ep, _ *channeldb.ChannelEdgePolicy) error {
+	return d.node.ForEachChannel(d.db, d.tx, func(db kvdb.Backend,
+		tx kvdb.RTx, ei models.ChannelEdgeInfo, ep,
+		_ *channeldb.ChannelEdgePolicyWithNode) error {
 
 		// Skip channels for which no outgoing edge policy is available.
 		//
@@ -102,8 +106,9 @@ func (d dbNode) ForEachChannel(cb func(ChannelEdge) error) error {
 
 		edge := ChannelEdge{
 			ChanID:   lnwire.NewShortChanIDFromInt(ep.ChannelID),
-			Capacity: ei.Capacity,
+			Capacity: ei.GetCapacity(),
 			Peer: dbNode{
+				db:   db,
 				tx:   tx,
 				node: ep.Node,
 			},
@@ -128,6 +133,7 @@ func (d *databaseChannelGraph) ForEachNode(cb func(Node) error) error {
 		}
 
 		node := dbNode{
+			db:   d.db.DB(),
 			tx:   tx,
 			node: n,
 		}
@@ -222,41 +228,49 @@ func (d *databaseChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
 	}
 
 	chanID := randChanID()
-	edge := &channeldb.ChannelEdgeInfo{
+	edge := &channeldb.ChannelEdgeInfo1{
 		ChannelID: chanID.ToUint64(),
 		Capacity:  capacity,
 	}
 	edge.AddNodeKeys(lnNode1, lnNode2, lnNode1, lnNode2)
 	if err := d.db.AddChannelEdge(edge); err != nil {
 		return nil, nil, err
 	}
-	edgePolicy := &channeldb.ChannelEdgePolicy{
-		SigBytes:                  testSig.Serialize(),
-		ChannelID:                 chanID.ToUint64(),
-		LastUpdate:                time.Now(),
-		TimeLockDelta:             10,
-		MinHTLC:                   1,
-		MaxHTLC:                   lnwire.NewMSatFromSatoshis(capacity),
-		FeeBaseMSat:               10,
-		FeeProportionalMillionths: 10000,
-		MessageFlags:              1,
-		ChannelFlags:              0,
+	edgePolicy := &channeldb.ChannelEdgePolicyWithNode{
+		ChannelEdgePolicy1: channeldb.ChannelEdgePolicy1{
+			SigBytes:      testSig.Serialize(),
+			ChannelID:     chanID.ToUint64(),
+			LastUpdate:    time.Now(),
+			TimeLockDelta: 10,
+			MinHTLC:       1,
+			MaxHTLC: lnwire.NewMSatFromSatoshis(
+				capacity,
+			),
+			FeeBaseMSat:               10,
+			FeeProportionalMillionths: 10000,
+			MessageFlags:              1,
+			ChannelFlags:              0,
+		},
 	}
 
 	if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil {
 		return nil, nil, err
 	}
-	edgePolicy = &channeldb.ChannelEdgePolicy{
-		SigBytes:                  testSig.Serialize(),
-		ChannelID:                 chanID.ToUint64(),
-		LastUpdate:                time.Now(),
-		TimeLockDelta:             10,
-		MinHTLC:                   1,
-		MaxHTLC:                   lnwire.NewMSatFromSatoshis(capacity),
-		FeeBaseMSat:               10,
-		FeeProportionalMillionths: 10000,
-		MessageFlags:              1,
-		ChannelFlags:              1,
+	edgePolicy = &channeldb.ChannelEdgePolicyWithNode{
+		ChannelEdgePolicy1: channeldb.ChannelEdgePolicy1{
+			SigBytes:      testSig.Serialize(),
+			ChannelID:     chanID.ToUint64(),
+			LastUpdate:    time.Now(),
+			TimeLockDelta: 10,
+			MinHTLC:       1,
+			MaxHTLC: lnwire.NewMSatFromSatoshis(
+				capacity,
+			),
+			FeeBaseMSat:               10,
+			FeeProportionalMillionths: 10000,
+			MessageFlags:              1,
+			ChannelFlags:              1,
+		},
 	}
 	if err := d.db.UpdateEdgePolicy(edgePolicy); err != nil {
 		return nil, nil, err
@@ -267,13 +281,15 @@ func (d *databaseChannelGraph) addRandChannel(node1, node2 *btcec.PublicKey,
 			Capacity: capacity,
 			Peer: dbNode{
 				node: vertex1,
+				db:   d.db.DB(),
 			},
 		},
 		&ChannelEdge{
 			ChanID:   chanID,
 			Capacity: capacity,
 			Peer: dbNode{
 				node: vertex2,
+				db:   d.db.DB(),
 			},
 		},
 		nil

channeldb/channel_cache_test.go

@@ -98,7 +98,7 @@ func assertHasChanEntries(t *testing.T, c *channelCache, start, end uint64) {
 // channelForInt generates a unique ChannelEdge given an integer.
 func channelForInt(i uint64) ChannelEdge {
 	return ChannelEdge{
-		Info: &ChannelEdgeInfo{
+		Info: &ChannelEdgeInfo1{
 			ChannelID: i,
 		},
 	}