diff options
| author | lash <nolash@users.noreply.github.com> | 2019-03-23 04:37:25 +0800 |
|---|---|---|
| committer | Viktor Trón <viktor.tron@gmail.com> | 2019-03-23 04:37:25 +0800 |
| commit | 2f5b6cb442dd1ab20279603de938e5b60e3122fb (patch) | |
| tree | 1637681558132f2b1064e7d774b9ca63047f72a4 /swarm/network/simulations | |
| parent | 876f3573647f9a62d94073b342bc678f380f0304 (diff) | |
| download | go-tangerine-2f5b6cb442dd1ab20279603de938e5b60e3122fb.tar go-tangerine-2f5b6cb442dd1ab20279603de938e5b60e3122fb.tar.gz go-tangerine-2f5b6cb442dd1ab20279603de938e5b60e3122fb.tar.bz2 go-tangerine-2f5b6cb442dd1ab20279603de938e5b60e3122fb.tar.lz go-tangerine-2f5b6cb442dd1ab20279603de938e5b60e3122fb.tar.xz go-tangerine-2f5b6cb442dd1ab20279603de938e5b60e3122fb.tar.zst go-tangerine-2f5b6cb442dd1ab20279603de938e5b60e3122fb.zip | |
swarm/network: Use different privatekey for bzz overlay in sim (#19313)
* cmd/swarm, p2p, swarm: Enable ENR in binary/execadapter
* cmd/p2p/swarm: Remove comments + config.Enode nomarshal
* p2p/simulations: Remove superfluous error check
* p2p/simulation: Move init enode comment
* swarm, p2p/simulations, cmd/swarm: Use nodekey in binary record sign
* swarm/network, swarm/pss: Dervice bzzkey
* swarm/pss: Remove unused function
* swarm/network: Store swarm private key in simulation bucket
* swarm/pss: Shorten TextProxNetwork shortrunning test timeout
* swarm/pss: Increase prox test timeout
* swarm/pss: Increase timeout slightly on shortrunning proxtest
* swarm/network: Simplify bucket instantiation in servicectx func
* p2p/simulations: Tcpport -> udpport
* swarm/network, swarm/pss: Simplify + correct lock in servicefunc sim
* swarm/network: Cleanup after rebase on extract swarm enode new
* p2p/simulations, swarm/network: Make exec disc test pass
* swarm/network: Prune ye olde comment
* swarm/pss: Correct revised bzzkey method call
* swarm/network: Clarify comment about privatekey generation data
* swarm/pss: Fix syntax errors after rebase
* swarm/network: Rename misleadingly named method
(amend commit to trigger ci - attempt 5)
Diffstat (limited to 'swarm/network/simulations')
| -rw-r--r-- | swarm/network/simulations/discovery/discovery_test.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/swarm/network/simulations/discovery/discovery_test.go b/swarm/network/simulations/discovery/discovery_test.go index 1ad9ac2e9..99a0c7722 100644 --- a/swarm/network/simulations/discovery/discovery_test.go +++ b/swarm/network/simulations/discovery/discovery_test.go @@ -131,7 +131,6 @@ func BenchmarkDiscovery_128_4(b *testing.B) { benchmarkDiscovery(b, 128, 4) } func BenchmarkDiscovery_256_4(b *testing.B) { benchmarkDiscovery(b, 256, 4) } func TestDiscoverySimulationExecAdapter(t *testing.T) { - t.Skip("This is left broken pending ENR preparations for swarm binary. Execadapter is not currently in use, so a short pause won't hurt") testDiscoverySimulationExecAdapter(t, *nodeCount, *initCount) } |