cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

move ethutil hex conversion functions to bytes

Browse Source
This commit is contained in:
zelig 2014-06-29 15:56:40 +01:00
parent 7489fb784e
commit 5c1e0a6dc4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ethutil/bytes.go
View File

@ -3,6 +3,7 @@ package ethutil
import ( import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"encoding/hex"
"fmt" "fmt"
"math/big" "math/big"
"strings" "strings"
@ -91,9 +92,18 @@ func IsHex(str string) bool {
return l >= 4 && l%2 == 0 && str[0:2] == "0x" return l >= 4 && l%2 == 0 && str[0:2] == "0x"
} }
func Bytes2Hex(d []byte) string {
return hex.EncodeToString(d)
}
func Hex2Bytes(str string) []byte {
h, _ := hex.DecodeString(str)
return h
}
func StringToByteFunc(str string, cb func(str string) []byte) (ret []byte) { func StringToByteFunc(str string, cb func(str string) []byte) (ret []byte) {
if len(str) > 1 && str[0:2] == "0x" && !strings.Contains(str, "\n") { if len(str) > 1 && str[0:2] == "0x" && !strings.Contains(str, "\n") {
ret = FromHex(str[2:]) ret = Hex2Bytes(str[2:])
} else { } else {
ret = cb(str) ret = cb(str)
} }
@ -110,7 +120,7 @@ func FormatData(data string) []byte {
if data[0:1] == "\"" && data[len(data)-1:] == "\"" { if data[0:1] == "\"" && data[len(data)-1:] == "\"" {
d.SetBytes([]byte(data[1 : len(data)-1])) d.SetBytes([]byte(data[1 : len(data)-1]))
} else if len(data) > 1 && data[:2] == "0x" { } else if len(data) > 1 && data[:2] == "0x" {
d.SetBytes(FromHex(data[2:])) d.SetBytes(Hex2Bytes(data[2:]))
} else { } else {
d.SetString(data, 0) d.SetString(data, 0)
} }