From 5d27bf0ad23c4d7e1c6f4b8cf8aff6c8578a616e Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Tue, 16 Aug 2022 19:46:39 +0200
Subject: [PATCH] src/api: change v1 and v2 constructor to not expose eosapi
 package structs.

---
 src/api/v1.go | 7 +++++--
 src/api/v2.go | 7 +++++--
 src/server.go | 5 ++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/api/v1.go b/src/api/v1.go
index 532e097..cd6545f 100644
--- a/src/api/v1.go
+++ b/src/api/v1.go
@@ -13,9 +13,12 @@ type EosioV1 struct {
     block_time float64
 }
 
-func NewEosioV1(params eosapi.ReqParams, block_time float64) EosioV1 {
+func NewEosioV1(url string, host string, block_time float64) EosioV1 {
     return EosioV1{
-        params: params,
+        params: eosapi.ReqParams{
+            Url: url,
+            Host: host,
+        },
         block_time: block_time,
     }
 }
diff --git a/src/api/v2.go b/src/api/v2.go
index e263c9e..bf949d7 100644
--- a/src/api/v2.go
+++ b/src/api/v2.go
@@ -13,9 +13,12 @@ type EosioV2 struct {
     offset int64
 }
 
-func NewEosioV2(params eosapi.ReqParams, offset int64) EosioV2 {
+func NewEosioV2(url string, host string, offset int64) EosioV2 {
     return EosioV2{
-        params: params,
+        params: eosapi.ReqParams{
+            Url: url,
+            Host: host,
+        },
         offset: offset,
     }
 }
diff --git a/src/server.go b/src/server.go
index ac37b8b..fa03e96 100644
--- a/src/server.go
+++ b/src/server.go
@@ -5,7 +5,6 @@ import (
     "strings"
     "strconv"
     "github.com/eosswedenorg/eosio-api-healthcheck/src/api"
-    "github.com/eosswedenorg-go/eosapi"
     "github.com/eosswedenorg-go/haproxy/agentcheck"
     "github.com/eosswedenorg-go/tcp_server"
 )
@@ -21,9 +20,9 @@ func createApi(a *arguments) (api.ApiInterface, error) {
 
     switch a.api {
     case "v1":
-        return api.NewEosioV1(eosapi.ReqParams{Url: a.url, Host: a.host}, float64(a.num_blocks / 2)), nil
+        return api.NewEosioV1(a.url, a.host, float64(a.num_blocks / 2)), nil
     case "v2":
-        return api.NewEosioV2(eosapi.ReqParams{Url: a.url, Host: a.host}, int64(a.num_blocks)), nil
+        return api.NewEosioV2(a.url, a.host, int64(a.num_blocks)), nil
     case "contract":
         return api.NewEosioContract(a.url, float64(a.num_blocks / 2)), nil
     case "test":