aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBas van Kervel <bas@ethdev.com>2015-06-30 21:32:02 +0800
committerBas van Kervel <bas@ethdev.com>2015-06-30 21:32:02 +0800
commit8c4d493c66cf14f0bcb8b650045a644722ad8d90 (patch)
treea825467d42f801264a21cee88d2d478dc7797519
parenta5d5387dee984b0d3712379998c200d2c6fe89e5 (diff)
parent61ccc39b569b0d9c1c0c5a51975723621dd312d0 (diff)
downloaddexon-8c4d493c66cf14f0bcb8b650045a644722ad8d90.tar
dexon-8c4d493c66cf14f0bcb8b650045a644722ad8d90.tar.gz
dexon-8c4d493c66cf14f0bcb8b650045a644722ad8d90.tar.bz2
dexon-8c4d493c66cf14f0bcb8b650045a644722ad8d90.tar.lz
dexon-8c4d493c66cf14f0bcb8b650045a644722ad8d90.tar.xz
dexon-8c4d493c66cf14f0bcb8b650045a644722ad8d90.tar.zst
dexon-8c4d493c66cf14f0bcb8b650045a644722ad8d90.zip
solved merge conflicts
-rw-r--r--rpc/api/eth.go9
1 files changed, 0 insertions, 9 deletions
diff --git a/rpc/api/eth.go b/rpc/api/eth.go
index 784cd0f48..db0b4b024 100644
--- a/rpc/api/eth.go
+++ b/rpc/api/eth.go
@@ -7,9 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/crypto/sha3"
"github.com/ethereum/go-ethereum/eth"
- "github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/xeth"
@@ -557,13 +555,6 @@ func (self *ethApi) SubmitWork(req *shared.Request) (interface{}, error) {
return self.xeth.RemoteMining().SubmitWork(args.Nonce, common.HexToHash(args.Digest), common.HexToHash(args.Header)), nil
}
-func rlpHash(x interface{}) (h common.Hash) {
- hw := sha3.NewKeccak256()
- rlp.Encode(hw, x)
- hw.Sum(h[:0])
- return h
-}
-
func (self *ethApi) Resend(req *shared.Request) (interface{}, error) {
args := new(ResendArgs)
if err := self.codec.Decode(req.Params, &args); err != nil {