From 97fb90c37af733c8cadd77c638261f4d029badb6 Mon Sep 17 00:00:00 2001
From: David Wragg <david@wragg.org>
Date: Wed, 10 Jun 2015 08:01:37 +0100
Subject: [PATCH] Always include local peer in Peers

---
 router/peers.go      | 4 +++-
 router/peers_test.go | 1 -
 router/router.go     | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/router/peers.go b/router/peers.go
index 144bc1a4..b3db6726 100644
--- a/router/peers.go
+++ b/router/peers.go
@@ -32,7 +32,9 @@ type ConnectionSummary struct {
 }
 
 func NewPeers(ourself *LocalPeer) *Peers {
-	return &Peers{ourself: ourself, table: make(map[PeerName]*Peer)}
+	peers := &Peers{ourself: ourself, table: make(map[PeerName]*Peer)}
+	peers.FetchWithDefault(ourself.Peer)
+	return peers
 }
 
 func (peers *Peers) OnGC(callback func(*Peer)) {
diff --git a/router/peers_test.go b/router/peers_test.go
index 698502ad..3d7ab95e 100644
--- a/router/peers_test.go
+++ b/router/peers_test.go
@@ -20,7 +20,6 @@ import (
 func newNode(name PeerName) (*Peer, *Peers) {
 	peer := NewLocalPeer(name, "", nil)
 	peers := NewPeers(peer)
-	peers.FetchWithDefault(peer.Peer)
 	return peer.Peer, peers
 }
 
diff --git a/router/router.go b/router/router.go
index 6b0d27a3..12cbf008 100644
--- a/router/router.go
+++ b/router/router.go
@@ -73,7 +73,6 @@ func NewRouter(config Config, name PeerName, nickName string) *Router {
 	router.Macs = NewMacCache(macMaxAge, onMacExpiry)
 	router.Peers = NewPeers(router.Ourself)
 	router.Peers.OnGC(onPeerGC)
-	router.Peers.FetchWithDefault(router.Ourself.Peer)
 	router.Routes = NewRoutes(router.Ourself, router.Peers, router.Overlay.InvalidateRoutes)
 	router.ConnectionMaker = NewConnectionMaker(router.Ourself, router.Peers, router.Port, router.PeerDiscovery)
 	router.TopologyGossip = router.NewGossip("topology", router)