rm driver deps

server/announce.go

@@ -114,14 +114,6 @@ func (s Server) serveAnnounce(w http.ResponseWriter, r *http.Request) {
 		}
 
 	default:
-		// Check the user's slots to see if they're allowed to leech
-		if s.conf.Slots && user.Slots != -1 && left != 0 {
-			if user.SlotsUsed >= user.Slots {
-				fail(errors.New("You've run out of download slots."), w, r)
-				return
-			}
-		}
-
 		if left == 0 {
 			// Save the peer as a new seeder
 			err := conn.AddSeeder(torrent, peer)
@@ -129,11 +121,6 @@ func (s Server) serveAnnounce(w http.ResponseWriter, r *http.Request) {
 				log.Panicf("server: %s", err)
 			}
 		} else {
-			// Save the peer as a new leecher and increment the user's slots
-			err := conn.IncrementSlots(user)
-			if err != nil {
-				log.Panicf("server: %s", err)
-			}
 			err = conn.AddLeecher(torrent, peer)
 			if err != nil {
 				log.Panicf("server: %s", err)
@@ -155,10 +142,6 @@ func (s Server) serveAnnounce(w http.ResponseWriter, r *http.Request) {
 			if err != nil {
 				log.Panicf("server: %s", err)
 			}
-			err = conn.DecrementSlots(user)
-			if err != nil {
-				log.Panicf("server: %s", err)
-			}
 		}
 
 	case event == "completed":

server/server.go

@@ -37,7 +37,7 @@ type Server struct {
 }
 
 func New(conf *config.Config) (*Server, error) {
-	pool, err := tracker.Open(&conf.Cache)
+	pool, err := tracker.Open(&conf.Tracker)
 	if err != nil {
 		return nil, err
 	}

server/stats_test.go

@@ -8,22 +8,15 @@ import (
 	"errors"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 
 	"github.com/chihaya/chihaya/config"
-
-	_ "github.com/chihaya/chihaya-gazelle"
+	_ "github.com/chihaya/chihaya/storage/backend/mock"
 	_ "github.com/chihaya/chihaya/storage/tracker/mock"
 )
 
 func newTestServer() (*Server, error) {
-	testConfig, err := config.Open(os.Getenv("TESTCONFIGPATH"))
-	if err != nil {
-		return nil, err
-	}
-
-	s, err := New(testConfig)
+	s, err := New(&config.MockConfig)
 	if err != nil {
 		return nil, err
 	}