aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-11-30 18:10:05 +0800
committerGitHub <noreply@github.com>2016-11-30 18:10:05 +0800
commit889a5e0cf102a44e3f3f385d5b8b2228f795ac85 (patch)
treefbf89e3348043775a8806c9161c657d32ccba6ea
parent9f8bc00cf56bdf2cabf060303ed69f277a03357a (diff)
parent1fc5cc1b598ef52f8f95ce47697dcc6993ac480d (diff)
downloadgo-tangerine-889a5e0cf102a44e3f3f385d5b8b2228f795ac85.tar
go-tangerine-889a5e0cf102a44e3f3f385d5b8b2228f795ac85.tar.gz
go-tangerine-889a5e0cf102a44e3f3f385d5b8b2228f795ac85.tar.bz2
go-tangerine-889a5e0cf102a44e3f3f385d5b8b2228f795ac85.tar.lz
go-tangerine-889a5e0cf102a44e3f3f385d5b8b2228f795ac85.tar.xz
go-tangerine-889a5e0cf102a44e3f3f385d5b8b2228f795ac85.tar.zst
go-tangerine-889a5e0cf102a44e3f3f385d5b8b2228f795ac85.zip
Merge pull request #3368 from bas-vk/sha3
node: improve error handling for web3_sha3 RPC method
-rw-r--r--node/api.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/api.go b/node/api.go
index 631e92c8e..7c9ad601a 100644
--- a/node/api.go
+++ b/node/api.go
@@ -21,7 +21,7 @@ import (
"strings"
"time"
- "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover"
@@ -331,6 +331,6 @@ func (s *PublicWeb3API) ClientVersion() string {
// Sha3 applies the ethereum sha3 implementation on the input.
// It assumes the input is hex encoded.
-func (s *PublicWeb3API) Sha3(input string) string {
- return common.ToHex(crypto.Keccak256(common.FromHex(input)))
+func (s *PublicWeb3API) Sha3(input hexutil.Bytes) hexutil.Bytes {
+ return crypto.Keccak256(input)
}