Simpler interface

drivers/tracker/tracker.go

@@ -69,6 +69,7 @@ type Pool interface {
 // Conn represents a connection to the data store that can be used
 // to make reads/writes.
 type Conn interface {
+	// Torrent interactions
 	FindTorrent(infohash string) (*models.Torrent, error)
 	PutTorrent(t *models.Torrent) error
 	DeleteTorrent(infohash string) error
@@ -78,14 +79,13 @@ type Conn interface {
 	DeleteLeecher(infohash, peerkey string) error
 	PutSeeder(infohash string, p *models.Peer) error
 	DeleteSeeder(infohash, peerkey string) error
-}
 
-// PrivateConn represents a connection that can service queries for private trackers.
+	// User interactions
-type PrivateConn interface {
 	FindUser(passkey string) (*models.User, error)
 	PutUser(u *models.User) error
 	DeleteUser(passkey string) error
 
+	// Whitelist interactions
 	FindClient(clientID string) error
 	PutClient(clientID string) error
 	DeleteClient(clientID string) error

http/announce.go

@@ -30,7 +30,7 @@ func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httpro
 	}
 
 	if t.cfg.Whitelist {
-		err = conn.(tracker.PrivateConn).FindClient(ann.ClientID())
+		err = conn.FindClient(ann.ClientID())
 		if err == tracker.ErrClientUnapproved {
 			fail(w, r, err)
 			return http.StatusOK, nil
@@ -41,7 +41,7 @@ func (t *Tracker) ServeAnnounce(w http.ResponseWriter, r *http.Request, p httpro
 
 	var user *models.User
 	if t.cfg.Private {
-		user, err = conn.(tracker.PrivateConn).FindUser(ann.Passkey)
+		user, err = conn.FindUser(ann.Passkey)
 		if err == tracker.ErrUserDNE {
 			fail(w, r, err)
 			return http.StatusOK, nil

http/announce_private_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/chihaya/bencode"
 	"github.com/chihaya/chihaya/config"
-	"github.com/chihaya/chihaya/drivers/tracker"
 	"github.com/chihaya/chihaya/models"
 )
 
@@ -76,7 +75,7 @@ func loadTestData(tkr *Tracker) error {
 	}
 
 	for i, passkey := range users {
-		err = conn.(tracker.PrivateConn).PutUser(&models.User{
+		err = conn.PutUser(&models.User{
 			ID:      uint64(i + 1),
 			Passkey: passkey,
 		})
@@ -86,7 +85,7 @@ func loadTestData(tkr *Tracker) error {
 		}
 	}
 
-	err = conn.(tracker.PrivateConn).PutClient("TR2820")
+	err = conn.PutClient("TR2820")
 	if err != nil {
 		return err
 	}

http/api.go

@@ -102,16 +102,11 @@ func (t *Tracker) delTorrent(w http.ResponseWriter, r *http.Request, p httproute
 }
 
 func (t *Tracker) getUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	base, err := t.pool.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	conn, private := base.(tracker.PrivateConn)
-	if !private {
-		return http.StatusNotFound, nil
-	}
-
 	user, err := conn.FindUser(p.ByName("passkey"))
 	if err == tracker.ErrUserDNE {
 		return http.StatusNotFound, err
@@ -141,16 +136,11 @@ func (t *Tracker) putUser(w http.ResponseWriter, r *http.Request, p httprouter.P
 		return http.StatusBadRequest, err
 	}
 
-	base, err := t.pool.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	conn, private := base.(tracker.PrivateConn)
-	if !private {
-		return http.StatusNotFound, nil
-	}
-
 	err = conn.PutUser(&user)
 	if err != nil {
 		return http.StatusInternalServerError, err
@@ -160,16 +150,11 @@ func (t *Tracker) putUser(w http.ResponseWriter, r *http.Request, p httprouter.P
 }
 
 func (t *Tracker) delUser(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	base, err := t.pool.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	conn, private := base.(tracker.PrivateConn)
-	if !private {
-		return http.StatusNotFound, nil
-	}
-
 	err = conn.DeleteUser(p.ByName("passkey"))
 	if err == tracker.ErrUserDNE {
 		return http.StatusNotFound, err
@@ -181,16 +166,11 @@ func (t *Tracker) delUser(w http.ResponseWriter, r *http.Request, p httprouter.P
 }
 
 func (t *Tracker) putClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	base, err := t.pool.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	conn, private := base.(tracker.PrivateConn)
-	if !private {
-		return http.StatusNotFound, nil
-	}
-
 	err = conn.PutClient(p.ByName("clientID"))
 	if err != nil {
 		return http.StatusInternalServerError, err
@@ -200,16 +180,11 @@ func (t *Tracker) putClient(w http.ResponseWriter, r *http.Request, p httprouter
 }
 
 func (t *Tracker) delClient(w http.ResponseWriter, r *http.Request, p httprouter.Params) (int, error) {
-	base, err := t.pool.Get()
+	conn, err := t.pool.Get()
 	if err != nil {
 		return http.StatusInternalServerError, err
 	}
 
-	conn, private := base.(tracker.PrivateConn)
-	if !private {
-		return http.StatusNotFound, nil
-	}
-
 	err = conn.DeleteClient(p.ByName("clientID"))
 	if err != nil {
 		return http.StatusInternalServerError, err

http/scrape.go

@@ -29,7 +29,7 @@ func (t *Tracker) ServeScrape(w http.ResponseWriter, r *http.Request, p httprout
 	}
 
 	if t.cfg.Private {
-		_, err = conn.(tracker.PrivateConn).FindUser(scrape.Passkey)
+		_, err = conn.FindUser(scrape.Passkey)
 		if err == tracker.ErrUserDNE {
 			fail(w, r, err)
 			return http.StatusOK, nil