From 637444cafb71514bf3b4184d97eb02ecc6a8fe8d Mon Sep 17 00:00:00 2001 From: Elad Nachmias Date: Thu, 6 Dec 2018 15:10:04 +0530 Subject: [PATCH] fix goimports --- cmd/swarm/swarm-smoke/feed_upload_and_sync.go | 11 +++++------ cmd/swarm/swarm-smoke/upload_and_sync.go | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go index 4ab0b72d36..150a4ada64 100644 --- a/cmd/swarm/swarm-smoke/feed_upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/feed_upload_and_sync.go @@ -3,7 +3,6 @@ package main import ( "bytes" "crypto/md5" - "crypto/tls" "fmt" "io" "io/ioutil" @@ -314,12 +313,12 @@ func fetchFeed(topic string, user string, endpoint string, original []byte, ruid req, _ := http.NewRequest("GET", reqUri, nil) trace := &httptrace.ClientTrace{ GetConn: func(_ string) { log.Trace("http get request (feed) - GetConn") }, - GotConn: func(_GotConnInfo) { log.Trace("http get request (feed) - GotConn") }, + GotConn: func(_ httptrace.GotConnInfo) { log.Trace("http get request (feed) - GotConn") }, PutIdleConn: func(err error) { log.Trace("http get request (feed) - PutIdleConn", "err", err) }, GotFirstResponseByte: func() { log.Trace("http get request (feed) - GotFirstResponseByte") }, Got100Continue: func() { log.Trace("http get request (feed) - Got100Continue") }, - DNSStart: func(_ DNSStartInfo) { log.Trace("http get request (feed) - DNSStart") }, - DNSDone: func(_ DNSDoneInfo) { log.Trace("http get request (feed) - DNSDone") }, + DNSStart: func(_ httptrace.DNSStartInfo) { log.Trace("http get request (feed) - DNSStart") }, + DNSDone: func(_ httptrace.DNSDoneInfo) { log.Trace("http get request (feed) - DNSDone") }, ConnectStart: func(network, addr string) { log.Trace("http get request (feed) - ConnectStart", "network", network, "addr", addr) }, @@ -330,11 +329,11 @@ func fetchFeed(topic string, user string, endpoint string, original []byte, ruid WroteHeaders: func() { log.Trace("http get request (feed) - WroteHeaders(request)") }, Wait100Continue: func() { log.Trace("http get request (feed) - Wait100Continue") }, - WroteRequest: func(_ WroteRequestInfo) { log.Trace("http get request (feed) - WroteRequest") }, + WroteRequest: func(_ httptrace.WroteRequestInfo) { log.Trace("http get request (feed) - WroteRequest") }, } req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace)) transport := http.DefaultTransport - transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} + //transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} res, err := transport.RoundTrip(req) if err != nil { diff --git a/cmd/swarm/swarm-smoke/upload_and_sync.go b/cmd/swarm/swarm-smoke/upload_and_sync.go index af037f1f0d..084716df95 100644 --- a/cmd/swarm/swarm-smoke/upload_and_sync.go +++ b/cmd/swarm/swarm-smoke/upload_and_sync.go @@ -20,7 +20,6 @@ import ( "bytes" "crypto/md5" crand "crypto/rand" - "crypto/tls" "errors" "fmt" "io" @@ -145,12 +144,12 @@ func fetch(hash string, endpoint string, original []byte, ruid string) error { req, _ := http.NewRequest("GET", reqUri, nil) trace := &httptrace.ClientTrace{ GetConn: func(_ string) { log.Trace("http get request - GetConn") }, - GotConn: func(_GotConnInfo) { log.Trace("http get request - GotConn") }, + GotConn: func(_ httptrace.GotConnInfo) { log.Trace("http get request - GotConn") }, PutIdleConn: func(err error) { log.Trace("http get request - PutIdleConn", "err", err) }, GotFirstResponseByte: func() { log.Trace("http get request - GotFirstResponseByte") }, Got100Continue: func() { log.Trace("http get request - Got100Continue") }, - DNSStart: func(_ DNSStartInfo) { log.Trace("http get request - DNSStart") }, - DNSDone: func(_ DNSDoneInfo) { log.Trace("http get request - DNSDone") }, + DNSStart: func(_ httptrace.DNSStartInfo) { log.Trace("http get request - DNSStart") }, + DNSDone: func(_ httptrace.DNSDoneInfo) { log.Trace("http get request - DNSDone") }, ConnectStart: func(network, addr string) { log.Trace("http get request - ConnectStart", "network", network, "addr", addr) }, @@ -160,11 +159,11 @@ func fetch(hash string, endpoint string, original []byte, ruid string) error { WroteHeaders: func() { log.Trace("http get request - WroteHeaders(request)") }, Wait100Continue: func() { log.Trace("http get request - Wait100Continue") }, - WroteRequest: func(_ WroteRequestInfo) { log.Trace("http get request - WroteRequest") }, + WroteRequest: func(_ httptrace.WroteRequestInfo) { log.Trace("http get request - WroteRequest") }, } req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace)) transport := http.DefaultTransport - transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} + //transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} res, err := transport.RoundTrip(req) if err != nil { log.Error(err.Error(), "ruid", ruid)