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/pss: enable pss tests

Browse source
This commit is contained in:
Anton Evangelatov 2018-03-27 18:13:16 +02:00
parent 539806da93
commit cf49adf400
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
swarm/network/kademlia.go
View file

@ -17,7 +17,6 @@
package network package network
import ( import (
"bytes"
"fmt" "fmt"
"math/rand" "math/rand"
"strings" "strings"
@ -183,9 +182,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

8
swarm/pss/pss_test.go
View file

@ -635,7 +635,7 @@ func worker(id int, jobs <-chan Job, rpcs map[discover.NodeID]*rpc.Client, pubke
// params in run name: // params in run name:
// nodes/msgs/addrbytes/adaptertype // nodes/msgs/addrbytes/adaptertype
// if adaptertype is exec uses execadapter, simadapter otherwise // if adaptertype is exec uses execadapter, simadapter otherwise
func XTestNetwork(t *testing.T) { func TestNetwork(t *testing.T) {
t.Run("3/2000/4/sock", testNetwork) t.Run("3/2000/4/sock", testNetwork)
t.Run("4/2000/4/sock", testNetwork) t.Run("4/2000/4/sock", testNetwork)
t.Run("8/2000/4/sock", testNetwork) t.Run("8/2000/4/sock", testNetwork)
@ -706,6 +706,8 @@ func testNetwork(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
time.Sleep(1 * time.Second)
triggerChecks := func(trigger chan discover.NodeID, id discover.NodeID, rpcclient *rpc.Client, topic string) error { triggerChecks := func(trigger chan discover.NodeID, id discover.NodeID, rpcclient *rpc.Client, topic string) error {
msgC := make(chan APIMsg) msgC := make(chan APIMsg)
ctx, cancel := context.WithTimeout(context.Background(), time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Second)
@ -764,12 +766,16 @@ func testNetwork(t *testing.T) {
} }
} }
time.Sleep(1 * time.Second)
// setup workers // setup workers
jobs := make(chan Job, 10) jobs := make(chan Job, 10)
for w := 1; w <= 10; w++ { for w := 1; w <= 10; w++ {
go worker(w, jobs, rpcs, pubkeys, topic) go worker(w, jobs, rpcs, pubkeys, topic)
} }
time.Sleep(1 * time.Second)
for i := 0; i < int(msgcount); i++ { for i := 0; i < int(msgcount); i++ {
sendnodeidx := rand.Intn(int(nodecount)) sendnodeidx := rand.Intn(int(nodecount))
recvnodeidx := rand.Intn(int(nodecount - 1)) recvnodeidx := rand.Intn(int(nodecount - 1))