From d9addf79fadfed85a7437184aa3ab12622eb5d13 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Fri, 28 Aug 2015 03:42:01 +0200 Subject: Improve error string and remove unneeded else clause --- rpc/api/eth.go | 2 +- rpc/shared/errors.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'rpc') 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, } } -- cgit v1.2.3