Convert MsgInv errors to new MessageError type.

This commit is contained in:
Dave Collins 2013-05-10 10:12:45 -05:00
parent 953a236e2a
commit 036f14ff49

View file

@ -25,8 +25,9 @@ type MsgInv struct {
// AddInvVect adds an inventory vector to the message. // AddInvVect adds an inventory vector to the message.
func (msg *MsgInv) AddInvVect(iv *InvVect) error { func (msg *MsgInv) AddInvVect(iv *InvVect) error {
if len(msg.InvList)+1 > MaxInvPerMsg { if len(msg.InvList)+1 > MaxInvPerMsg {
str := "MsgInv.AddAddress: too many invvect in message [max %v]" str := fmt.Sprintf("too many invvect in message [max %v]",
return fmt.Errorf(str, MaxInvPerMsg) MaxInvPerMsg)
return messageError("MsgInv.AddAddress", str)
} }
msg.InvList = append(msg.InvList, iv) msg.InvList = append(msg.InvList, iv)
@ -43,8 +44,8 @@ func (msg *MsgInv) BtcDecode(r io.Reader, pver uint32) error {
// Limit to max inventory vectors per message. // Limit to max inventory vectors per message.
if count > MaxInvPerMsg { if count > MaxInvPerMsg {
str := "MsgInv.BtcDecode: too many invvect in message [%v]" str := fmt.Sprintf("too many invvect in message [%v]", count)
return fmt.Errorf(str, count) return messageError("MsgInv.BtcDecode", str)
} }
for i := uint64(0); i < count; i++ { for i := uint64(0); i < count; i++ {
@ -65,8 +66,8 @@ func (msg *MsgInv) BtcEncode(w io.Writer, pver uint32) error {
// Limit to max inventory vectors per message. // Limit to max inventory vectors per message.
count := len(msg.InvList) count := len(msg.InvList)
if count > MaxInvPerMsg { if count > MaxInvPerMsg {
str := "MsgInv.BtcEncode: too many invvect in message [%v]" str := fmt.Sprintf("too many invvect in message [%v]", count)
return fmt.Errorf(str, count) return messageError("MsgInv.BtcDecode", str)
} }
err := writeVarInt(w, pver, uint64(count)) err := writeVarInt(w, pver, uint64(count))