Rename dht/krpc.KRPCError -> Error

diff --git a/dht/krpc/error.go b/dht/krpc/error.go
index d4b248a7b98adefea2c379f1aba6d5289ce2d26b..3196c94f4b194eeb571226398f5efcbb9c8c3b2d 100644 (file)
--- 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 ff9d990bf2aa63f580e38c5ad8a6d444356860a8..9c171497cf150dbc9a4db7e77266623d9c523d3c 100644 (file)
--- 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 d5e20407eb9db57c9ffad0c70ac106b494868c74..6854d899406303f2ba5e919130130ed0cba28d4e 100644 (file)
--- 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 14042c6e3da87c7341c3e7733d28b46557208515..e541e45c2ece29d3b25cb117daeafc4cc30facd3 100644 (file)
--- 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",