initiate interfaces in margin keeper

config.yml

@@ -357,5 +357,5 @@ genesis:
         sq_modifier: "1.0"
         safety_factor: "1.0"
         incremental_interest_payment_enabled: true
-        whitelisting_enabled: true
+        whitelisting_enabled: false
   chain_id: elystestnet-1

x/accountedpool/keeper/accounted_pool.go

@@ -26,6 +26,7 @@ func (k Keeper) GetAccountedPool(
 	b := store.Get(types.AccountedPoolKey(
 		PoolId,
 	))
+
 	if b == nil {
 		return val, false
 	}

x/accountedpool/keeper/invariant_check_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	margintypes "github.com/elys-network/elys/x/margin/types"
-	"github.com/elys-network/elys/x/margin/types/mocks"
 )
 
 func TestCheckBalanceInvariant_InvalidBalance(t *testing.T) {
@@ -101,23 +100,9 @@ func TestCheckBalanceInvariant_InvalidBalance(t *testing.T) {
 		margintypes.Position_LONG,
 		sdk.NewDec(5),
 	)
-	// Setup the mock checker
-	mockAuthorizationChecker := new(mocks.AuthorizationChecker)
-	mk.AuthorizationChecker = mockAuthorizationChecker
-
-	// Mock behavior
-	mockAuthorizationChecker.On("IsWhitelistingEnabled", ctx).Return(true)
-	mockAuthorizationChecker.On("CheckIfWhitelisted", ctx, pool.GetAddress()).Return(true)
-
-	// Setup the mock checker
-	mockPositionChecker := new(mocks.PositionChecker)
-
-	// Mock behavior
-	mockPositionChecker.On("GetOpenMTPCount", ctx).Return(uint64(0))
-	mockPositionChecker.On("GetMaxOpenPositions", ctx).Return(10)
-	mk.PositionChecker = mockPositionChecker
 
 	_, err = mk.Open(ctx, msg2)
+	panic(err)
 	require.NoError(t, err)
 
 	mtps := mk.GetAllMTPs(ctx)

x/accountedpool/keeper/keeper.go

@@ -14,8 +14,6 @@ import (
 
 type (
 	Keeper struct {
-		types.InvariantChecker
-
 		cdc        codec.BinaryCodec
 		storeKey   storetypes.StoreKey
 		memKey     storetypes.StoreKey

x/accountedpool/types/expected_keepers.go

@@ -53,8 +53,3 @@ type MarginKeeper interface {
 	IsPoolClosed(ctx sdk.Context, poolId uint64) bool
 	GetAllMTPs(ctx sdk.Context) []margintypes.MTP
 }
-
-//go:generate mockery --srcpkg . --name InvariantChecker --structname InvariantChecker --filename invariant_check.go --with-expecter
-type InvariantChecker interface {
-	InvariantCheck(ctx sdk.Context) error
-}

x/accountedpool/types/keys.go

@@ -2,7 +2,7 @@ package types
 
 const (
 	// ModuleName defines the module name
-	ModuleName = "tvl"
+	ModuleName = "poolaccounted"
 
 	// StoreKey defines the primary module store key
 	StoreKey = ModuleName
@@ -11,10 +11,10 @@ const (
 	RouterKey = ModuleName
 
 	// MemStoreKey defines the in-memory store key
-	MemStoreKey = "mem_tvl"
+	MemStoreKey = "mem_poolaccounted"
 
-	// ParamsKey is the prefix for parameters of margin module
-	ParamsKey = "tvl_params"
+	// ParamsKey is the prefix for parameters of poolaccounted module
+	ParamsKey = "poolaccounted_params"
 )
 
 func KeyPrefix(p string) []byte {

x/margin/keeper/keeper.go

@@ -54,7 +54,7 @@ func NewKeeper(
 		panic("authority is not a valid acc address")
 	}
 
-	return &Keeper{
+	keeper := &Keeper{
 		cdc:          cdc,
 		storeKey:     storeKey,
 		memKey:       memKey,
@@ -64,6 +64,13 @@ func NewKeeper(
 		oracleKeeper: oracleKeeper,
 		apKeeper:     apKeeper,
 	}
+
+	keeper.AuthorizationChecker = keeper
+	keeper.PositionChecker = keeper
+	keeper.PoolChecker = keeper
+	keeper.OpenLongChecker = keeper
+
+	return keeper
 }
 
 func (k Keeper) Logger(ctx sdk.Context) log.Logger {

x/margin/types/expected_keepers.go

@@ -16,7 +16,7 @@ type AuthorizationChecker interface {
 //go:generate mockery --srcpkg . --name PositionChecker --structname PositionChecker --filename position_checker.go --with-expecter
 type PositionChecker interface {
 	GetOpenMTPCount(ctx sdk.Context) uint64
-	GetMaxOpenPositions(ctx sdk.Context) int
+	GetMaxOpenPositions(ctx sdk.Context) int64
 }
 
 //go:generate mockery --srcpkg . --name PoolChecker --structname PoolChecker --filename pool_checker.go --with-expecter

x/margin/types/params.go

@@ -56,7 +56,7 @@ func NewParams() Params {
 		SqModifier:                               sdk.NewDec(1),
 		SafetyFactor:                             sdk.NewDec(1),
 		IncrementalInterestPaymentEnabled:        true,
-		WhitelistingEnabled:                      true,
+		WhitelistingEnabled:                      false,
 	}
 }
 

x/margin/types/pool.go

@@ -9,10 +9,10 @@ import (
 func NewPool(poolId uint64) Pool {
 	return Pool{
 		AmmPoolId:    poolId,
-		Health:       sdk.ZeroDec(),
+		Health:       sdk.NewDec(100),
 		Enabled:      true,
 		Closed:       false,
-		InterestRate: sdk.ZeroDec(),
+		InterestRate: sdk.NewDecFromIntWithPrec(sdk.NewInt(1), 1),
 		PoolAssets:   []PoolAsset{},
 	}
 }