From 08b21acff1ca397e775e926e0f9a96deaa9820fd Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Sun, 22 Mar 2015 13:32:52 +0100 Subject: Move ToHex/FromHex into bytes --- common/bytes.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'common/bytes.go') diff --git a/common/bytes.go b/common/bytes.go index 5e553d23c..2d885ac74 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -9,6 +9,28 @@ import ( "strings" ) +func ToHex(b []byte) string { + hex := Bytes2Hex(b) + // Prefer output of "0x0" instead of "0x" + if len(hex) == 0 { + hex = "0" + } + return "0x" + hex +} + +func FromHex(s string) []byte { + if len(s) > 1 { + if s[0:2] == "0x" { + s = s[2:] + } + if len(s)%2 == 1 { + s = "0" + s + } + return Hex2Bytes(s) + } + return nil +} + type Bytes []byte func (self Bytes) String() string { -- cgit v1.2.3