Merge branch 'develop' into conversion

2015-03-21 14:52:42 +01:00
parent ce862ee758 38c7c589e4
commit a7ad9c309b
6 changed files with 32 additions and 7 deletions
--- a/p2p/message.go
+++ b/p2p/message.go
@ -33,7 +33,7 @@ type Msg struct {
 // For the decoding rules, please see package rlp.
 func (msg Msg) Decode(val interface{}) error {
 	if err := rlp.Decode(msg.Payload, val); err != nil {
-		return newPeerError(errInvalidMsg, "(code %#x) (size %d) %v", msg.Code, msg.Size, err)
+		return newPeerError(errInvalidMsg, "(code %x) (size %d) %v", msg.Code, msg.Size, err)
 	}
 	return nil
 }