Simplify

prog/weaver/http.go

@@ -40,19 +40,15 @@ var rootTemplate = template.New("root").Funcs(map[string]interface{}{
 		getNickName := func(peer mesh.PeerName) string {
 			name, found := status.Nicknames[peer]
 			if !found {
-				return fmt.Sprintf("%s", peer)
+				return peer.String()
 			}
 			return name
 		}
 		getOrCreateNicknameStats := func(peer mesh.PeerName) *NicknameStats {
 			peerName := getNickName(peer)
 			stats, found := nicknameStats[peerName]
 			if !found {
-				stats = &NicknameStats{
-					Ranges:    []address.Range{},
-					Addresses: []address.Address{},
-					Reachable: status.IsKnownPeer(peer),
-				}
+				stats = &NicknameStats{Reachable: status.IsKnownPeer(peer)}
 				nicknameStats[peerName] = stats
 			}
 			return stats
@@ -68,31 +64,25 @@ var rootTemplate = template.New("root").Funcs(map[string]interface{}{
 			stats.Ranges = append(stats.Ranges, ranges...)
 		}
 
-		appendAddresses := func(displayName string, reachable bool, addresses []address.Address, ranges []address.Range) {
+		ourNickname := getNickName(status.OurName)
+
+		// and then the rest
+		for nickname, stats := range nicknameStats {
+			if nickname == ourNickname {
+				nickname = "(local)"
+			}
 			reachableStr := ""
-			if !reachable {
+			if !stats.Reachable {
 				reachableStr = "- unreachable!"
 			}
 			ipsInRange := 0
-			for _, chunk := range ranges {
+			for _, chunk := range stats.Ranges {
 				ipsInRange += int(chunk.Size())
 			}
 			percentageRanges := float32(ipsInRange) * 100.0 / float32(status.RangeNumIPs)
 
 			fmt.Fprintf(&buffer, "%20s: %8d IPs (%04.1f%% of universe, in %3d ranges) - used: %8d IPs %s\n",
-				displayName, ipsInRange, percentageRanges, len(ranges), len(addresses), reachableStr)
-		}
-
-		// print the local addresses
-		ourNickname := getNickName(status.OurName)
-		ourStats := nicknameStats[ourNickname]
-		appendAddresses("(local)", true, ourStats.Addresses, ourStats.Ranges)
-
-		// and then the rest
-		for nickname, stats := range nicknameStats {
-			if nickname != ourNickname {
-				appendAddresses(nickname, stats.Reachable, stats.Addresses, stats.Ranges)
-			}
+				nickname, ipsInRange, percentageRanges, len(stats.Ranges), len(stats.Addresses), reachableStr)
 		}
 
 		return buffer.String()