gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix sleepBlocks, implement sleep

Browse Source
This commit is contained in:
zelig
2015-07-02 16:38:48 +01:00
committed by Jeffrey Wilcke
parent 6391ec0c8f
commit 518dc87db3
4 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rpc/api/admin_args.go
View File

@ -149,6 +149,30 @@ func (args *StartRPCArgs) UnmarshalJSON(b []byte) (err error) {
return nil
}
type SleepArgs struct {
S int
}
func (args *SleepArgs) UnmarshalJSON(b []byte) (err error) {
var obj []interface{}
if err := json.Unmarshal(b, &obj); err != nil {
return shared.NewDecodeParamError(err.Error())
}
if len(obj) >= 1 {
if obj[0] != nil {
if n, err := numString(obj[0]); err == nil {
args.S = int(n.Int64())
} else {
return shared.NewInvalidTypeError("N", "not an integer: "+err.Error())
}
} else {
return shared.NewInsufficientParamsError(0, 1)
}
}
return nil
}
type SleepBlocksArgs struct {
N int64
Timeout int64
@ -163,19 +187,19 @@ func (args *SleepBlocksArgs) UnmarshalJSON(b []byte) (err error) {
args.N = 1
args.Timeout = 0
if len(obj) >= 1 {
if n, ok := obj[0].(int64); ok {
args.N = n
if len(obj) >= 1 && obj[0] != nil {
if n, err := numString(obj[0]); err == nil {
args.N = n.Int64()
} else {
return shared.NewInvalidTypeError("N", "not an integer")
return shared.NewInvalidTypeError("N", "not an integer: "+err.Error())
}
}
if len(obj) >= 2 {
if n, ok := obj[1].(int64); ok {
args.Timeout = n
if len(obj) >= 2 && obj[1] != nil {
if n, err := numString(obj[1]); err == nil {
args.Timeout = n.Int64()
} else {
return shared.NewInvalidTypeError("N", "not an integer")
return shared.NewInvalidTypeError("Timeout", "not an integer: "+err.Error())
}
}