feat: remove loading from db

feat: migration file to remove table
Bisonai · May 18, 2024 · f294f6d · f294f6d
1 parent 0ce7ace
commit f294f6d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 37 deletions.
diff --git a/delegator/migrations/000003_remove_pk_table.down.sql b/delegator/migrations/000003_remove_pk_table.down.sql
@@ -0,0 +1,4 @@
+CREATE TABLE IF NOT EXISTS "fee_payers" (
+    "privateKey" VARCHAR(66) NOT NULL,
+    CONSTRAINT "fee_payers_privateKey_key" UNIQUE ("privateKey")
+);
diff --git a/delegator/migrations/000003_remove_pk_table.up.sql b/delegator/migrations/000003_remove_pk_table.up.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS "fee_payers";
diff --git a/delegator/tests/globals_test.go b/delegator/tests/globals_test.go
@@ -1,7 +1,6 @@
 package tests
 
 import (
-	"context"
 	"encoding/hex"
 	"fmt"
 	"log"
@@ -17,7 +16,6 @@ import (
 	"bisonai.com/orakl/delegator/sign"
 	"bisonai.com/orakl/delegator/utils"
 
-	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/joho/godotenv"
 	"github.com/klaytn/klaytn/blockchain/types"
 	"github.com/klaytn/klaytn/common"
@@ -77,18 +75,10 @@ func makeMockTransaction() (*types.Transaction, error) {
 		return nil, err
 	}
 
-	pgxPool, pgxError := pgxpool.New(context.Background(), os.Getenv("DATABASE_URL"))
-	if pgxError != nil {
-		return nil, pgxError
-	}
-
 	var feePayerPk string
 
 	if feePayerPk = os.Getenv("DELEGATOR_FEEPAYER_PK"); feePayerPk == "" {
-		feePayerPk, err = utils.LoadFeePayer(pgxPool)
-		if err != nil {
-			return nil, err
-		}
+		return nil, fmt.Errorf("fee payer not initialized")
 	}
 
 	feePayerPublicKey, err := utils.GetPublicKey(feePayerPk)

diff --git a/delegator/utils/utils.go b/delegator/utils/utils.go
@@ -87,18 +87,13 @@ func InitFeePayerPK(ctx context.Context, pgxPool *pgxpool.Pool) error {
 
 	useGoogleSecretManager, _ := strconv.ParseBool(os.Getenv("USE_GOOGLE_SECRET_MANAGER"))
 	useVault, _ := strconv.ParseBool(os.Getenv("USE_VAULT"))
-	if useGoogleSecretManager {
-		feePayer, err = LoadFeePayerFromGSM(ctx)
-		if err != nil {
-			return err
-		}
-	} else if useVault {
+	if useVault {
 		feePayer, err = LoadFeePayerFromVault(ctx)
 		if err != nil {
 			return err
 		}
-	} else {
-		feePayer, err = LoadFeePayer(pgxPool)
+	} else if useGoogleSecretManager {
+		feePayer, err = LoadFeePayerFromGSM(ctx)
 		if err != nil {
 			return err
 		}
@@ -248,24 +243,6 @@ func QueryRowsWithoutFiberCtx[T any](postgres *pgxpool.Pool, query string, args
 	return results, err
 }
 
-func LoadFeePayer(postgres *pgxpool.Pool) (string, error) {
-	rows, err := postgres.Query(context.Background(), "SELECT * FROM fee_payers;")
-	if err != nil {
-		return "", err
-	}
-
-	results, err := pgx.CollectRows(rows, pgx.RowToStructByName[FeePayer])
-	if errors.Is(err, pgx.ErrNoRows) || len(results) == 0 {
-		return "", fmt.Errorf("no fee payer found")
-	}
-
-	if len(results) > 1 {
-		return "", fmt.Errorf("too many fee payers")
-	}
-
-	return results[0].PrivateKey, nil
-}
-
 func LoadFeePayerFromGSM(ctx context.Context) (string, error) {
 	/*
 		When you're running your application on Google Kubernetes Engine (GKE),