From a670272a372ee61b9f2f5f0f2922b14eb5516819 Mon Sep 17 00:00:00 2001
From: David Wragg <david@wragg.org>
Date: Wed, 18 Mar 2015 12:04:22 +0000
Subject: [PATCH] Remove name parameter from (*Peers)ForEach consumer function

It's part of the Peer anyway.
---
 router/connection_maker.go | 2 +-
 router/json.go             | 2 +-
 router/peers.go            | 8 ++++----
 router/routes.go           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/router/connection_maker.go b/router/connection_maker.go
index d9820abb..61417feb 100644
--- a/router/connection_maker.go
+++ b/router/connection_maker.go
@@ -132,7 +132,7 @@ func (cm *ConnectionMaker) checkStateAndAttemptConnections() time.Duration {
 
 	// Add targets for peers that someone else is connected to, but we
 	// aren't
-	cm.peers.ForEach(func(name PeerName, peer *Peer) {
+	cm.peers.ForEach(func(peer *Peer) {
 		for _, conn := range peer.Connections() {
 			otherPeer := conn.Remote().Name
 			if otherPeer == cm.ourself.Name || ourConnectedPeers[otherPeer] {
diff --git a/router/json.go b/router/json.go
index 81407fff..07e538e5 100644
--- a/router/json.go
+++ b/router/json.go
@@ -36,7 +36,7 @@ func (cache *MacCache) MarshalJSON() ([]byte, error) {
 
 func (peers *Peers) MarshalJSON() ([]byte, error) {
 	var ps []*Peer
-	peers.ForEach(func(_ PeerName, peer *Peer) { ps = append(ps, peer) })
+	peers.ForEach(func(peer *Peer) { ps = append(ps, peer) })
 	return json.Marshal(ps)
 }
 
diff --git a/router/peers.go b/router/peers.go
index 62963e34..5edf5639 100644
--- a/router/peers.go
+++ b/router/peers.go
@@ -55,11 +55,11 @@ func (peers *Peers) Fetch(name PeerName) (*Peer, bool) {
 	return peer, found // GRRR, why can't I inline this!?
 }
 
-func (peers *Peers) ForEach(fun func(PeerName, *Peer)) {
+func (peers *Peers) ForEach(fun func(*Peer)) {
 	peers.RLock()
 	defer peers.RUnlock()
-	for name, peer := range peers.table {
-		fun(name, peer)
+	for _, peer := range peers.table {
+		fun(peer)
 	}
 }
 
@@ -129,7 +129,7 @@ func (peers *Peers) GarbageCollect() []*Peer {
 
 func (peers *Peers) String() string {
 	var buf bytes.Buffer
-	peers.ForEach(func(name PeerName, peer *Peer) {
+	peers.ForEach(func(peer *Peer) {
 		fmt.Fprint(&buf, peer, "\n")
 		for _, conn := range peer.Connections() {
 			established := ""
diff --git a/router/routes.go b/router/routes.go
index 8a20e62f..2c99e034 100644
--- a/router/routes.go
+++ b/router/routes.go
@@ -124,7 +124,7 @@ func (routes *Routes) calculateBroadcast() map[PeerName][]PeerName {
 	broadcast := make(map[PeerName][]PeerName)
 	ourself := routes.ourself
 
-	routes.peers.ForEach(func(name PeerName, peer *Peer) {
+	routes.peers.ForEach(func(peer *Peer) {
 		hops := []PeerName{}
 		if found, reached := peer.Routes(ourself, true); found {
 			// This is rather similar to the inner loop on
@@ -143,7 +143,7 @@ func (routes *Routes) calculateBroadcast() map[PeerName][]PeerName {
 				}
 			}
 		}
-		broadcast[name] = hops
+		broadcast[peer.Name] = hops
 	})
 	return broadcast
 }