From 05b7b955a193979a393929f33f41ee1ebe26e1ac Mon Sep 17 00:00:00 2001
From: Justin Li <jli.justinli@gmail.com>
Date: Mon, 15 Feb 2016 14:25:08 -0500
Subject: [PATCH] Address minor comments

---
 config/example.yaml               | 10 +++++-----
 pkg/event/event.go                |  8 +++-----
 pkg/event/event_test.go           |  2 +-
 server/http/query/query.go        |  5 -----
 server/http/writer.go             |  1 -
 server/store/memory/peer_store.go |  4 ++--
 tracker/middleware.go             | 18 ++----------------
 7 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/config/example.yaml b/config/example.yaml
index 6b89c63..1aedece 100644
--- a/config/example.yaml
+++ b/config/example.yaml
@@ -28,11 +28,11 @@ chihaya:
           shards: 1
 
     - name: "http"
-    config:
-      addr: "localhost:6881"
-      requestTimeout: "10s"
-      readTimeout: "10s"
-      writeTimeout: "10s"
+      config:
+        addr: "localhost:6881"
+        requestTimeout: "10s"
+        readTimeout: "10s"
+        writeTimeout: "10s"
 
     - name: "udp"
       config:
diff --git a/pkg/event/event.go b/pkg/event/event.go
index c9bd626..bfc8023 100644
--- a/pkg/event/event.go
+++ b/pkg/event/event.go
@@ -44,11 +44,9 @@ func init() {
 	eventToString[Stopped] = "stopped"
 	eventToString[Completed] = "completed"
 
-	stringToEvent[""] = None
-	stringToEvent["none"] = None
-	stringToEvent["started"] = Started
-	stringToEvent["stopped"] = Stopped
-	stringToEvent["completed"] = Completed
+	for k, v := range eventToString {
+		stringToEvent[v] = k
+	}
 }
 
 // New returns the proper Event given a string.
diff --git a/pkg/event/event_test.go b/pkg/event/event_test.go
index 20ee33f..1164b1b 100644
--- a/pkg/event/event_test.go
+++ b/pkg/event/event_test.go
@@ -16,7 +16,7 @@ func TestNew(t *testing.T) {
 		expected    event
 		expectedErr error
 	}{
-		{"", None, nil},
+		{"", None, ErrUnknownEvent},
 		{"NONE", None, nil},
 		{"none", None, nil},
 		{"started", Started, nil},
diff --git a/server/http/query/query.go b/server/http/query/query.go
index 9c10030..fb03bff 100644
--- a/server/http/query/query.go
+++ b/server/http/query/query.go
@@ -196,11 +196,6 @@ func (q *Query) AnnounceRequest() (chihaya.AnnounceRequest, error) {
 		return nil, errors.New("failed to parse parameter: numwant")
 	}
 
-	request["ip"], err = q.Uint64("port")
-	if err != nil {
-		return nil, errors.New("failed to parse parameter: port")
-	}
-
 	request["port"], err = q.Uint64("port")
 	if err != nil {
 		return nil, errors.New("failed to parse parameter: port")
diff --git a/server/http/writer.go b/server/http/writer.go
index 743ebd6..e55f8cd 100644
--- a/server/http/writer.go
+++ b/server/http/writer.go
@@ -69,7 +69,6 @@ func (w *writer) writeScrapeResponse(resp *chihaya.ScrapeResponse) error {
 		filesDict[infohash] = bencode.Dict{
 			"complete":   scrape.Complete,
 			"incomplete": scrape.Incomplete,
-			"downloaded": scrape.Downloaded,
 		}
 	}
 
diff --git a/server/store/memory/peer_store.go b/server/store/memory/peer_store.go
index 699ca1b..42fa886 100644
--- a/server/store/memory/peer_store.go
+++ b/server/store/memory/peer_store.go
@@ -52,8 +52,8 @@ func newPeerStoreConfig(storecfg *store.Config) (*peerStoreConfig, error) {
 	return &cfg, nil
 }
 
-const seedersSuffix = "-seeders"
-const leechersSuffix = "-leechers"
+const seedersSuffix = "-s"
+const leechersSuffix = "-l"
 
 type peer struct {
 	chihaya.Peer
diff --git a/tracker/middleware.go b/tracker/middleware.go
index 8dd37ca..431f63a 100644
--- a/tracker/middleware.go
+++ b/tracker/middleware.go
@@ -13,10 +13,6 @@ import (
 // has been delivered to a client.
 type AnnounceHandler func(*config.TrackerConfig, chihaya.AnnounceRequest, *chihaya.AnnounceResponse) error
 
-func (h AnnounceHandler) handleAnnounce(cfg *config.TrackerConfig, req chihaya.AnnounceRequest, resp *chihaya.AnnounceResponse) error {
-	return h(cfg, req, resp)
-}
-
 // AnnounceMiddleware is higher-order AnnounceHandler used to implement modular
 // behavior processing an announce.
 type AnnounceMiddleware func(AnnounceHandler) AnnounceHandler
@@ -24,10 +20,7 @@ type AnnounceMiddleware func(AnnounceHandler) AnnounceHandler
 type announceChain struct{ mw []AnnounceMiddleware }
 
 func (c *announceChain) Append(mw ...AnnounceMiddleware) {
-	newMW := make([]AnnounceMiddleware, len(c.mw)+len(mw))
-	copy(newMW[:len(c.mw)], c.mw)
-	copy(newMW[len(c.mw):], mw)
-	c.mw = newMW
+	c.mw = append(c.mw, mw...)
 }
 
 func (c *announceChain) Handler() AnnounceHandler {
@@ -63,10 +56,6 @@ func RegisterAnnounceMiddleware(name string, mw AnnounceMiddleware) {
 // before it has been delivered to a client.
 type ScrapeHandler func(*config.TrackerConfig, chihaya.ScrapeRequest, *chihaya.ScrapeResponse) error
 
-func (h ScrapeHandler) handleScrape(cfg *config.TrackerConfig, req chihaya.ScrapeRequest, resp *chihaya.ScrapeResponse) error {
-	return h(cfg, req, resp)
-}
-
 // ScrapeMiddleware is higher-order ScrapeHandler used to implement modular
 // behavior processing a scrape.
 type ScrapeMiddleware func(ScrapeHandler) ScrapeHandler
@@ -74,10 +63,7 @@ type ScrapeMiddleware func(ScrapeHandler) ScrapeHandler
 type scrapeChain struct{ mw []ScrapeMiddleware }
 
 func (c *scrapeChain) Append(mw ...ScrapeMiddleware) {
-	newMW := make([]ScrapeMiddleware, len(c.mw)+len(mw))
-	copy(newMW[:len(c.mw)], c.mw)
-	copy(newMW[len(c.mw):], mw)
-	c.mw = newMW
+	c.mw = append(c.mw, mw...)
 }
 
 func (c *scrapeChain) Handler() ScrapeHandler {