diff --git a/go.mod b/go.mod index 3115257..574dead 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/eosswedenorg-go/eos-contract-api-client v0.0.0-20220221105418-dc591fcc0dc5 - github.com/eosswedenorg-go/eosapi v0.1.0 + github.com/eosswedenorg-go/eosapi v0.1.1 github.com/eosswedenorg-go/haproxy v0.1.1 github.com/eosswedenorg-go/pid v1.0.1 github.com/eosswedenorg-go/tcp_server v0.1.1 diff --git a/go.sum b/go.sum index 92ed53c..862b7ca 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,8 @@ github.com/eosswedenorg-go/eos-contract-api-client v0.0.0-20220221105418-dc591fc github.com/eosswedenorg-go/eos-contract-api-client v0.0.0-20220221105418-dc591fcc0dc5/go.mod h1:o/H/XtSXtaNe2ooXIAcp9vApmy2pY5YyeSl3yWgEnLw= github.com/eosswedenorg-go/eosapi v0.1.0 h1:SnVMx1QGPBZoQknjnAiGzjL6hVfrXPLrOdxoUstYUrk= github.com/eosswedenorg-go/eosapi v0.1.0/go.mod h1:7VrkU30cSqRtGDE6bXygWqMcEhCyWOaC9yVA34QIQzM= +github.com/eosswedenorg-go/eosapi v0.1.1 h1:+7DpTz6om3Xluj0ssY0LU5Tj6WKicV9Zlgr8Cso0dlw= +github.com/eosswedenorg-go/eosapi v0.1.1/go.mod h1:5r8ukl/BXbjeydPQNG/eE3+idpuY6XR654nyfcqkZbg= github.com/eosswedenorg-go/haproxy v0.1.1 h1:ClOhoK3uGn70KzGCKHdYNvHoU72whfNq3LbqT/lWlOY= github.com/eosswedenorg-go/haproxy v0.1.1/go.mod h1:WnDKkwYbgrpuKUOtUtWlGCgj43DMV+r4VKGdWSTYQeA= github.com/eosswedenorg-go/pid v1.0.0 h1:k1ra19cgWBHnX5gWQq+eUhNHIjT7hdhsYGp+Ovfvd2U= @@ -16,8 +18,14 @@ github.com/eosswedenorg-go/tcp_server v0.1.1/go.mod h1:JvArWV6imAGj+NkrMJWSWTTe2 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/imroc/req v0.3.2 h1:M/JkeU6RPmX+WYvT2vaaOL0K+q8ufL5LxwvJc4xeB4o= github.com/imroc/req v0.3.2/go.mod h1:F+NZ+2EFSo6EFXdeIbpfE9hcC233id70kf0byW97Caw= +github.com/imroc/req/v3 v3.7.6 h1:SUVWgFt/dJsSzpzpnc8pHdL79zoE6O8FSCfNvbTZXVU= +github.com/imroc/req/v3 v3.7.6/go.mod h1:3JIicOKEDHfCSYYNLb/ObZNpx64EV5y40VlHMwhUCzU= github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac h1:n1DqxAo4oWPMvH1+v+DLYlMCecgumhhgnxAPdqDIFHI= github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= @@ -49,11 +57,20 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +golang.org/x/net v0.0.0-20220111093109-d55c255bac03 h1:0FB83qp0AzVJm+0wcIlauAjJ+tNdh7jLuacRYCIVv7s= +golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/src/api/eosio_v1.go b/src/api/eosio_v1.go index 4e6bce8..c9fce59 100644 --- a/src/api/eosio_v1.go +++ b/src/api/eosio_v1.go @@ -10,28 +10,30 @@ import ( type EosioV1 struct { utils.Time - params eosapi.ReqParams + client eosapi.Client block_time float64 } func NewEosioV1(url string, host string, block_time float64) EosioV1 { - return EosioV1{ - params: eosapi.ReqParams{ - Url: url, - Host: host, - }, + + api := EosioV1{ + client: *eosapi.New(url), block_time: block_time, } + + api.client.Host = host + + return api } func (e EosioV1) LogInfo() LogParams { p := LogParams{ "type", "eosio-v1", - "url", e.params.Url, + "url", e.client.Url, } - if len(e.params.Host) > 0 { - p.Add("host", e.params.Host) + if len(e.client.Host) > 0 { + p.Add("host", e.client.Host) } p.Add("block_time", e.block_time) @@ -41,7 +43,7 @@ func (e EosioV1) LogInfo() LogParams { func (e EosioV1) Call() (agentcheck.Response, string) { - info, err := eosapi.GetInfo(e.params) + info, err := e.client.GetInfo() if err != nil { resp := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") return resp, err.Error() diff --git a/src/api/eosio_v2.go b/src/api/eosio_v2.go index bf949d7..196d314 100644 --- a/src/api/eosio_v2.go +++ b/src/api/eosio_v2.go @@ -9,28 +9,30 @@ import ( ) type EosioV2 struct { - params eosapi.ReqParams + client eosapi.Client offset int64 } func NewEosioV2(url string, host string, offset int64) EosioV2 { - return EosioV2{ - params: eosapi.ReqParams{ - Url: url, - Host: host, - }, + + api := EosioV2{ + client: *eosapi.New(url), offset: offset, } + + api.client.Host = host + + return api } func (e EosioV2) LogInfo() LogParams { p := LogParams{ "type", "eosio-v2", - "url", e.params.Url, + "url", e.client.Url, } - if len(e.params.Host) > 0 { - p.Add("host", e.params.Host) + if len(e.client.Host) > 0 { + p.Add("host", e.client.Host) } p.Add("offset", e.offset) @@ -40,7 +42,7 @@ func (e EosioV2) LogInfo() LogParams { func (e EosioV2) Call() (agentcheck.Response, string) { - health, err := eosapi.GetHealth(e.params) + health, err := e.client.GetHealth() if err != nil { resp := agentcheck.NewStatusMessageResponse(agentcheck.Failed, "") return resp, err.Error()