WIP

sagaxyz · Aug 14, 2024 · 80512f1 · 80512f1
1 parent f4122c5
commit 80512f1
Show file tree

Hide file tree

Showing 11 changed files with 140 additions and 169 deletions.
diff --git a/Makefile b/Makefile
@@ -203,10 +203,10 @@ all: tools build lint test vulncheck
 # .PHONY: build build-linux-amd64 build-linux-arm64 cosmovisor
 
 
-# mocks: $(MOCKS_DIR)
-# 	@go install github.com/golang/mock/mockgen@v1.6.0
-# 	sh ./scripts/mockgen.sh
-# .PHONY: mocks
+mocks: $(MOCKS_DIR)
+	@go install github.com/golang/mock/mockgen@v1.6.0
+	sh ./scripts/mockgen.sh
+.PHONY: mocks
 
 
 # vulncheck: $(BUILDDIR)/
@@ -605,4 +605,4 @@ release:
 		ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
 		release --rm-dist --skip-validate
 
-.PHONY: release-dry-run release
+.PHONY: release-dry-run release
diff --git a/testutil/keeper/billing.go b/testutil/keeper/billing.go
@@ -12,17 +12,19 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
+	"github.com/stretchr/testify/require"
+	"cosmossdk.io/store/metrics"
+
 	"github.com/sagaxyz/ssc/x/billing/keeper"
 	"github.com/sagaxyz/ssc/x/billing/types"
-	"github.com/stretchr/testify/require"
 )
 
 func BillingKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
-	storeKey := sdk.NewKVStoreKey(types.StoreKey)
+	storeKey := storetypes.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
 	db := tmdb.NewMemDB()
-	stateStore := store.NewCommitMultiStore(db)
+	stateStore := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 	stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db)
 	stateStore.MountStoreWithDB(memStoreKey, storetypes.StoreTypeMemory, nil)
 	require.NoError(t, stateStore.LoadLatestVersion())
@@ -39,7 +41,6 @@ func BillingKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	k := keeper.NewKeeper(
 		cdc,
 		storeKey,
-		memStoreKey,
 		paramsSubspace,
 		nil,
 		nil,

diff --git a/testutil/keeper/chainlet.go b/testutil/keeper/chainlet.go
@@ -2,10 +2,7 @@ package keeper
 
 import (
 	"testing"
-
-	"github.com/sagaxyz/ssc/x/chainlet/keeper"
-	"github.com/sagaxyz/ssc/x/chainlet/types"
-
+
 	tmdb "github.com/cosmos/cosmos-db"
 	"cosmossdk.io/log"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
@@ -15,15 +12,19 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
+	"cosmossdk.io/store/metrics"
 	"github.com/stretchr/testify/require"
+
+	"github.com/sagaxyz/ssc/x/chainlet/keeper"
+	"github.com/sagaxyz/ssc/x/chainlet/types"
 )
 
 func ChainletKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
-	storeKey := sdk.NewKVStoreKey(types.StoreKey)
+	storeKey := storetypes.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
 	db := tmdb.NewMemDB()
-	stateStore := store.NewCommitMultiStore(db)
+	stateStore := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 	stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db)
 	stateStore.MountStoreWithDB(memStoreKey, storetypes.StoreTypeMemory, nil)
 	require.NoError(t, stateStore.LoadLatestVersion())
@@ -40,7 +41,6 @@ func ChainletKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	k := keeper.NewKeeper(
 		cdc,
 		storeKey,
-		memStoreKey,
 		paramsSubspace,
 		nil,
 		nil,

diff --git a/testutil/keeper/epochs.go b/testutil/keeper/epochs.go
@@ -9,18 +9,20 @@ import (
 	"cosmossdk.io/store"
 	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"cosmossdk.io/store/metrics"
+	"github.com/stretchr/testify/require"
+
 	"github.com/sagaxyz/ssc/x/epochs"
 	"github.com/sagaxyz/ssc/x/epochs/keeper"
 	"github.com/sagaxyz/ssc/x/epochs/types"
-	"github.com/stretchr/testify/require"
 )
 
 func EpochsKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
-	storeKey := sdk.NewKVStoreKey(types.StoreKey)
+	storeKey := storetypes.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
 	db := tmdb.NewMemDB()
-	stateStore := store.NewCommitMultiStore(db)
+	stateStore := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 	stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db)
 	stateStore.MountStoreWithDB(memStoreKey, storetypes.StoreTypeMemory, nil)
 	require.NoError(t, stateStore.LoadLatestVersion())

diff --git a/testutil/keeper/escrow.go b/testutil/keeper/escrow.go
@@ -12,17 +12,19 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
+	"github.com/stretchr/testify/require"
+	"cosmossdk.io/store/metrics"
+
 	"github.com/sagaxyz/ssc/x/escrow/keeper"
 	"github.com/sagaxyz/ssc/x/escrow/types"
-	"github.com/stretchr/testify/require"
 )
 
 func EscrowKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
-	storeKey := sdk.NewKVStoreKey(types.StoreKey)
+	storeKey := storetypes.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
 	db := tmdb.NewMemDB()
-	stateStore := store.NewCommitMultiStore(db)
+	stateStore := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 	stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db)
 	stateStore.MountStoreWithDB(memStoreKey, storetypes.StoreTypeMemory, nil)
 	require.NoError(t, stateStore.LoadLatestVersion())
@@ -40,7 +42,6 @@ func EscrowKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 	k := keeper.NewKeeper(
 		cdc,
 		storeKey,
-		memStoreKey,
 		paramsSubspace,
 		nil,
 		nil,

diff --git a/testutil/keeper/peers.go b/testutil/keeper/peers.go
@@ -3,9 +3,6 @@ package keeper
 import (
 	"testing"
 
-	"github.com/sagaxyz/ssc/x/peers/keeper"
-	"github.com/sagaxyz/ssc/x/peers/types"
-
 	"cosmossdk.io/log"
 	"cosmossdk.io/store"
 	storetypes "cosmossdk.io/store/types"
@@ -14,16 +11,21 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"cosmossdk.io/store/metrics"
 	typesparams "github.com/cosmos/cosmos-sdk/x/params/types"
 	"github.com/stretchr/testify/require"
+
+	"github.com/sagaxyz/ssc/x/peers/keeper"
+	"github.com/sagaxyz/ssc/x/peers/types"
+
 )
 
 func PeersKeeper(t testing.TB) (keeper.Keeper, sdk.Context) {
-	storeKey := sdk.NewKVStoreKey(types.StoreKey)
+	storeKey := storetypes.NewKVStoreKey(types.StoreKey)
 	memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey)
 
 	db := tmdb.NewMemDB()
-	stateStore := store.NewCommitMultiStore(db)
+	stateStore := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
 	stateStore.MountStoreWithDB(storeKey, storetypes.StoreTypeIAVL, db)
 	stateStore.MountStoreWithDB(memStoreKey, storetypes.StoreTypeMemory, nil)
 	require.NoError(t, stateStore.LoadLatestVersion())
@@ -40,7 +42,6 @@ func PeersKeeper(t testing.TB) (keeper.Keeper, sdk.Context) {
 	k := keeper.New(
 		cdc,
 		storeKey,
-		memStoreKey,
 		paramsSubspace,
 		nil,
 	)