From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 9 May 2016 02:20:35 +0000 (+1000)
Subject: Remove the vestiges of the expose tracker Client interface
X-Git-Tag: v1.0.0~743
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=b8e1edef2746b8b75320fd5305163bb550ff71cd;p=btrtrc.git

Remove the vestiges of the expose tracker Client interface
---

diff --git a/tracker/http.go b/tracker/http.go
index 5d8fa680..0f5c6c30 100644
--- a/tracker/http.go
+++ b/tracker/http.go
@@ -102,16 +102,3 @@ func (c *httpClient) Announce(ar *AnnounceRequest) (ret AnnounceResponse, err er
 	ret.Peers, err = trackerResponse.UnmarshalPeers()
 	return
 }
-
-func (c *httpClient) Connect() error {
-	// HTTP trackers do not require a connecting handshake.
-	return nil
-}
-
-func (c *httpClient) String() string {
-	return c.URL()
-}
-
-func (c *httpClient) URL() string {
-	return c.url.String()
-}
diff --git a/tracker/tracker.go b/tracker/tracker.go
index 01a1952d..3c663301 100644
--- a/tracker/tracker.go
+++ b/tracker/tracker.go
@@ -47,17 +47,12 @@ const (
 )
 
 type client interface {
-	// Returns ErrNotConnected if Connect needs to be called.
 	Announce(*AnnounceRequest) (AnnounceResponse, error)
-	Connect() error
-	String() string
-	URL() string
 	Close() error
 }
 
 var (
-	ErrNotConnected = errors.New("not connected")
-	ErrBadScheme    = errors.New("unknown scheme")
+	ErrBadScheme = errors.New("unknown scheme")
 
 	schemes = make(map[string]func(*url.URL) client)
 )
@@ -67,7 +62,7 @@ func registerClientScheme(scheme string, newFunc func(*url.URL) client) {
 }
 
 // Returns ErrBadScheme if the tracker scheme isn't recognised.
-func new(rawurl string) (cl client, err error) {
+func newClient(rawurl string) (cl client, err error) {
 	url_s, err := url.Parse(rawurl)
 	if err != nil {
 		return
@@ -82,15 +77,11 @@ func new(rawurl string) (cl client, err error) {
 }
 
 func Announce(urlStr string, req *AnnounceRequest) (res AnnounceResponse, err error) {
-	cl, err := new(urlStr)
+	cl, err := newClient(urlStr)
 	if err != nil {
 		return
 	}
 	defer cl.Close()
-	err = cl.Connect()
-	if err != nil {
-		return
-	}
 	return cl.Announce(req)
 
 }
diff --git a/tracker/udp.go b/tracker/udp.go
index a358269f..6d1228a3 100644
--- a/tracker/udp.go
+++ b/tracker/udp.go
@@ -100,17 +100,9 @@ func (c *udpClient) Close() error {
 	return nil
 }
 
-func (c *udpClient) URL() string {
-	return c.url.String()
-}
-
-func (c *udpClient) String() string {
-	return c.URL()
-}
-
 func (c *udpClient) Announce(req *AnnounceRequest) (res AnnounceResponse, err error) {
-	if !c.connected() {
-		err = ErrNotConnected
+	err = c.connect()
+	if err != nil {
 		return
 	}
 	reqURI := c.url.RequestURI()
@@ -244,7 +236,7 @@ func (c *udpClient) connected() bool {
 	return !c.connectionIdReceived.IsZero() && time.Now().Before(c.connectionIdReceived.Add(time.Minute))
 }
 
-func (c *udpClient) Connect() (err error) {
+func (c *udpClient) connect() (err error) {
 	if c.connected() {
 		return nil
 	}