From 5a2d62e4d9e551f16f094216da70b7a6f5d2bf00 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 30 Jul 2014 13:06:59 +0200 Subject: [PATCH] Added better data parser --- ethutil/bytes.go | 20 ++++++++++++++++++++ ethutil/bytes_test.go | 14 ++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ethutil/bytes_test.go diff --git a/ethutil/bytes.go b/ethutil/bytes.go index 4027e39867..49fc229d31 100644 --- a/ethutil/bytes.go +++ b/ethutil/bytes.go @@ -131,6 +131,26 @@ func FormatData(data string) []byte { return BigToBytes(d, 256) } +func ParseData(data ...interface{}) (ret []byte) { + for _, item := range data { + switch t := item.(type) { + case string: + var str []byte + if IsHex(t) { + str = Hex2Bytes(t[2:]) + } else { + str = []byte(t) + } + + ret = append(ret, RightPadBytes(str, 32)...) + case []byte: + ret = append(ret, LeftPadBytes(t, 32)...) + } + } + + return +} + func RightPadBytes(slice []byte, l int) []byte { if l < len(slice) { return slice diff --git a/ethutil/bytes_test.go b/ethutil/bytes_test.go new file mode 100644 index 0000000000..381efe7a2c --- /dev/null +++ b/ethutil/bytes_test.go @@ -0,0 +1,14 @@ +package ethutil + +import ( + "bytes" + "testing" +) + +func TestParseData(t *testing.T) { + data := ParseData("hello", "world", "0x0106") + exp := "68656c6c6f000000000000000000000000000000000000000000000000000000776f726c640000000000000000000000000000000000000000000000000000000106000000000000000000000000000000000000000000000000000000000000" + if bytes.Compare(data, Hex2Bytes(exp)) != 0 { + t.Error("Error parsing data") + } +}