diff options
| author | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2018-09-25 22:57:31 +0800 |
| commit | 24349144b6c0642755569268bab56b9033743212 (patch) | |
| tree | 9d9d2b6659fd8a56512dfc807aafe4b733165ae1 /cmd/swarm/run_test.go | |
| parent | 7d56602391e155e2ce9ba7c261300a1804ab9972 (diff) | |
| parent | d3441ebb563439bac0837d70591f92e2c6080303 (diff) | |
| download | go-tangerine-24349144b6c0642755569268bab56b9033743212.tar go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.gz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.bz2 go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.lz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.xz go-tangerine-24349144b6c0642755569268bab56b9033743212.tar.zst go-tangerine-24349144b6c0642755569268bab56b9033743212.zip | |
Merge branch 'master' into max-stream-peer-servers
Diffstat (limited to 'cmd/swarm/run_test.go')
| -rw-r--r-- | cmd/swarm/run_test.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 3e766dc10..e2f54c8ff 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -234,6 +234,7 @@ func existingTestNode(t *testing.T, dir string, bzzaccount string) *testNode { // start the node node.Cmd = runSwarm(t, "--port", p2pPort, + "--nat", "extip:127.0.0.1", "--nodiscover", "--datadir", dir, "--ipcpath", conf.IPCPath, @@ -241,7 +242,7 @@ func existingTestNode(t *testing.T, dir string, bzzaccount string) *testNode { "--bzzaccount", bzzaccount, "--bzznetworkid", "321", "--bzzport", httpPort, - "--verbosity", "6", + "--verbosity", "3", ) node.Cmd.InputLine(testPassphrase) defer func() { @@ -284,8 +285,8 @@ func existingTestNode(t *testing.T, dir string, bzzaccount string) *testNode { if err := node.Client.Call(&nodeInfo, "admin_nodeInfo"); err != nil { t.Fatal(err) } - node.Enode = fmt.Sprintf("enode://%s@127.0.0.1:%s", nodeInfo.ID, p2pPort) - + node.Enode = nodeInfo.Enode + node.IpcPath = conf.IPCPath return node } @@ -309,6 +310,7 @@ func newTestNode(t *testing.T, dir string) *testNode { // start the node node.Cmd = runSwarm(t, "--port", p2pPort, + "--nat", "extip:127.0.0.1", "--nodiscover", "--datadir", dir, "--ipcpath", conf.IPCPath, @@ -316,7 +318,7 @@ func newTestNode(t *testing.T, dir string) *testNode { "--bzzaccount", account.Address.String(), "--bzznetworkid", "321", "--bzzport", httpPort, - "--verbosity", "6", + "--verbosity", "3", ) node.Cmd.InputLine(testPassphrase) defer func() { @@ -359,9 +361,8 @@ func newTestNode(t *testing.T, dir string) *testNode { if err := node.Client.Call(&nodeInfo, "admin_nodeInfo"); err != nil { t.Fatal(err) } - node.Enode = fmt.Sprintf("enode://%s@127.0.0.1:%s", nodeInfo.ID, p2pPort) + node.Enode = nodeInfo.Enode node.IpcPath = conf.IPCPath - return node } |