Merge pull request #94 from onomyprotocol/auction/remove_oracle_import

remove oracle keeper import in vault keeper

app/keepers/keepers.go

@@ -345,7 +345,6 @@ func NewAppKeeper(
 		appKeepers.AccountKeeper,
 		appKeepers.BankKeeper,
 		&appKeepers.VaultsKeeper,
-		&appKeepers.OracleKeeper,
 		logger,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)

x/auction/keeper/keeper.go

@@ -21,10 +21,9 @@ type (
 		logger       log.Logger
 
 		// keepers
-		authKeeper   types.AccountKeeper
-		bankKeeper   types.BankKeeper
-		vaultKeeper  types.VaultKeeper
-		OracleKeeper types.OracleKeeper
+		authKeeper  types.AccountKeeper
+		bankKeeper  types.BankKeeper
+		vaultKeeper types.VaultKeeper
 
 		// the address capable of executing a MsgUpdateParams message. Typically, this
 		// should be the x/gov module account.
@@ -55,7 +54,6 @@ func NewKeeper(
 	ak types.AccountKeeper,
 	bk types.BankKeeper,
 	vk types.VaultKeeper,
-	ok types.OracleKeeper,
 	logger log.Logger,
 	authority string,
 
@@ -73,7 +71,6 @@ func NewKeeper(
 		authKeeper:            ak,
 		bankKeeper:            bk,
 		vaultKeeper:           vk,
-		OracleKeeper:          ok,
 		AuctionIdSeq:          collections.NewSequence(sb, types.AuctionIdSeqPrefix, "auction_id_sequence"),
 		LastestAuctionPeriods: collections.NewItem(sb, types.LastestAuctionPeriodPrefix, "lastestAuctionPeriods", collections.Int64Value),
 		BidIdSeq:              collections.NewMap(sb, types.BidIdSeqPrefix, "bid_id_sequence", collections.Uint64Key, collections.Uint64Value),

x/auction/module/module.go

@@ -206,7 +206,6 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 		in.AccountKeeper,
 		in.BankKeeper,
 		&in.VaultKeeper,
-		&in.OracleKeeper,
 		in.Logger,
 		authority.String(),
 	)

x/auction/types/expected_keepers.go

@@ -3,8 +3,6 @@ package types
 import (
 	"context"
 
-	"cosmossdk.io/math"
-
 	addresscodec "cosmossdk.io/core/address"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	vaulttypes "github.com/onomyprotocol/reserve/x/vaults/types"
@@ -48,7 +46,3 @@ type VaultKeeper interface {
 	GetVault(ctx context.Context, vaultId uint64) (vaulttypes.Vault, error)
 	GetAllowedMintDenoms(ctx context.Context) []string
 }
-
-type OracleKeeper interface {
-	GetPrice(ctx context.Context, base, quote string) *math.LegacyDec
-}

x/psm/keeper/msg_server.go

@@ -151,7 +151,7 @@ func (k Keeper) checkLimitTotalStablecoin(ctx context.Context, coin sdk.Coin) er
 		return err
 	}
 	if (totalStablecoinLock.Add(coin.Amount)).GT(totalLimit) {
-		return fmt.Errorf("unable to perform %s token swap transaction because the amount of %s you want to swap exceeds the allowed limit, can only swap up to %s%s", coin.Denom, coin.Denom, (totalLimit).Sub(totalStablecoinLock).String(), coin.Denom)
+		return fmt.Errorf("unable to perform %s token swap transaction: exceeds the allowed limit %s , can only swap up to %s%s", coin.Denom, coin.Denom, (totalLimit).Sub(totalStablecoinLock).String(), coin.Denom)
 	}
 
 	return nil

x/psm/types/psm.go

@@ -19,7 +19,6 @@ func GetMsgStablecoin(msg getStablecoinFromMsg) StablecoinInfo {
 type getStablecoinFromMsg interface {
 	GetDenom() string
 	GetLimitTotal() math.Int
-	// GetPrice() math.LegacyDec
 	GetFeeIn() math.LegacyDec
 	GetFeeOut() math.LegacyDec
 	GetSymBol() string