diff --git a/internal/db/dbclient_test.go b/internal/db/dbclient_test.go index 78a128e9..4f383a02 100644 --- a/internal/db/dbclient_test.go +++ b/internal/db/dbclient_test.go @@ -5,20 +5,21 @@ package db_test import ( "context" "fmt" + "log" + "os" + "testing" + "time" + "github.com/babylonlabs-io/babylon-staking-indexer/internal/config" "github.com/babylonlabs-io/babylon-staking-indexer/internal/db" "github.com/babylonlabs-io/babylon-staking-indexer/internal/db/model" - "github.com/babylonlabs-io/babylon-staking-indexer/internal/utils" + "github.com/babylonlabs-io/babylon-staking-indexer/testutil" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" "github.com/stretchr/testify/require" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" - "log" - "os" - "testing" - "time" ) const ( @@ -81,7 +82,7 @@ func setupMongoContainer() (*config.DbConfig, func(), error) { // there can be only 1 container with the same name, so we add // random string in the end in case there is still old container running - containerName := "mongo-integration-tests-db-" + utils.RandomAlphaNum(3) + containerName := "mongo-integration-tests-db-" + testutil.RandomAlphaNum(3) resource, err := pool.RunWithOptions(&dockertest.RunOptions{ Name: containerName, Repository: "mongo", diff --git a/internal/db/timelock_test.go b/internal/db/timelock_test.go index 1aee8d2d..3ad8dff1 100644 --- a/internal/db/timelock_test.go +++ b/internal/db/timelock_test.go @@ -4,13 +4,14 @@ package db_test import ( "context" + "math" + "testing" + "github.com/babylonlabs-io/babylon-staking-indexer/internal/db/model" "github.com/babylonlabs-io/babylon-staking-indexer/internal/types" - "github.com/babylonlabs-io/babylon-staking-indexer/internal/utils" + "github.com/babylonlabs-io/babylon-staking-indexer/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "math" - "testing" ) func TestTimeLock(t *testing.T) { @@ -25,17 +26,17 @@ func TestTimeLock(t *testing.T) { }) t.Run("find documents", func(t *testing.T) { expiredDelegation1 := model.TimeLockDocument{ - StakingTxHashHex: utils.RandomAlphaNum(10), + StakingTxHashHex: testutil.RandomAlphaNum(10), ExpireHeight: 1, DelegationSubState: types.SubStateTimelock, } expiredDelegation2 := model.TimeLockDocument{ - StakingTxHashHex: utils.RandomAlphaNum(10), + StakingTxHashHex: testutil.RandomAlphaNum(10), ExpireHeight: 5, DelegationSubState: types.SubStateTimelock, } nonExpiredDelegation := model.TimeLockDocument{ - StakingTxHashHex: utils.RandomAlphaNum(10), + StakingTxHashHex: testutil.RandomAlphaNum(10), ExpireHeight: 10, DelegationSubState: types.SubStateTimelock, } diff --git a/internal/utils/rand_test.go b/internal/utils/rand_test.go deleted file mode 100644 index 4bc472fd..00000000 --- a/internal/utils/rand_test.go +++ /dev/null @@ -1,21 +0,0 @@ -package utils - -import ( - "testing" - "github.com/stretchr/testify/assert" -) - -func TestRandomAlphaNum(t *testing.T) { - // negative case - str := RandomAlphaNum(-1) - assert.Empty(t, str) - - // zero length - str = RandomAlphaNum(0) - assert.Empty(t, str) - - // usual case - length := 9 - str = RandomAlphaNum(length) - assert.Len(t, str, length) -} diff --git a/internal/utils/rand.go b/testutil/rand.go similarity index 96% rename from internal/utils/rand.go rename to testutil/rand.go index f07118d3..881fff4e 100644 --- a/internal/utils/rand.go +++ b/testutil/rand.go @@ -1,4 +1,4 @@ -package utils +package testutil import ( "math/rand"