refactor: simplify NewPeers

weaveworks · Jul 11, 2015 · 7aab5cc · 7aab5cc
1 parent 2b61bc9
commit 7aab5cc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/router/peers.go b/router/peers.go
@@ -39,11 +39,8 @@ type ConnectionSummary struct {
 	Established   bool
 }
 
-func NewPeers(ourself *LocalPeer, onGC func(*Peer)) *Peers {
-	return &Peers{
-		ourself: ourself,
-		table:   make(map[PeerName]*Peer),
-		onGC:    []func(*Peer){onGC}}
+func NewPeers(ourself *LocalPeer) *Peers {
+	return &Peers{ourself: ourself, table: make(map[PeerName]*Peer)}
 }
 
 func (peers *Peers) OnGC(callback func(*Peer)) {

diff --git a/router/peers_test.go b/router/peers_test.go
@@ -19,7 +19,7 @@ import (
 
 func newNode(name PeerName) (*Peer, *Peers) {
 	peer := NewLocalPeer(name, "", nil)
-	peers := NewPeers(peer, func(*Peer) {})
+	peers := NewPeers(peer)
 	peers.FetchWithDefault(peer.Peer)
 	return peer.Peer, peers
 }

diff --git a/router/router.go b/router/router.go
@@ -74,7 +74,8 @@ func NewRouter(config Config, name PeerName, nickName string) *Router {
 	}
 	router.Ourself = NewLocalPeer(name, nickName, router)
 	router.Macs = NewMacCache(macMaxAge, onMacExpiry)
-	router.Peers = NewPeers(router.Ourself, onPeerGC)
+	router.Peers = NewPeers(router.Ourself)
+	router.Peers.OnGC(onPeerGC)
 	router.Peers.FetchWithDefault(router.Ourself.Peer)
 	router.Routes = NewRoutes(router.Ourself, router.Peers)
 	router.ConnectionMaker = NewConnectionMaker(router.Ourself, router.Peers, router.Port, router.PeerDiscovery)