DRY up the use of fromHex and put it in ethutil

2 files changed, 34 insertions, 0 deletions

diff --git a/ethutil/common.go b/ethutil/common.go
index 3ade7fd16..29854c882 100644
--- a/ethutil/common.go
+++ b/ethutil/common.go
@@ -64,6 +64,19 @@ func DefaultDataDir() string {
 		return path.Join(usr.HomeDir, ".ethereum")
 	}
 }
+
+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
+}
 func IsWindows() bool {
 	return runtime.GOOS == "windows"
 }
diff --git a/ethutil/common_test.go b/ethutil/common_test.go
index c2b6077e9..20064b1e7 100644
--- a/ethutil/common_test.go
+++ b/ethutil/common_test.go
@@ -1,8 +1,10 @@
 package ethutil
 
 import (
+	"bytes"
 	"math/big"
 	"os"
+	"testing"
 
 	checker "gopkg.in/check.v1"
 )
@@ -66,3 +68,22 @@ func (s *CommonSuite) TestLarge(c *checker.C) {
 	c.Assert(adalarge, checker.Equals, "10000E7 Einstein")
 	c.Assert(weilarge, checker.Equals, "100 Babbage")
 }
+
+//fromHex
+func TestFromHex(t *testing.T) {
+	input := "0x01"
+	expected := []byte{1}
+	result := FromHex(input)
+	if bytes.Compare(expected, result) != 0 {
+		t.Errorf("Expected % x got % x", expected, result)
+	}
+}
+
+func TestFromHexOddLength(t *testing.T) {
+	input := "0x1"
+	expected := []byte{1}
+	result := FromHex(input)
+	if bytes.Compare(expected, result) != 0 {
+		t.Errorf("Expected % x got % x", expected, result)
+	}
+}