Rename RequestsBlocked to ClientErrors and remove special cases from tracker code

tracker/announce.go

@@ -22,22 +22,14 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
 	defer conn.Close()
 
 	if tkr.cfg.Whitelist {
-		err = conn.FindClient(ann.ClientID())
-		if err == models.ErrClientUnapproved {
-			w.WriteError(err)
-			return nil
-		} else if err != nil {
+		if err = conn.FindClient(ann.ClientID()); err != nil {
 			return err
 		}
 	}
 
 	var user *models.User
 	if tkr.cfg.Private {
-		user, err = conn.FindUser(ann.Passkey)
-		if err == models.ErrUserDNE {
-			w.WriteError(err)
-			return nil
-		} else if err != nil {
+		if user, err = conn.FindUser(ann.Passkey); err != nil {
 			return err
 		}
 	}
@@ -58,10 +50,6 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
 		}
 		stats.RecordEvent(stats.NewTorrent)
 
-	case tkr.cfg.Private && err == models.ErrTorrentDNE:
-		w.WriteError(err)
-		return nil
-
 	case err != nil:
 		return err
 	}

tracker/scrape.go

@@ -17,11 +17,7 @@ func (tkr *Tracker) HandleScrape(scrape *models.Scrape, w Writer) (err error) {
 	defer conn.Close()
 
 	if tkr.cfg.Private {
-		_, err = conn.FindUser(scrape.Passkey)
-		if err == models.ErrUserDNE {
-			w.WriteError(err)
-			return nil
-		} else if err != nil {
+		if _, err = conn.FindUser(scrape.Passkey); err != nil {
 			return err
 		}
 	}
@@ -29,10 +25,7 @@ func (tkr *Tracker) HandleScrape(scrape *models.Scrape, w Writer) (err error) {
 	var torrents []*models.Torrent
 	for _, infohash := range scrape.Infohashes {
 		torrent, err := conn.FindTorrent(infohash)
-		if err == models.ErrTorrentDNE {
-			w.WriteError(err)
-			return nil
-		} else if err != nil {
+		if err != nil {
 			return err
 		}
 		torrents = append(torrents, torrent)