From 7408aa6c8d1fe6489699ba8baf6316bcc385ad84 Mon Sep 17 00:00:00 2001 From: Laura Cressman Date: Fri, 3 Nov 2017 17:42:02 -0400 Subject: [PATCH] config+pathfind_test+notifications_test: format and fix newVertex import Run go fmt so config file is formatted correctly. Also rename newVertex to NewVertex in pathfind_test and notifications_test as it is now exported from the routing package. --- config.go | 1 - routing/notifications_test.go | 12 ++++++------ routing/pathfind_test.go | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config.go b/config.go index 92db6eca..45e5a192 100644 --- a/config.go +++ b/config.go @@ -131,7 +131,6 @@ type config struct { NoNetBootstrap bool `long:"nobootstrap" description:"If true, then automatic network bootstrapping will not be attempted."` - NoEncryptWallet bool `long:"noencryptwallet" description:"If set, wallet will be encrypted using the default passphrase."` TrickleDelay int `long:"trickledelay" description:"Time in milliseconds between each release of announcements to the network"` diff --git a/routing/notifications_test.go b/routing/notifications_test.go index 871fa85c..8b0cb434 100644 --- a/routing/notifications_test.go +++ b/routing/notifications_test.go @@ -450,8 +450,8 @@ func TestEdgeUpdateNotification(t *testing.T) { // Create lookup map for notifications we are intending to receive. Entries // are removed from the map when the anticipated notification is received. var waitingFor = map[Vertex]int{ - newVertex(node1.PubKey): 1, - newVertex(node2.PubKey): 2, + NewVertex(node1.PubKey): 1, + NewVertex(node2.PubKey): 2, } const numEdgePolicies = 2 @@ -466,7 +466,7 @@ func TestEdgeUpdateNotification(t *testing.T) { } edgeUpdate := ntfn.ChannelEdgeUpdates[0] - nodeVertex := newVertex(edgeUpdate.AdvertisingNode) + nodeVertex := NewVertex(edgeUpdate.AdvertisingNode) if idx, ok := waitingFor[nodeVertex]; ok { switch idx { @@ -609,8 +609,8 @@ func TestNodeUpdateNotification(t *testing.T) { // Create lookup map for notifications we are intending to receive. Entries // are removed from the map when the anticipated notification is received. var waitingFor = map[Vertex]int{ - newVertex(node1.PubKey): 1, - newVertex(node2.PubKey): 2, + NewVertex(node1.PubKey): 1, + NewVertex(node2.PubKey): 2, } // Exactly two notifications should be sent, each corresponding to the @@ -627,7 +627,7 @@ func TestNodeUpdateNotification(t *testing.T) { } nodeUpdate := ntfn.NodeUpdates[0] - nodeVertex := newVertex(nodeUpdate.IdentityKey) + nodeVertex := NewVertex(nodeUpdate.IdentityKey) if idx, ok := waitingFor[nodeVertex]; ok { switch idx { case 1: diff --git a/routing/pathfind_test.go b/routing/pathfind_test.go index b05eda43..8f1c3afb 100644 --- a/routing/pathfind_test.go +++ b/routing/pathfind_test.go @@ -300,7 +300,7 @@ func TestBasicGraphPathFinding(t *testing.T) { if err != nil { t.Fatalf("unable to fetch source node: %v", err) } - sourceVertex := newVertex(sourceNode.PubKey) + sourceVertex := NewVertex(sourceNode.PubKey) ignoredEdges := make(map[uint64]struct{}) ignoredVertexes := make(map[Vertex]struct{})