mirror of https://github.com/status-im/op-geth.git
Improve error string and remove unneeded else clause
This commit is contained in:
parent
829201382b
commit
d9addf79fa
|
@ -112,9 +112,8 @@ func (a *RemoteAgent) GetWork() ([3]string, error) {
|
||||||
|
|
||||||
a.work[block.HashNoNonce()] = a.currentWork
|
a.work[block.HashNoNonce()] = a.currentWork
|
||||||
return res, nil
|
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
|
// Returns true or false, but does not indicate if the PoW was correct
|
||||||
|
|
|
@ -565,7 +565,7 @@ func (self *ethApi) GetWork(req *shared.Request) (interface{}, error) {
|
||||||
self.xeth.SetMining(true, 0)
|
self.xeth.SetMining(true, 0)
|
||||||
ret, err := self.xeth.RemoteMining().GetWork()
|
ret, err := self.xeth.RemoteMining().GetWork()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, shared.NewNotReadyError("getWork")
|
return nil, shared.NewNotReadyError("mining work")
|
||||||
} else {
|
} else {
|
||||||
return ret, nil
|
return ret, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,16 +65,16 @@ func NewNotImplementedError(method string) *NotImplementedError {
|
||||||
}
|
}
|
||||||
|
|
||||||
type NotReadyError struct {
|
type NotReadyError struct {
|
||||||
Method string
|
Resource string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *NotReadyError) Error() 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{
|
return &NotReadyError{
|
||||||
Method: method,
|
Resource: resource,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue