From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 13 Dec 2016 03:50:42 +0000 (+1100)
Subject: Rename dht/krpc.KRPCError -> Error
X-Git-Tag: v1.0.0~509
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=70dfd099f1407a8ae936b64ad664b1e2f32ba953;p=btrtrc.git

Rename dht/krpc.KRPCError -> Error
---

diff --git a/dht/krpc/error.go b/dht/krpc/error.go
index d4b248a7..3196c94f 100644
--- a/dht/krpc/error.go
+++ b/dht/krpc/error.go
@@ -6,24 +6,24 @@ import (
 	"github.com/anacrolix/torrent/bencode"
 )
 
-var ErrorMethodUnknown = KRPCError{
+var ErrorMethodUnknown = Error{
 	Code: 204,
 	Msg:  "Method Unknown",
 }
 
 // Represented as a string or list in bencode.
-type KRPCError struct {
+type Error struct {
 	Code int
 	Msg  string
 }
 
 var (
-	_ bencode.Unmarshaler = &KRPCError{}
-	_ bencode.Marshaler   = &KRPCError{}
-	_ error               = KRPCError{}
+	_ bencode.Unmarshaler = &Error{}
+	_ bencode.Marshaler   = &Error{}
+	_ error               = Error{}
 )
 
-func (e *KRPCError) UnmarshalBencode(_b []byte) (err error) {
+func (e *Error) UnmarshalBencode(_b []byte) (err error) {
 	var _v interface{}
 	err = bencode.Unmarshal(_b, &_v)
 	if err != nil {
@@ -41,10 +41,10 @@ func (e *KRPCError) UnmarshalBencode(_b []byte) (err error) {
 	return
 }
 
-func (e KRPCError) MarshalBencode() (ret []byte, err error) {
+func (e Error) MarshalBencode() (ret []byte, err error) {
 	return bencode.Marshal([]interface{}{e.Code, e.Msg})
 }
 
-func (e KRPCError) Error() string {
+func (e Error) Error() string {
 	return fmt.Sprintf("KRPC error %d: %s", e.Code, e.Msg)
 }
diff --git a/dht/krpc/msg.go b/dht/krpc/msg.go
index ff9d990b..9c171497 100644
--- a/dht/krpc/msg.go
+++ b/dht/krpc/msg.go
@@ -24,7 +24,7 @@ type Msg struct {
 	T  string           `bencode:"t"`           // required: transaction ID
 	Y  string           `bencode:"y"`           // required: type of the message: q for QUERY, r for RESPONSE, e for ERROR
 	R  *Return          `bencode:"r,omitempty"` // RESPONSE type only
-	E  *KRPCError       `bencode:"e,omitempty"` // ERROR type only
+	E  *Error           `bencode:"e,omitempty"` // ERROR type only
 	IP util.CompactPeer `bencode:"ip,omitempty"`
 }
 
@@ -61,7 +61,7 @@ func (m Msg) SenderID() string {
 	return ""
 }
 
-func (m Msg) Error() *KRPCError {
+func (m Msg) Error() *Error {
 	if m.Y != "e" {
 		return nil
 	}
diff --git a/dht/krpc/msg_test.go b/dht/krpc/msg_test.go
index d5e20407..6854d899 100644
--- a/dht/krpc/msg_test.go
+++ b/dht/krpc/msg_test.go
@@ -33,7 +33,7 @@ func TestMarshalUnmarshalMsg(t *testing.T) {
 	testMarshalUnmarshalMsg(t, Msg{
 		Y: "e",
 		T: "42",
-		E: &KRPCError{Code: 200, Msg: "fuck"},
+		E: &Error{Code: 200, Msg: "fuck"},
 	}, "d1:eli200e4:fucke1:t2:421:y1:ee")
 	testMarshalUnmarshalMsg(t, Msg{
 		Y: "r",
diff --git a/dht/server.go b/dht/server.go
index 14042c6e..e541e45c 100644
--- a/dht/server.go
+++ b/dht/server.go
@@ -338,7 +338,7 @@ func (s *Server) handleQuery(source Addr, m krpc.Msg) {
 	}
 }
 
-func (s *Server) sendError(addr Addr, t string, e krpc.KRPCError) {
+func (s *Server) sendError(addr Addr, t string, e krpc.Error) {
 	m := krpc.Msg{
 		T: t,
 		Y: "e",