aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

rpc/server: refactor parameter parsing for getnep5transfers

Browse source
This commit is contained in:
Roman Khimov 2020-09-11 22:33:17 +03:00
parent e4b52d3947
commit c50ff7f20e
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
pkg/rpc/server/server.go
View file

@ -545,25 +545,12 @@ func (s *Server) getNEP5Balances(ps request.Params) (interface{}, *response.Erro
return bs, nil return bs, nil
} }
func getTimestampsAndLimit(p1, p2, p3 *request.Param) (uint64, uint64, int, error) { func getTimestampsAndLimit(ps request.Params, index int) (uint64, uint64, int, error) {
var start, end uint64 var start, end uint64
var limit int var limit int
if p1 != nil { pStart, pEnd, pLimit := ps.Value(index), ps.Value(index+1), ps.Value(index+2)
val, err := p1.GetInt() if pLimit != nil {
if err != nil { l, err := pLimit.GetInt()
return 0, 0, 0, err
}
start = uint64(val)
}
if p2 != nil {
val, err := p2.GetInt()
if err != nil {
return 0, 0, 0, err
}
end = uint64(val)
}
if p3 != nil {
l, err := p3.GetInt()
if err != nil { if err != nil {
return 0, 0, 0, err return 0, 0, 0, err
} }
@ -572,6 +559,24 @@ func getTimestampsAndLimit(p1, p2, p3 *request.Param) (uint64, uint64, int, erro
} }
limit = l limit = l
} }
if pEnd != nil {
val, err := pEnd.GetInt()
if err != nil {
return 0, 0, 0, err
}
end = uint64(val)
} else {
end = uint64(time.Now().Unix() * 1000)
}
if pStart != nil {
val, err := pStart.GetInt()
if err != nil {
return 0, 0, 0, err
}
start = uint64(val)
} else {
start = uint64(time.Now().Add(-time.Hour*24*7).Unix() * 1000)
}
return start, end, limit, nil return start, end, limit, nil
} }
@ -581,17 +586,10 @@ func (s *Server) getNEP5Transfers(ps request.Params) (interface{}, *response.Err
return nil, response.ErrInvalidParams return nil, response.ErrInvalidParams
} }
p1, p2, p3 := ps.Value(1), ps.Value(2), ps.Value(3) start, end, limit, err := getTimestampsAndLimit(ps, 1)
start, end, limit, err := getTimestampsAndLimit(p1, p2, p3)
if err != nil { if err != nil {
return nil, response.NewInvalidParamsError(err.Error(), err) return nil, response.NewInvalidParamsError(err.Error(), err)
} }
if p2 == nil {
end = uint64(time.Now().Unix() * 1000)
if p1 == nil {
start = uint64(time.Now().Add(-time.Hour*24*7).Unix() * 1000)
}
}
bs := &result.NEP5Transfers{ bs := &result.NEP5Transfers{
Address: address.Uint160ToString(u), Address: address.Uint160ToString(u),