From 92c605c7fa6d90b2e63f7e06f07dfb1da9793dd8 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Thu, 12 Jan 2023 16:48:04 +0100
Subject: [PATCH] move internal/abi_cache to abi

---
 {internal/abi_cache => abi}/cache.go      | 4 ++--
 {internal/abi_cache => abi}/cache_test.go | 6 +++---
 abi/manager.go                            | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename {internal/abi_cache => abi}/cache.go (90%)
 rename {internal/abi_cache => abi}/cache_test.go (97%)

diff --git a/internal/abi_cache/cache.go b/abi/cache.go
similarity index 90%
rename from internal/abi_cache/cache.go
rename to abi/cache.go
index 30e50a4..7066bfd 100644
--- a/internal/abi_cache/cache.go
+++ b/abi/cache.go
@@ -1,4 +1,4 @@
-package abi_cache
+package abi
 
 import (
 	"context"
@@ -14,7 +14,7 @@ type Cache struct {
 	prefix string
 }
 
-func New(prefix string, options *redis_cache.Options) *Cache {
+func NewCache(prefix string, options *redis_cache.Options) *Cache {
 	return &Cache{
 		c:      redis_cache.New(options),
 		ctx:    context.Background(),
diff --git a/internal/abi_cache/cache_test.go b/abi/cache_test.go
similarity index 97%
rename from internal/abi_cache/cache_test.go
rename to abi/cache_test.go
index f90fb3e..4d1d0d2 100644
--- a/internal/abi_cache/cache_test.go
+++ b/abi/cache_test.go
@@ -1,4 +1,4 @@
-package abi_cache
+package abi
 
 import (
 	"strings"
@@ -73,7 +73,7 @@ var abiString = `
 `
 
 func TestGetSet(t *testing.T) {
-	c := New("abi.cache.test", &redis_cache.Options{
+	c := NewCache("abi.cache.test", &redis_cache.Options{
 		Redis: redis.NewClient(&redis.Options{}),
 		// Cache 10k keys for 1 minute.
 		LocalCache: redis_cache.NewTinyLFU(10000, time.Minute),
@@ -139,7 +139,7 @@ func TestGetSet(t *testing.T) {
 }
 
 func TestCacheMiss(t *testing.T) {
-	c := New("abi.cache.test", &redis_cache.Options{
+	c := NewCache("abi.cache.test", &redis_cache.Options{
 		Redis: redis.NewClient(&redis.Options{}),
 		// Cache 10k keys for 1 minute.
 		LocalCache: redis_cache.NewTinyLFU(10000, time.Minute),
diff --git a/abi/manager.go b/abi/manager.go
index 371bea7..28fd1e0 100644
--- a/abi/manager.go
+++ b/abi/manager.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	"eosio-ship-trace-reader/internal/abi_cache"
 	"eosio-ship-trace-reader/internal/redis"
 
 	eos "github.com/eoscanada/eos-go"
@@ -13,14 +12,14 @@ import (
 )
 
 type AbiManager struct {
-	cache *abi_cache.Cache
+	cache *Cache
 	api   *eos.API
 	ctx   context.Context
 }
 
 func NewAbiManager(api *eos.API, id string) *AbiManager {
 	// Init abi cache
-	cache := abi_cache.New("ship.cache."+id+".abi", &redis_cache.Options{
+	cache := NewCache("ship.cache."+id+".abi", &redis_cache.Options{
 		Redis: redis.Client(),
 		// Cache 10k keys for 10 minutes.
 		LocalCache: redis_cache.NewTinyLFU(10000, 10*time.Minute),