From b48a93c483c8238bbc363a8e2eb2b05dbe74cb87 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Wed, 29 Apr 2015 18:01:51 +0100
Subject: [PATCH] Remove obsolete connsIterator

---
 router/peers.go | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/router/peers.go b/router/peers.go
index 640479c4..851031dc 100644
--- a/router/peers.go
+++ b/router/peers.go
@@ -217,20 +217,19 @@ func (peers *Peers) decodeUpdate(update []byte) (newPeers map[PeerName]*Peer, de
 		}
 	}
 
+
 	for _, connSummaries := range decodedConns {
-		connsIterator(connSummaries, func(remoteNameByte []byte, _ string, _, _ bool) {
-			remoteName := PeerNameFromBin(remoteNameByte)
+		for _, connSummary := range connSummaries {
+			remoteName := PeerNameFromBin(connSummary.NameByte)
 			if _, found := newPeers[remoteName]; found {
-				return
+				continue
 			}
 			if _, found := peers.table[remoteName]; found {
-				return
+				continue
 			}
 			// Update refers to a peer which we have no knowledge
 			// of. Thus we can't apply the update. Abort.
 			err = UnknownPeerError{remoteName}
-		})
-		if err != nil {
 			return
 		}
 	}
@@ -310,19 +309,13 @@ func decodePeer(dec *gob.Decoder) (nameByte []byte, nickName string, uid uint64,
 	return
 }
 
-func connsIterator(connSummaries []ConnectionSummary, fun func([]byte, string, bool, bool)) {
-	for _, connSummary := range connSummaries {
-		fun(connSummary.NameByte, connSummary.RemoteTCPAddr, connSummary.Outbound, connSummary.Established)
-	}
-}
-
 func makeConnsMap(peer *Peer, connSummaries []ConnectionSummary, table map[PeerName]*Peer) map[PeerName]Connection {
 	conns := make(map[PeerName]Connection)
-	connsIterator(connSummaries, func(nameByte []byte, remoteTCPAddr string, outbound bool, established bool) {
-		name := PeerNameFromBin(nameByte)
+	for _, connSummary := range connSummaries {
+		name := PeerNameFromBin(connSummary.NameByte)
 		remotePeer := table[name]
-		conn := NewRemoteConnection(peer, remotePeer, remoteTCPAddr, outbound, established)
+		conn := NewRemoteConnection(peer, remotePeer, connSummary.RemoteTCPAddr, connSummary.Outbound, connSummary.Established)
 		conns[name] = conn
-	})
+	}
 	return conns
 }