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

swarm/pss: use Duration type for timeouts instead of int

Browse source
This commit is contained in:
Ferenc Szabo 2019-04-11 17:12:33 +02:00 committed by gluk256
parent 76c776d1b9
commit 0e6abad325
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
swarm/pss/prox_test.go
View file

@ -207,7 +207,7 @@ func (d *testData) init(msgCount int) error {
// 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_nodes,_16_messages,_16_seconds", func(t *testing.T) { t.Run("16_nodes,_16_messages,_16_seconds", func(t *testing.T) {
testProxNetwork(t, 16, 16, 16) testProxNetwork(t, 16, 16, 3*time.Second)
}) })
} }
@ -217,30 +217,30 @@ func TestProxNetworkLong(t *testing.T) {
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_nodes,_100_messages,_30_seconds", func(t *testing.T) { t.Run("8_nodes,_100_messages,_30_seconds", func(t *testing.T) {
testProxNetwork(t, 8, 100, 30) testProxNetwork(t, 8, 100, 30*time.Second)
}) })
t.Run("16_nodes,_100_messages,_30_seconds", func(t *testing.T) { t.Run("16_nodes,_100_messages,_30_seconds", func(t *testing.T) {
testProxNetwork(t, 16, 100, 30) testProxNetwork(t, 16, 100, 30*time.Second)
}) })
t.Run("32_nodes,_100_messages,_60_seconds", func(t *testing.T) { t.Run("32_nodes,_100_messages,_60_seconds", func(t *testing.T) {
testProxNetwork(t, 32, 100, 60) testProxNetwork(t, 32, 100, 1*time.Minute)
}) })
t.Run("64_nodes,_100_messages,_60_seconds", func(t *testing.T) { t.Run("64_nodes,_100_messages,_60_seconds", func(t *testing.T) {
testProxNetwork(t, 64, 100, 60) testProxNetwork(t, 64, 100, 1*time.Minute)
}) })
t.Run("128_nodes,_100_messages,_120_seconds", func(t *testing.T) { t.Run("128_nodes,_100_messages,_120_seconds", func(t *testing.T) {
testProxNetwork(t, 128, 100, 120) testProxNetwork(t, 128, 100, 2*time.Minute)
}) })
} }
func testProxNetwork(t *testing.T, nodeCount int, msgCount int, timeout int) { func testProxNetwork(t *testing.T, nodeCount int, msgCount int, timeout time.Duration) {
td := newTestData() td := newTestData()
handlerContextFuncs := make(map[Topic]handlerContextFunc) handlerContextFuncs := make(map[Topic]handlerContextFunc)
handlerContextFuncs[topic] = nodeMsgHandler handlerContextFuncs[topic] = nodeMsgHandler
services := newProxServices(td, true, handlerContextFuncs, td.kademlias) services := newProxServices(td, true, handlerContextFuncs, td.kademlias)
td.sim = simulation.New(services) td.sim = simulation.New(services)
defer td.sim.Close() defer td.sim.Close()
ctx, cancel := context.WithTimeout(context.Background(), time.Second*time.Duration(timeout)) ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel() defer cancel()
filename := fmt.Sprintf("testdata/snapshot_%d.json", nodeCount) filename := fmt.Sprintf("testdata/snapshot_%d.json", nodeCount)
err := td.sim.UploadSnapshot(ctx, filename) err := td.sim.UploadSnapshot(ctx, filename)