From 4f5b362bda862b0d77583491d5e04193148a9349 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 20 Mar 2015 12:52:03 +0100 Subject: [PATCH] %#x => %x --- cmd/ethereum/main.go | 2 +- p2p/discover/node.go | 4 ++-- p2p/message.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 1a662c7565..87f588de8d 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -251,7 +251,7 @@ func accountList(ctx *cli.Context) { utils.Fatalf("Could not list accounts: %v", err) } for _, acct := range accts { - fmt.Printf("Address: %#x\n", acct) + fmt.Printf("Address: %x\n", acct) } } diff --git a/p2p/discover/node.go b/p2p/discover/node.go index de25882585..e1130e0b58 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 14e4404c9a..31cf5901f0 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -40,7 +40,7 @@ func NewMsg(code uint64, params ...interface{}) Msg { // 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 }