From cb68c984fa24b5b5438a7863ae4d287140ce303f Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Thu, 21 Aug 2014 21:07:44 +1000
Subject: [PATCH] Move some tracker.CompactPeer into util

---
 tracker/tracker.go | 15 ---------------
 util/types.go      | 20 +++++++++++++++++---
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/tracker/tracker.go b/tracker/tracker.go
index 1914eae1..ffae4341 100644
--- a/tracker/tracker.go
+++ b/tracker/tracker.go
@@ -1,9 +1,6 @@
 package tracker
 
 import (
-	"bytes"
-	"encoding"
-	"encoding/binary"
 	"errors"
 	"net"
 	"net/url"
@@ -36,18 +33,6 @@ type Peer struct {
 	Port int
 }
 
-type CompactPeer struct {
-	IP   [4]byte
-	Port uint16
-}
-
-var _ encoding.BinaryUnmarshaler = &CompactPeer{}
-
-func (cp *CompactPeer) UnmarshalBinary(b []byte) (err error) {
-	err = binary.Read(bytes.NewReader(b), binary.BigEndian, cp)
-	return
-}
-
 const (
 	None      AnnounceEvent = iota
 	Completed               // The local peer just completed the torrent.
diff --git a/util/types.go b/util/types.go
index ec874622..03dcb1fa 100644
--- a/util/types.go
+++ b/util/types.go
@@ -1,11 +1,13 @@
 package util
 
 import (
-	"bitbucket.org/anacrolix/go.torrent/tracker"
+	"bytes"
+	"encoding"
+	"encoding/binary"
 	"github.com/anacrolix/libtorgo/bencode"
 )
 
-type CompactPeers []tracker.CompactPeer
+type CompactPeers []CompactPeer
 
 func (me *CompactPeers) UnmarshalBencode(bb []byte) (err error) {
 	var b []byte
@@ -19,7 +21,7 @@ func (me *CompactPeers) UnmarshalBencode(bb []byte) (err error) {
 
 func (me *CompactPeers) UnmarshalBinary(b []byte) (err error) {
 	for i := 0; i < len(b); i += 6 {
-		var p tracker.CompactPeer
+		var p CompactPeer
 		err = p.UnmarshalBinary([]byte(b[i : i+6]))
 		if err != nil {
 			return
@@ -28,3 +30,15 @@ func (me *CompactPeers) UnmarshalBinary(b []byte) (err error) {
 	}
 	return
 }
+
+type CompactPeer struct {
+	IP   [4]byte
+	Port uint16
+}
+
+var _ encoding.BinaryUnmarshaler = &CompactPeer{}
+
+func (cp *CompactPeer) UnmarshalBinary(b []byte) (err error) {
+	err = binary.Read(bytes.NewReader(b), binary.BigEndian, cp)
+	return
+}
-- 
2.50.0