Merge branch 'ryan/fix-test' into 'main'

Fix broken test

See merge request flarenetwork/FSP/flare-system-c-chain-indexer!76

Author: tilenflare

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/ethereum/go-ethereum v1.13.8
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/gorilla/mux v1.8.1
+	github.com/joho/godotenv v1.5.1
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/zap v1.27.0

go.sum

@@ -132,6 +132,8 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw=
 github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=

main_test.go

@@ -2,18 +2,21 @@ package main_test
 
 import (
 	"context"
-	"flare-ftso-indexer/chain"
-	"flare-ftso-indexer/config"
-	"flare-ftso-indexer/database"
-	"flare-ftso-indexer/indexer"
 	"os"
 	"strconv"
 	"strings"
 	"testing"
+	"time"
+
+	"flare-ftso-indexer/chain"
+	"flare-ftso-indexer/config"
+	"flare-ftso-indexer/database"
+	"flare-ftso-indexer/indexer"
 
 	"github.com/BurntSushi/toml"
 	"github.com/bradleyjkemp/cupaloy/v2"
 	"github.com/ethereum/go-ethereum/common"
+	_ "github.com/joho/godotenv/autoload"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
@@ -25,6 +28,7 @@ const (
 	startBlock         = 6446256
 	endBlockHistory    = 6447813
 	endBlockContinuous = 6446306
+	testTimeout        = 10 * time.Second
 )
 
 type testConfig struct {
@@ -55,35 +59,44 @@ type IntegrationIndexHistorySuite struct {
 }
 
 func TestIntegrationIndexContinuous(t *testing.T) {
+	ctx := context.Background()
 	testSuite := new(IntegrationIndexContinuousSuite)
-	err := testSuite.prepareSuite(false)
+	err := testSuite.prepareSuite(ctx, false)
 	if err != nil {
 		t.Fatal("Could not prepare the test suite:", err)
 	}
 	suite.Run(t, testSuite)
 }
 
 func TestIntegrationIndexHistory(t *testing.T) {
+	ctx := context.Background()
 	testSuite := new(IntegrationIndexHistorySuite)
-	err := testSuite.prepareSuite(true)
+	err := testSuite.prepareSuite(ctx, true)
 	if err != nil {
 		t.Fatal("Could not prepare the test suite")
 	}
 	suite.Run(t, testSuite)
 }
 
-func (suite *IntegrationIndexContinuousSuite) SetupSuite(ctx context.Context) {
+func (suite *IntegrationIndexContinuousSuite) SetupSuite() {
+	ctx := context.Background()
+
 	err := suite.indexer.IndexContinuous(ctx, startBlock)
 	require.NoError(suite.T(), err, "Could not run the indexer")
 }
 
-func (suite *IntegrationIndexHistorySuite) SetupSuite(ctx context.Context) {
+func (suite *IntegrationIndexHistorySuite) SetupSuite() {
+	ctx := context.Background()
+
 	lastIndex, err := suite.indexer.IndexHistory(ctx)
 	require.NoError(suite.T(), err, "Could not run the indexer")
 	require.Equal(suite.T(), uint64(endBlockHistory), lastIndex, "Last indexed block does not match expected value")
 }
 
-func (suite *IntegrationIndex) TestCheckBlocks(ctx context.Context) {
+func (suite *IntegrationIndex) TestCheckBlocks() {
+	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+	defer cancel()
+
 	var blocks []database.Block
 	result := suite.db.WithContext(ctx).Order("hash ASC").Find(&blocks)
 	require.NoError(suite.T(), result.Error, "Could not find blocks")
@@ -96,7 +109,10 @@ func (suite *IntegrationIndex) TestCheckBlocks(ctx context.Context) {
 	cupaloy.SnapshotT(suite.T(), blocks)
 }
 
-func (suite *IntegrationIndex) TestCheckTransactions(ctx context.Context) {
+func (suite *IntegrationIndex) TestCheckTransactions() {
+	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+	defer cancel()
+
 	var transactions []database.Transaction
 	result := suite.db.WithContext(ctx).Order("hash ASC").Find(&transactions)
 	require.NoError(suite.T(), result.Error, "Could not find transactions")
@@ -109,7 +125,10 @@ func (suite *IntegrationIndex) TestCheckTransactions(ctx context.Context) {
 	cupaloy.SnapshotT(suite.T(), transactions)
 }
 
-func (suite *IntegrationIndex) TestCheckLogs(ctx context.Context) {
+func (suite *IntegrationIndex) TestCheckLogs() {
+	ctx, cancel := context.WithTimeout(context.Background(), testTimeout)
+	defer cancel()
+
 	var logs []database.Log
 	result := suite.db.WithContext(ctx).
 		Preload("Transaction").
@@ -125,8 +144,7 @@ func (suite *IntegrationIndex) TestCheckLogs(ctx context.Context) {
 	cupaloy.SnapshotT(suite.T(), logs)
 }
 
-func (suite *IntegrationIndex) prepareSuite(isHistory bool) error {
-	ctx := context.Background()
+func (suite *IntegrationIndex) prepareSuite(ctx context.Context, isHistory bool) error {
 	tCfg := testConfig{}
 
 	_, err := toml.DecodeFile("testing/config_test.toml", &tCfg)