From af57763882f30f3fbcfddfe95637217f960539a1 Mon Sep 17 00:00:00 2001 From: Justin Li Date: Mon, 21 Jul 2014 10:53:26 -0400 Subject: [PATCH] Commit some staged changes --- http/announce_test.go | 5 ----- http/scrape_test.go | 4 +--- tracker/models/models.go | 6 +++--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/http/announce_test.go b/http/announce_test.go index 668b05f..5aeee62 100644 --- a/http/announce_test.go +++ b/http/announce_test.go @@ -30,24 +30,19 @@ func TestPublicAnnounce(t *testing.T) { peer2 := makePeerParams("peer2", true) peer3 := makePeerParams("peer3", false) - // Add one seeder. expected := makeResponse(1, 0) checkAnnounce(peer1, expected, srv, t) - // Add another seeder. expected = makeResponse(2, 0) checkAnnounce(peer2, expected, srv, t) - // Add a leecher. expected = makeResponse(2, 1, peer1, peer2) checkAnnounce(peer3, expected, srv, t) - // Remove seeder. peer1["event"] = "stopped" expected = makeResponse(1, 1, nil) checkAnnounce(peer1, expected, srv, t) - // Check seeders. expected = makeResponse(1, 1, peer2) checkAnnounce(peer3, expected, srv, t) } diff --git a/http/scrape_test.go b/http/scrape_test.go index 196f4fb..c218f71 100644 --- a/http/scrape_test.go +++ b/http/scrape_test.go @@ -23,9 +23,7 @@ func TestPublicScrape(t *testing.T) { } defer srv.Close() - scrapeParams := params{ - "info_hash": infoHash, - } + scrapeParams := params{"info_hash": infoHash} // Add one seeder. peer := makePeerParams("peer1", true) diff --git a/tracker/models/models.go b/tracker/models/models.go index 1b7ae43..5e88437 100644 --- a/tracker/models/models.go +++ b/tracker/models/models.go @@ -13,8 +13,8 @@ import ( ) var ( - // ErrMalformedRequest is returned when a client request does not have the - // required parameters to create a model. + // ErrMalformedRequest is returned when a request does not contain the + // required parameters needed to create a model. ErrMalformedRequest = errors.New("malformed request") ) @@ -96,7 +96,7 @@ func (t *Torrent) InLeecherPool(p *Peer) (exists bool) { return } -// PeerCount returns the total number of peers in a swarm. +// PeerCount returns the total number of peers connected on this Torrent. func (t *Torrent) PeerCount() int { return len(t.Seeders) + len(t.Leechers) }