From b41fb21f6abd27ef89ae52c0ca417a9057767091 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 25 Oct 2022 17:46:32 +0200 Subject: [PATCH] src/parse_request.go: use api.ApiArguments instead of arguments struct --- src/parse_request.go | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/parse_request.go b/src/parse_request.go index 662b653..75cd4fd 100644 --- a/src/parse_request.go +++ b/src/parse_request.go @@ -8,32 +8,26 @@ import ( "github.com/eosswedenorg/eosio-api-healthcheck/src/api" ) -type arguments struct { - url string - host string - num_blocks int -} +func ParseArguments(args []string) api.ApiArguments { -func ParseArguments(args []string) arguments { - - a := arguments{ - num_blocks: 10, + a := api.ApiArguments{ + NumBlocks: 10, } // 1. url (scheme + ip/domain + port) - a.url = args[0] + a.Url = args[0] // 2. num blocks if len(args) > 1 { num, err := strconv.ParseInt(args[1], 10, 32) if err == nil { - a.num_blocks = int(num) + a.NumBlocks = int(num) } } // 3. Host if len(args) > 2 { - a.host = args[2] + a.Host = args[2] } return a @@ -53,13 +47,13 @@ func ParseRequest(request string) (api.ApiInterface, error) { switch p[0] { case "v1": - return api.NewEosioV1(a.url, a.host, float64(a.num_blocks / 2)), nil + return api.NewEosioV1(a.Url, a.Host, float64(a.NumBlocks / 2)), nil case "v2": - return api.NewEosioV2(a.url, a.host, int64(a.num_blocks)), nil + return api.NewEosioV2(a.Url, a.Host, int64(a.NumBlocks)), nil case "contract": - return api.NewEosioContract(a.url, float64(a.num_blocks / 2)), nil + return api.NewEosioContract(a.Url, float64(a.NumBlocks / 2)), nil case "debug": - return api.NewDebugApi(a.url), nil + return api.NewDebugApi(a.Url), nil } return nil, fmt.Errorf("invalid API '%s'", p[0])