diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-11 08:10:58 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-11 08:10:58 +0800 |
| commit | 64933321fb58ab92cf505a4519fe93ae69e1c71d (patch) | |
| tree | ccdb638c5fa636b6b88cd39994a470aebd3815e3 /rpc/util.go | |
| parent | 7e0ccc9de53e788ddc1879248bceb33a9ccdbae0 (diff) | |
| parent | 499f816e3034c3e781f8ad35da070c9989cf6e3c (diff) | |
| download | dexon-64933321fb58ab92cf505a4519fe93ae69e1c71d.tar dexon-64933321fb58ab92cf505a4519fe93ae69e1c71d.tar.gz dexon-64933321fb58ab92cf505a4519fe93ae69e1c71d.tar.bz2 dexon-64933321fb58ab92cf505a4519fe93ae69e1c71d.tar.lz dexon-64933321fb58ab92cf505a4519fe93ae69e1c71d.tar.xz dexon-64933321fb58ab92cf505a4519fe93ae69e1c71d.tar.zst dexon-64933321fb58ab92cf505a4519fe93ae69e1c71d.zip | |
Merge branch 'rpcfrontier' of github.com-obscure:ethereum/go-ethereum into rpcfrontier
Diffstat (limited to 'rpc/util.go')
| -rw-r--r-- | rpc/util.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rpc/util.go b/rpc/util.go index fb4efdb45..8ff3c6d31 100644 --- a/rpc/util.go +++ b/rpc/util.go @@ -91,7 +91,7 @@ func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error func (self JsonWrapper) Send(writer io.Writer, v interface{}) (n int, err error) { var payload []byte - payload, err = json.Marshal(v) + payload, err = json.MarshalIndent(v, "", "\t") if err != nil { rpclogger.Fatalln("Error marshalling JSON", err) return 0, err @@ -127,11 +127,15 @@ func toHex(b []byte) string { } 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 ethutil.Hex2Bytes(s) } return nil |