From 829201382b67e95ab31fca887234d1858c11c810 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Wed, 26 Aug 2015 12:46:50 +0200 Subject: rpc: return error code for eth_getWork when no work ready --- miner/remote_agent.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'miner') diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 5c672a6e0..5ccadb896 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -17,6 +17,7 @@ package miner import ( + "errors" "math/big" "sync" "time" @@ -90,7 +91,7 @@ func (a *RemoteAgent) GetHashRate() (tot int64) { return } -func (a *RemoteAgent) GetWork() [3]string { +func (a *RemoteAgent) GetWork() ([3]string, error) { a.mu.Lock() defer a.mu.Unlock() @@ -110,9 +111,10 @@ func (a *RemoteAgent) GetWork() [3]string { res[2] = common.BytesToHash(n.Bytes()).Hex() a.work[block.HashNoNonce()] = a.currentWork + return res, nil + } else { + return res, errors.New("No work available yet, don't panic.") } - - return res } // Returns true or false, but does not indicate if the PoW was correct -- cgit v1.2.3