Skip to content

G
Geth-Modification
Commit 8c4d493c authored by Bas van Kervel's avatar Bas van Kervel
Browse files
Options

solved merge conflicts

parents a5d5387d 61ccc39b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
rpc/api/eth.go
View file @ 8c4d493c
...@@ -7,9 +7,7 @@ import ( ...@@ -7,9 +7,7 @@ import (
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "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/eth"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared" "github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
...@@ -557,13 +555,6 @@ func (self *ethApi) SubmitWork(req *shared.Request) (interface{}, error) { ...@@ -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 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) { func (self *ethApi) Resend(req *shared.Request) (interface{}, error) {
args := new(ResendArgs) args := new(ResendArgs)
if err := self.codec.Decode(req.Params, &args); err != nil { if err := self.codec.Decode(req.Params, &args); err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment