diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-21 21:52:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-21 21:52:42 +0800 |
| commit | a7ad9c309bf72a9f2b4f12001034e1842ca55319 (patch) | |
| tree | fa573f69742e3e7cf9b2a8d124a27c9d4c8d3c2b /p2p | |
| parent | ce862ee7589a0780cebc8a7bb1cf6a75193d55a0 (diff) | |
| parent | 38c7c589e4a1b08baaab5b81de6aca7fa853d284 (diff) | |
| download | dexon-a7ad9c309bf72a9f2b4f12001034e1842ca55319.tar dexon-a7ad9c309bf72a9f2b4f12001034e1842ca55319.tar.gz dexon-a7ad9c309bf72a9f2b4f12001034e1842ca55319.tar.bz2 dexon-a7ad9c309bf72a9f2b4f12001034e1842ca55319.tar.lz dexon-a7ad9c309bf72a9f2b4f12001034e1842ca55319.tar.xz dexon-a7ad9c309bf72a9f2b4f12001034e1842ca55319.tar.zst dexon-a7ad9c309bf72a9f2b4f12001034e1842ca55319.zip | |
Merge branch 'develop' into conversion
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/discover/node.go | 4 | ||||
| -rw-r--r-- | p2p/message.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/p2p/discover/node.go b/p2p/discover/node.go index de2588258..e1130e0b5 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -143,12 +143,12 @@ type NodeID [nodeIDBits / 8]byte // NodeID prints as a long hexadecimal number. func (n NodeID) String() string { - return fmt.Sprintf("%#x", n[:]) + return fmt.Sprintf("%x", n[:]) } // The Go syntax representation of a NodeID is a call to HexID. func (n NodeID) GoString() string { - return fmt.Sprintf("discover.HexID(\"%#x\")", n[:]) + return fmt.Sprintf("discover.HexID(\"%x\")", n[:]) } // HexID converts a hex string to a NodeID. diff --git a/p2p/message.go b/p2p/message.go index ef3630a90..b42acbe3c 100644 --- 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 } |