diff options
| -rw-r--r-- | miner/remote_agent.go | 3 | ||||
| -rw-r--r-- | rpc/api/eth.go | 2 | ||||
| -rw-r--r-- | rpc/shared/errors.go | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/miner/remote_agent.go b/miner/remote_agent.go index 5ccadb896..9e4453ce8 100644 --- a/miner/remote_agent.go +++ b/miner/remote_agent.go @@ -112,9 +112,8 @@ func (a *RemoteAgent) GetWork() ([3]string, error) { a.work[block.HashNoNonce()] = a.currentWork return res, nil - } else { - return res, errors.New("No work available yet, don't panic.") } + return res, errors.New("No work available yet, don't panic.") } // Returns true or false, but does not indicate if the PoW was correct diff --git a/rpc/api/eth.go b/rpc/api/eth.go index 253b6d5cf..ba87e86c6 100644 --- a/rpc/api/eth.go +++ b/rpc/api/eth.go @@ -565,7 +565,7 @@ func (self *ethApi) GetWork(req *shared.Request) (interface{}, error) { self.xeth.SetMining(true, 0) ret, err := self.xeth.RemoteMining().GetWork() if err != nil { - return nil, shared.NewNotReadyError("getWork") + return nil, shared.NewNotReadyError("mining work") } else { return ret, nil } diff --git a/rpc/shared/errors.go b/rpc/shared/errors.go index d43858a40..d5a7011f9 100644 --- a/rpc/shared/errors.go +++ b/rpc/shared/errors.go @@ -65,16 +65,16 @@ func NewNotImplementedError(method string) *NotImplementedError { } type NotReadyError struct { - Method string + Resource string } func (e *NotReadyError) Error() string { - return fmt.Sprintf("%s method not ready", e.Method) + return fmt.Sprintf("%s not ready", e.Resource) } -func NewNotReadyError(method string) *NotReadyError { +func NewNotReadyError(resource string) *NotReadyError { return &NotReadyError{ - Method: method, + Resource: resource, } } |