diff options
| author | Felix Lange <fjl@twurst.com> | 2015-08-29 16:54:10 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-08-29 16:54:10 +0800 |
| commit | e1037bd0cfd6a19ef8612672ba192a8923e88d96 (patch) | |
| tree | 554f24efc93bef27c4bd471e4dd9de7daba8cb57 /rpc/api | |
| parent | 2d1ced87596b8ea1b33bb5474c9ca042be42824f (diff) | |
| parent | d9addf79fadfed85a7437184aa3ab12622eb5d13 (diff) | |
| download | dexon-e1037bd0cfd6a19ef8612672ba192a8923e88d96.tar dexon-e1037bd0cfd6a19ef8612672ba192a8923e88d96.tar.gz dexon-e1037bd0cfd6a19ef8612672ba192a8923e88d96.tar.bz2 dexon-e1037bd0cfd6a19ef8612672ba192a8923e88d96.tar.lz dexon-e1037bd0cfd6a19ef8612672ba192a8923e88d96.tar.xz dexon-e1037bd0cfd6a19ef8612672ba192a8923e88d96.tar.zst dexon-e1037bd0cfd6a19ef8612672ba192a8923e88d96.zip | |
Merge pull request #1724 from Gustav-Simonsson/get_work
rpc: return error code for eth_getWork when no work ready
Diffstat (limited to 'rpc/api')
| -rw-r--r-- | rpc/api/eth.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rpc/api/eth.go b/rpc/api/eth.go index 5199bd966..ba87e86c6 100644 --- a/rpc/api/eth.go +++ b/rpc/api/eth.go @@ -563,7 +563,12 @@ func (self *ethApi) GetLogs(req *shared.Request) (interface{}, error) { func (self *ethApi) GetWork(req *shared.Request) (interface{}, error) { self.xeth.SetMining(true, 0) - return self.xeth.RemoteMining().GetWork(), nil + ret, err := self.xeth.RemoteMining().GetWork() + if err != nil { + return nil, shared.NewNotReadyError("mining work") + } else { + return ret, nil + } } func (self *ethApi) SubmitWork(req *shared.Request) (interface{}, error) { |