forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm: do not cache newService()

Browse source
This commit is contained in:
Anton Evangelatov 2018-03-27 19:01:08 +02:00
parent cf49adf400
commit d1c46e3dde
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
swarm/network/kademlia.go
View file

@ -17,6 +17,7 @@
package network package network
import ( import (
"bytes"
"fmt" "fmt"
"math/rand" "math/rand"
"strings" "strings"
@ -182,9 +183,9 @@ func (k *Kademlia) Register(peers []OverlayAddr) error {
for _, p := range peers { for _, p := range peers {
// error if self received, peer should know better // error if self received, peer should know better
// and should be punished for this // and should be punished for this
//if bytes.Equal(p.Address(), k.base) { if bytes.Equal(p.Address(), k.base) {
//return fmt.Errorf("add peers: %x is self", k.base) return fmt.Errorf("add peers: %x is self", k.base)
//} }
var found bool var found bool
k.addrs, _, found, _ = pot.Swap(k.addrs, p, pof, func(v pot.Val) pot.Val { k.addrs, _, found, _ = pot.Swap(k.addrs, p, pof, func(v pot.Val) pot.Val {
// if not found // if not found

12
swarm/pss/pss_test.go
View file

@ -57,13 +57,11 @@ var (
useHandshake bool useHandshake bool
) )
var services = newServices()
func init() { func init() {
flag.Parse() flag.Parse()
rand.Seed(time.Now().Unix()) rand.Seed(time.Now().Unix())
adapters.RegisterServices(services) adapters.RegisterServices(newServices())
initTest() initTest()
} }
@ -677,11 +675,11 @@ func testNetwork(t *testing.T) {
} }
a = adapters.NewExecAdapter(dirname) a = adapters.NewExecAdapter(dirname)
} else if adapter == "sock" { } else if adapter == "sock" {
a = adapters.NewSocketAdapter(services) a = adapters.NewSocketAdapter(newServices())
} else if adapter == "tcp" { } else if adapter == "tcp" {
a = adapters.NewTCPAdapter(services) a = adapters.NewTCPAdapter(newServices())
} else if adapter == "sim" { } else if adapter == "sim" {
a = adapters.NewSimAdapter(services) a = adapters.NewSimAdapter(newServices())
} }
net := simulations.NewNetwork(a, &simulations.NetworkConfig{ net := simulations.NewNetwork(a, &simulations.NetworkConfig{
ID: "0", ID: "0",
@ -1082,7 +1080,7 @@ func setupNetwork(numnodes int) (clients []*rpc.Client, err error) {
if numnodes < 2 { if numnodes < 2 {
return nil, fmt.Errorf("Minimum two nodes in network") return nil, fmt.Errorf("Minimum two nodes in network")
} }
adapter := adapters.NewSimAdapter(services) adapter := adapters.NewSimAdapter(newServices())
net := simulations.NewNetwork(adapter, &simulations.NetworkConfig{ net := simulations.NewNetwork(adapter, &simulations.NetworkConfig{
ID: "0", ID: "0",
DefaultService: "bzz", DefaultService: "bzz",