aboutsummaryrefslogtreecommitdiffstats
path: root/swarm
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-11-25 20:22:53 +0800
committerGitHub <noreply@github.com>2016-11-25 20:22:53 +0800
commit9c3ea0d32d26957fd73ddf07e37d93091de596fd (patch)
treeccae1f1af7462b1364df3fabde6b90ea16c90377 /swarm
parent66441c9b4b5fce27ea6d7883f21b9890c9af65cb (diff)
parent67e0894d9e696be32d7b5f78bb6f89ed0e03f382 (diff)
downloadgo-tangerine-9c3ea0d32d26957fd73ddf07e37d93091de596fd.tar
go-tangerine-9c3ea0d32d26957fd73ddf07e37d93091de596fd.tar.gz
go-tangerine-9c3ea0d32d26957fd73ddf07e37d93091de596fd.tar.bz2
go-tangerine-9c3ea0d32d26957fd73ddf07e37d93091de596fd.tar.lz
go-tangerine-9c3ea0d32d26957fd73ddf07e37d93091de596fd.tar.xz
go-tangerine-9c3ea0d32d26957fd73ddf07e37d93091de596fd.tar.zst
go-tangerine-9c3ea0d32d26957fd73ddf07e37d93091de596fd.zip
Merge pull request #3346 from obscuren/registrar-removal
common/registrar, eth: removed registrar (tech debt)
Diffstat (limited to 'swarm')
-rw-r--r--swarm/api/http/roundtripper_test.go10
1 files changed, 4 insertions, 6 deletions
diff --git a/swarm/api/http/roundtripper_test.go b/swarm/api/http/roundtripper_test.go
index 9afad20ae..fc74f5d3a 100644
--- a/swarm/api/http/roundtripper_test.go
+++ b/swarm/api/http/roundtripper_test.go
@@ -22,8 +22,6 @@ import (
"strings"
"testing"
"time"
-
- "github.com/ethereum/go-ethereum/common/httpclient"
)
const port = "3222"
@@ -41,10 +39,10 @@ func TestRoundTripper(t *testing.T) {
go http.ListenAndServe(":"+port, serveMux)
rt := &RoundTripper{Port: port}
- client := httpclient.New("/")
- client.RegisterProtocol("bzz", rt)
-
- resp, err := client.Client().Get("bzz://test.com/path")
+ trans := &http.Transport{}
+ trans.RegisterProtocol("bzz", rt)
+ client := &http.Client{Transport: trans}
+ resp, err := client.Get("bzz://test.com/path")
if err != nil {
t.Errorf("expected no error, got %v", err)
return