remove unused var

tellor-io · Dec 4, 2023 · 00703e8 · 00703e8
1 parent a576f88
commit 00703e8
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 17 deletions.
diff --git a/testutil/keeper/registry.go b/testutil/keeper/registry.go
@@ -17,7 +17,7 @@ import (
 	"github.com/tellor-io/layer/x/registry/types"
 )
 
-func RegistryKeeper(t testing.TB) (*keeper.Keeper, sdk.Context, storetypes.KVStoreKey) {
+func RegistryKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	storeKey := sdk.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
@@ -48,5 +48,5 @@ func RegistryKeeper(t testing.TB) (*keeper.Keeper, sdk.Context, storetypes.KVSto
 	// Initialize params
 	k.SetParams(ctx, types.DefaultParams())
 
-	return k, ctx, *storeKey
+	return k, ctx
 }
diff --git a/x/registry/genesis_test.go b/x/registry/genesis_test.go
@@ -17,7 +17,7 @@ func TestGenesis(t *testing.T) {
 		// this line is used by starport scaffolding # genesis/test/state
 	}
 
-	k, ctx, _ := keepertest.RegistryKeeper(t)
+	k, ctx := keepertest.RegistryKeeper(t)
 	registry.InitGenesis(ctx, *k, genesisState)
 	got := registry.ExportGenesis(ctx, *k)
 	require.NotNil(t, got)

diff --git a/x/registry/keeper/keeper_test.go b/x/registry/keeper/keeper_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestKeeper(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)

diff --git a/x/registry/keeper/msg_server_register_query_test.go b/x/registry/keeper/msg_server_register_query_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestRegisterQuery(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)

diff --git a/x/registry/keeper/msg_server_register_spec_test.go b/x/registry/keeper/msg_server_register_spec_test.go
@@ -8,7 +8,7 @@ import (
 )
 
 func TestRegisterSpec(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)

diff --git a/x/registry/keeper/msg_server_test.go b/x/registry/keeper/msg_server_test.go
@@ -4,21 +4,20 @@ import (
 	"context"
 	"testing"
 
-	storeTypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
 	keepertest "github.com/tellor-io/layer/testutil/keeper"
 	"github.com/tellor-io/layer/x/registry/keeper"
 	"github.com/tellor-io/layer/x/registry/types"
 )
 
-func setupMsgServer(t testing.TB) (types.MsgServer, context.Context, keeper.Keeper, storeTypes.KVStoreKey) {
-	k, ctx, key := keepertest.RegistryKeeper(t)
-	return keeper.NewMsgServerImpl(*k), sdk.WrapSDKContext(ctx), *k, key
+func setupMsgServer(t testing.TB) (types.MsgServer, context.Context, keeper.Keeper) {
+	k, ctx := keepertest.RegistryKeeper(t)
+	return keeper.NewMsgServerImpl(*k), sdk.WrapSDKContext(ctx), *k
 }
 
 func TestMsgServer(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)

diff --git a/x/registry/keeper/params_test.go b/x/registry/keeper/params_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestGetParams(t *testing.T) {
-	k, ctx, _ := testkeeper.RegistryKeeper(t)
+	k, ctx := testkeeper.RegistryKeeper(t)
 	params := types.DefaultParams()
 
 	k.SetParams(ctx, params)

diff --git a/x/registry/keeper/query_get_data_spec_test.go b/x/registry/keeper/query_get_data_spec_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestQueryGetDataSpec(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)
@@ -50,7 +50,7 @@ func TestQueryGetDataSpec(t *testing.T) {
 }
 
 func TestQueryGetDataSpecSpec(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)

diff --git a/x/registry/keeper/query_get_query_data_test.go b/x/registry/keeper/query_get_query_data_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestQueryGetQueryData(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)
@@ -60,7 +60,7 @@ func TestQueryGetQueryData(t *testing.T) {
 }
 
 func TestIsQueryIdValid(t *testing.T) {
-	ms, ctx, k, _ := setupMsgServer(t)
+	ms, ctx, k := setupMsgServer(t)
 	require.NotNil(t, ms)
 	require.NotNil(t, ctx)
 	require.NotNil(t, k)

diff --git a/x/registry/keeper/query_params_test.go b/x/registry/keeper/query_params_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestParamsQuery(t *testing.T) {
-	keeper, ctx, _ := testkeeper.RegistryKeeper(t)
+	keeper, ctx := testkeeper.RegistryKeeper(t)
 	wctx := sdk.WrapSDKContext(ctx)
 	params := types.DefaultParams()
 	keeper.SetParams(ctx, params)