Merge pull request #3368 from bas-vk/sha3

node: improve error handling for web3_sha3 RPC method
This commit is contained in:
Péter Szilágyi 2016-11-30 12:10:05 +02:00 committed by GitHub
commit 889a5e0cf1
1 changed files with 3 additions and 3 deletions

View File

@ -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)
}