forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/pss: issue 1308 fixed

Browse source
This commit is contained in:
Vlad 2019-03-25 12:26:09 +01:00
parent acbb8a1439
commit 557c081e46
1 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
swarm/pss/prox_test.go
View file

@ -6,8 +6,6 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt" "fmt"
"strconv"
"strings"
"sync" "sync"
"testing" "testing"
"time" "time"
@ -89,24 +87,6 @@ func (d *testData) setDone() {
d.handlerDone = true d.handlerDone = true
} }
func getCmdParams(t *testing.T) (int, int, time.Duration) {
args := strings.Split(t.Name(), "/")
msgCount, err := strconv.ParseInt(args[2], 10, 16)
if err != nil {
t.Fatal(err)
}
nodeCount, err := strconv.ParseInt(args[1], 10, 16)
if err != nil {
t.Fatal(err)
}
timeoutStr := fmt.Sprintf("%ss", args[3])
timeoutDur, err := time.ParseDuration(timeoutStr)
if err != nil {
t.Fatal(err)
}
return int(msgCount), int(nodeCount), timeoutDur
}
func newTestData() *testData { func newTestData() *testData {
return &testData{ return &testData{
kademlias: make(map[enode.ID]*network.Kademlia), kademlias: make(map[enode.ID]*network.Kademlia),
@ -213,7 +193,9 @@ func (d *testData) init(msgCount int) error {
// nodes Y and Z will be considered required recipients of the msg, // nodes Y and Z will be considered required recipients of the msg,
// whereas nodes X, Y and Z will be allowed recipients. // whereas nodes X, Y and Z will be allowed recipients.
func TestProxNetwork(t *testing.T) { func TestProxNetwork(t *testing.T) {
t.Run("16/16/15", testProxNetwork) t.Run("short", func(t *testing.T) {
testProxNetwork(t, 16, 16, 16)
})
} }
// params in run name: nodes/msgs // params in run name: nodes/msgs
@ -221,22 +203,31 @@ func TestProxNetworkLong(t *testing.T) {
if !*longrunning { if !*longrunning {
t.Skip("run with --longrunning flag to run extensive network tests") t.Skip("run with --longrunning flag to run extensive network tests")
} }
t.Run("8/100/30", testProxNetwork) t.Run("longrunning1", func(t *testing.T) {
t.Run("16/100/30", testProxNetwork) testProxNetwork(t, 8, 100, 30)
t.Run("32/100/60", testProxNetwork) })
t.Run("64/100/60", testProxNetwork) t.Run("longrunning2", func(t *testing.T) {
t.Run("128/100/120", testProxNetwork) testProxNetwork(t, 16, 100, 30)
})
t.Run("longrunning3", func(t *testing.T) {
testProxNetwork(t, 32, 100, 60)
})
t.Run("longrunning4", func(t *testing.T) {
testProxNetwork(t, 64, 100, 60)
})
t.Run("longrunning5", func(t *testing.T) {
testProxNetwork(t, 128, 100, 120)
})
} }
func testProxNetwork(t *testing.T) { func testProxNetwork(t *testing.T, msgCount int, nodeCount int, timeout int) {
tstdata := newTestData() tstdata := newTestData()
msgCount, nodeCount, timeout := getCmdParams(t)
handlerContextFuncs := make(map[Topic]handlerContextFunc) handlerContextFuncs := make(map[Topic]handlerContextFunc)
handlerContextFuncs[topic] = nodeMsgHandler handlerContextFuncs[topic] = nodeMsgHandler
services := newProxServices(tstdata, true, handlerContextFuncs, tstdata.kademlias) services := newProxServices(tstdata, true, handlerContextFuncs, tstdata.kademlias)
tstdata.sim = simulation.New(services) tstdata.sim = simulation.New(services)
defer tstdata.sim.Close() defer tstdata.sim.Close()
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(context.Background(), time.Second * time.Duration(timeout))
defer cancel() defer cancel()
filename := fmt.Sprintf("testdata/snapshot_%d.json", nodeCount) filename := fmt.Sprintf("testdata/snapshot_%d.json", nodeCount)
err := tstdata.sim.UploadSnapshot(ctx, filename) err := tstdata.sim.UploadSnapshot(ctx, filename)