From d1c46e3ddef27e5712cfaebf3f630fed43197376 Mon Sep 17 00:00:00 2001
From: Anton Evangelatov <anton.evangelatov@gmail.com>
Date: Tue, 27 Mar 2018 19:01:08 +0200
Subject: [PATCH] swarm: do not cache newService()

---
 swarm/network/kademlia.go |  7 ++++---
 swarm/pss/pss_test.go     | 12 +++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go
index d2200a6d42..e1888ca85c 100644
--- a/swarm/network/kademlia.go
+++ b/swarm/network/kademlia.go
@@ -17,6 +17,7 @@
 package network
 
 import (
+	"bytes"
 	"fmt"
 	"math/rand"
 	"strings"
@@ -182,9 +183,9 @@ func (k *Kademlia) Register(peers []OverlayAddr) error {
 	for _, p := range peers {
 		// error if self received, peer should know better
 		// and should be punished for this
-		//if bytes.Equal(p.Address(), k.base) {
-		//return fmt.Errorf("add peers: %x is self", k.base)
-		//}
+		if bytes.Equal(p.Address(), k.base) {
+			return fmt.Errorf("add peers: %x is self", k.base)
+		}
 		var found bool
 		k.addrs, _, found, _ = pot.Swap(k.addrs, p, pof, func(v pot.Val) pot.Val {
 			// if not found
diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go
index f689b683e5..54b3c0988a 100644
--- a/swarm/pss/pss_test.go
+++ b/swarm/pss/pss_test.go
@@ -57,13 +57,11 @@ var (
 	useHandshake     bool
 )
 
-var services = newServices()
-
 func init() {
 	flag.Parse()
 	rand.Seed(time.Now().Unix())
 
-	adapters.RegisterServices(services)
+	adapters.RegisterServices(newServices())
 	initTest()
 }
 
@@ -677,11 +675,11 @@ func testNetwork(t *testing.T) {
 		}
 		a = adapters.NewExecAdapter(dirname)
 	} else if adapter == "sock" {
-		a = adapters.NewSocketAdapter(services)
+		a = adapters.NewSocketAdapter(newServices())
 	} else if adapter == "tcp" {
-		a = adapters.NewTCPAdapter(services)
+		a = adapters.NewTCPAdapter(newServices())
 	} else if adapter == "sim" {
-		a = adapters.NewSimAdapter(services)
+		a = adapters.NewSimAdapter(newServices())
 	}
 	net := simulations.NewNetwork(a, &simulations.NetworkConfig{
 		ID: "0",
@@ -1082,7 +1080,7 @@ func setupNetwork(numnodes int) (clients []*rpc.Client, err error) {
 	if numnodes < 2 {
 		return nil, fmt.Errorf("Minimum two nodes in network")
 	}
-	adapter := adapters.NewSimAdapter(services)
+	adapter := adapters.NewSimAdapter(newServices())
 	net := simulations.NewNetwork(adapter, &simulations.NetworkConfig{
 		ID:             "0",
 		DefaultService: "bzz",