diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
| commit | b3e133dd159749a625c4b0245af293607ba12c8c (patch) | |
| tree | 9ba8e8c4afe9168f5bc83219d402efb00387d616 /rpc/util.go | |
| parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
| parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
| download | dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2 dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst dexon-b3e133dd159749a625c4b0245af293607ba12c8c.zip | |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'rpc/util.go')
| -rw-r--r-- | rpc/util.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpc/util.go b/rpc/util.go index 4acd90284..08f404c99 100644 --- a/rpc/util.go +++ b/rpc/util.go @@ -25,7 +25,7 @@ import ( "reflect" "time" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" @@ -120,7 +120,7 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) } func toHex(b []byte) string { - hex := ethutil.Bytes2Hex(b) + hex := common.Bytes2Hex(b) // Prefer output of "0x0" instead of "0x" if len(hex) == 0 { hex = "0" |