fix: remove unused redis reference

Bisonai · Jul 17, 2024 · 661c9bb · 661c9bb
1 parent d1cde6f
commit 661c9bb
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 67 deletions.
diff --git a/api/tests/apierr_test.go b/api/tests/apierr_test.go
@@ -3,11 +3,12 @@ package tests
 import (
 	"fmt"
 
-	"bisonai.com/orakl/api/apierr"
-	"bisonai.com/orakl/api/utils"
 	"testing"
 	"time"
 
+	"bisonai.com/orakl/api/apierr"
+	"bisonai.com/orakl/api/utils"
+
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/assert"
 )
@@ -38,11 +39,9 @@ func TestApiErr(t *testing.T) {
 	appConfig, _ := utils.Setup()
 
 	pgxClient := appConfig.Postgres
-	redisClient := appConfig.Redis
 	app := appConfig.App
 
 	defer pgxClient.Close()
-	defer redisClient.Close()
 	v1 := app.Group("/api/v1")
 	apierr.Routes(v1)
 

diff --git a/api/tests/chain_test.go b/api/tests/chain_test.go
@@ -1,11 +1,12 @@
 package tests
 
 import (
-	"bisonai.com/orakl/api/chain"
-	"bisonai.com/orakl/api/utils"
 	"fmt"
 	"testing"
 
+	"bisonai.com/orakl/api/chain"
+	"bisonai.com/orakl/api/utils"
+
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/assert"
 )
@@ -22,11 +23,9 @@ func TestChain(t *testing.T) {
 	appConfig, _ := utils.Setup()
 
 	pgxClient := appConfig.Postgres
-	redisClient := appConfig.Redis
 	app := appConfig.App
 
 	defer pgxClient.Close()
-	defer redisClient.Close()
 	v1 := app.Group("/api/v1")
 	chain.Routes(v1)
 

diff --git a/api/tests/listener_test.go b/api/tests/listener_test.go
@@ -1,12 +1,13 @@
 package tests
 
 import (
+	"fmt"
+	"testing"
+
 	"bisonai.com/orakl/api/chain"
 	"bisonai.com/orakl/api/listener"
 	"bisonai.com/orakl/api/service"
 	"bisonai.com/orakl/api/utils"
-	"fmt"
-	"testing"
 
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/assert"
@@ -36,11 +37,9 @@ func TestListener(t *testing.T) {
 	appConfig, _ := utils.Setup()
 
 	pgxClient := appConfig.Postgres
-	redisClient := appConfig.Redis
 	app := appConfig.App
 
 	defer pgxClient.Close()
-	defer redisClient.Close()
 	v1 := app.Group("/api/v1")
 
 	chain.Routes(v1)

diff --git a/api/tests/proxy_test.go b/api/tests/proxy_test.go
@@ -1,11 +1,12 @@
 package tests
 
 import (
-	"bisonai.com/orakl/api/proxy"
-	"bisonai.com/orakl/api/utils"
 	"fmt"
 	"testing"
 
+	"bisonai.com/orakl/api/proxy"
+	"bisonai.com/orakl/api/utils"
+
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/assert"
 )
@@ -33,11 +34,9 @@ func TestProxy(t *testing.T) {
 	appConfig, _ := utils.Setup()
 
 	pgxClient := appConfig.Postgres
-	redisClient := appConfig.Redis
 	app := appConfig.App
 
 	defer pgxClient.Close()
-	defer redisClient.Close()
 	v1 := app.Group("/api/v1")
 	proxy.Routes(v1)
 

diff --git a/api/tests/reporter_test.go b/api/tests/reporter_test.go
@@ -1,12 +1,13 @@
 package tests
 
 import (
+	"fmt"
+	"testing"
+
 	"bisonai.com/orakl/api/chain"
 	"bisonai.com/orakl/api/reporter"
 	"bisonai.com/orakl/api/service"
 	"bisonai.com/orakl/api/utils"
-	"fmt"
-	"testing"
 
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/assert"
@@ -38,11 +39,9 @@ func TestReporter(t *testing.T) {
 	appConfig, _ := utils.Setup()
 
 	pgxClient := appConfig.Postgres
-	redisClient := appConfig.Redis
 	app := appConfig.App
 
 	defer pgxClient.Close()
-	defer redisClient.Close()
 	v1 := app.Group("/api/v1")
 
 	chain.Routes(v1)

diff --git a/api/tests/service_test.go b/api/tests/service_test.go
@@ -1,11 +1,12 @@
 package tests
 
 import (
-	"bisonai.com/orakl/api/service"
-	"bisonai.com/orakl/api/utils"
 	"fmt"
 	"testing"
 
+	"bisonai.com/orakl/api/service"
+	"bisonai.com/orakl/api/utils"
+
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/assert"
 )
@@ -22,11 +23,9 @@ func TestService(t *testing.T) {
 	appConfig, _ := utils.Setup()
 
 	pgxClient := appConfig.Postgres
-	redisClient := appConfig.Redis
 	app := appConfig.App
 
 	defer pgxClient.Close()
-	defer redisClient.Close()
 	v1 := app.Group("/api/v1")
 	service.Routes(v1)
 

diff --git a/api/tests/vrf_test.go b/api/tests/vrf_test.go
@@ -1,11 +1,12 @@
 package tests
 
 import (
+	"fmt"
+	"testing"
+
 	"bisonai.com/orakl/api/chain"
 	"bisonai.com/orakl/api/utils"
 	"bisonai.com/orakl/api/vrf"
-	"fmt"
-	"testing"
 
 	"github.com/joho/godotenv"
 	"github.com/stretchr/testify/assert"
@@ -39,11 +40,9 @@ func TestVrf(t *testing.T) {
 	appConfig, _ := utils.Setup()
 
 	pgxClient := appConfig.Postgres
-	redisClient := appConfig.Redis
 	app := appConfig.App
 
 	defer pgxClient.Close()
-	defer redisClient.Close()
 	v1 := app.Group("/api/v1")
 	vrf.Routes(v1)
 	chain.Routes(v1)

diff --git a/api/utils/utils.go b/api/utils/utils.go
@@ -22,12 +22,10 @@ import (
 	"github.com/gofiber/fiber/v2/middleware/recover"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/redis/go-redis/v9"
 )
 
 type AppConfig struct {
 	Postgres *pgxpool.Pool
-	Redis    *redis.Conn
 	App      *fiber.App
 }
 
@@ -50,33 +48,6 @@ func GetPgx(c *fiber.Ctx) (*pgxpool.Pool, error) {
 	}
 }
 
-func GetRdb(c *fiber.Ctx) (redis.Conn, error) {
-	con, ok := c.Locals("rdb").(redis.Conn)
-	if !ok {
-		return con, errors.New("failed to get rdbConn")
-	} else {
-		return con, nil
-	}
-}
-
-func SetRedis(c *fiber.Ctx, key string, value string) error {
-	redisConn, err := GetRdb(c)
-	if err != nil {
-		return err
-	}
-
-	return redisConn.Set(c.Context(), key, value, 0).Err()
-}
-
-func GetRedis(c *fiber.Ctx, key string) (string, error) {
-	redisConn, err := GetRdb(c)
-	if err != nil {
-		return "", err
-	}
-
-	return redisConn.Get(c.Context(), key).Result()
-}
-
 func RawQueryWithoutReturn(c *fiber.Ctx, query string, args map[string]any) error {
 	pgxPool, err := GetPgx(c)
 	if err != nil {
@@ -149,14 +120,6 @@ func Setup(options ...string) (AppConfig, error) {
 	if pgxError != nil {
 		return appConfig, pgxError
 	}
-	// redis connect
-	rdb := redis.NewClient(&redis.Options{
-		Addr: config["REDIS_HOST"].(string) + ":" + config["REDIS_PORT"].(string),
-	}).Conn()
-	_, rdbErr := rdb.Ping(context.Background()).Result()
-	if rdbErr != nil {
-		return appConfig, rdbErr
-	}
 
 	testing, err := strconv.ParseBool(config["TEST_MODE"].(string))
 	if err != nil {
@@ -178,15 +141,13 @@ func Setup(options ...string) (AppConfig, error) {
 	app.Use(cors.New())
 
 	app.Use(func(c *fiber.Ctx) error {
-		c.Locals("rdb", *rdb)
 		c.Locals("pgxConn", pgxPool)
 		c.Locals("testing", testing)
 		return c.Next()
 	})
 
 	appConfig = AppConfig{
 		Postgres: pgxPool,
-		Redis:    rdb,
 		App:      app,
 	}
 	return appConfig, nil