Rename some HTTP identifiers to Http

I believe the Go convention on this is bad, and this names them inline with the style used elsewhere in anacrolix/torrent with Ip for example.

Unfortunately it's pretty widespread, so I've only changed the recent additions.

diff --git a/config.go b/config.go
index f640e1a4a5984d0fc204579ba0aa62e823f99ec1..7e4fa37cbe5c04bb26e7896efbc51afd84b298a7 100644 (file)
--- a/config.go
+++ b/config.go
@@ -102,9 +102,9 @@ type ClientConfig struct {
        LookupTrackerIp func(*url.URL) ([]net.IP, error)
        // HTTPUserAgent changes default UserAgent for HTTP requests
        HTTPUserAgent string
-       // HTTPRequestDirector modifies the request before it's sent.
+       // HttpRequestDirector modifies the request before it's sent.
        // Useful for adding authentication headers, for example
-       HTTPRequestDirector func(*http.Request) error
+       HttpRequestDirector func(*http.Request) error
        // Updated occasionally to when there's been some changes to client
        // behaviour in case other clients are assuming anything of us. See also
        // `bep20`.

diff --git a/tracker/http/http.go b/tracker/http/http.go
index 3c4d9052f2c944c48f4cba5947a09e433ee8d1e3..82c3acd6e1dcc32a9cd8f5058fef29f9a423b7f3 100644 (file)
--- a/tracker/http/http.go
+++ b/tracker/http/http.go
@@ -80,7 +80,7 @@ type AnnounceOpt struct {
        HostHeader          string
        ClientIp4           net.IP
        ClientIp6           net.IP
-       HTTPRequestDirector func(*http.Request) error
+       HttpRequestDirector func(*http.Request) error
 }
 
 type AnnounceRequest = udp.AnnounceRequest
@@ -97,8 +97,8 @@ func (cl Client) Announce(ctx context.Context, ar AnnounceRequest, opt AnnounceO
                req.Header.Set("User-Agent", userAgent)
        }
 
-       if opt.HTTPRequestDirector != nil {
-               err = opt.HTTPRequestDirector(req)
+       if opt.HttpRequestDirector != nil {
+               err = opt.HttpRequestDirector(req)
                if err != nil {
                        err = fmt.Errorf("error modifying HTTP request: %s", err)
                        return

diff --git a/tracker/tracker.go b/tracker/tracker.go
index c169c6f56c46a8579d39b21b35d0f2d08dd144ab..e96a08a1175e63dc439b4865ae15288b7defbf03 100644 (file)
--- a/tracker/tracker.go
+++ b/tracker/tracker.go
@@ -38,8 +38,8 @@ type Announce struct {
        TrackerUrl          string
        Request             AnnounceRequest
        HostHeader          string
-       HTTPProxy           func(*http.Request) (*url.URL, error)
-       HTTPRequestDirector func(*http.Request) error
+       HttpProxy           func(*http.Request) (*url.URL, error)
+       HttpRequestDirector func(*http.Request) error
        DialContext         func(ctx context.Context, network, addr string) (net.Conn, error)
        ListenPacket        func(network, addr string) (net.PacketConn, error)
        ServerName          string
@@ -59,7 +59,7 @@ const DefaultTrackerAnnounceTimeout = 15 * time.Second
 func (me Announce) Do() (res AnnounceResponse, err error) {
        cl, err := NewClient(me.TrackerUrl, NewClientOpts{
                Http: trHttp.NewClientOpts{
-                       Proxy:       me.HTTPProxy,
+                       Proxy:       me.HttpProxy,
                        DialContext: me.DialContext,
                        ServerName:  me.ServerName,
                },
@@ -84,6 +84,6 @@ func (me Announce) Do() (res AnnounceResponse, err error) {
                HostHeader:          me.HostHeader,
                ClientIp4:           me.ClientIp4.IP,
                ClientIp6:           me.ClientIp6.IP,
-               HTTPRequestDirector: me.HTTPRequestDirector,
+               HttpRequestDirector: me.HttpRequestDirector,
        })
 }

diff --git a/tracker_scraper.go b/tracker_scraper.go
index 3f20cbd9accd63790f28f29048f51abf13865801..863838ace478b622721a89364380d92957e497db 100644 (file)
--- a/tracker_scraper.go
+++ b/tracker_scraper.go
@@ -157,8 +157,8 @@ func (me *trackerScraper) announce(ctx context.Context, event tracker.AnnounceEv
        me.t.logger.WithDefaultLevel(log.Debug).Printf("announcing to %q: %#v", me.u.String(), req)
        res, err := tracker.Announce{
                Context:             ctx,
-               HTTPProxy:           me.t.cl.config.HTTPProxy,
-               HTTPRequestDirector: me.t.cl.config.HTTPRequestDirector,
+               HttpProxy:           me.t.cl.config.HTTPProxy,
+               HttpRequestDirector: me.t.cl.config.HttpRequestDirector,
                DialContext:         me.t.cl.config.TrackerDialContext,
                ListenPacket:        me.t.cl.config.TrackerListenPacket,
                UserAgent:           me.t.cl.config.HTTPUserAgent,