Merge branch 'main' into feat/removal-msg

skip-mev · Sep 23, 2024 · bc9c93c · bc9c93c
2 parents 68414d8 + 9e81c12
commit bc9c93c
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 156 deletions.
diff --git a/abci/strategies/currencypair/mocks/mock_oracle_keeper.go b/abci/strategies/currencypair/mocks/mock_oracle_keeper.go
diff --git a/abci/strategies/currencypair/types.go b/abci/strategies/currencypair/types.go
@@ -1,6 +1,7 @@
 package currencypair
 
 import (
+	"context"
 	"math/big"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -13,12 +14,12 @@ import (
 //
 //go:generate mockery --name OracleKeeper --filename mock_oracle_keeper.go
 type OracleKeeper interface {
-	GetCurrencyPairFromID(ctx sdk.Context, id uint64) (cp connecttypes.CurrencyPair, found bool)
-	GetIDForCurrencyPair(ctx sdk.Context, cp connecttypes.CurrencyPair) (uint64, bool)
-	GetPriceForCurrencyPair(ctx sdk.Context, cp connecttypes.CurrencyPair) (oracletypes.QuotePrice, error)
-	GetNumCurrencyPairs(ctx sdk.Context) (uint64, error)
-	GetNumRemovedCurrencyPairs(ctx sdk.Context) (uint64, error)
-	GetAllCurrencyPairs(ctx sdk.Context) []connecttypes.CurrencyPair
+	GetCurrencyPairFromID(ctx context.Context, id uint64) (cp connecttypes.CurrencyPair, found bool)
+	GetIDForCurrencyPair(ctx context.Context, cp connecttypes.CurrencyPair) (uint64, bool)
+	GetPriceForCurrencyPair(ctx context.Context, cp connecttypes.CurrencyPair) (oracletypes.QuotePrice, error)
+	GetNumCurrencyPairs(ctx context.Context) (uint64, error)
+	GetNumRemovedCurrencyPairs(ctx context.Context) (uint64, error)
+	GetAllCurrencyPairs(ctx context.Context) []connecttypes.CurrencyPair
 }
 
 // CurrencyPairStrategy is a strategy for generating a unique ID and price representation for a given currency pair.

diff --git a/abci/types/interfaces.go b/abci/types/interfaces.go
@@ -3,7 +3,6 @@ package types
 import (
 	"context"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"google.golang.org/grpc"
 
 	connecttypes "github.com/skip-mev/connect/v2/pkg/types"
@@ -17,8 +16,8 @@ import (
 //
 //go:generate mockery --name OracleKeeper --filename mock_oracle_keeper.go
 type OracleKeeper interface { //golint:ignore
-	GetAllCurrencyPairs(ctx sdk.Context) []connecttypes.CurrencyPair
-	SetPriceForCurrencyPair(ctx sdk.Context, cp connecttypes.CurrencyPair, qp oracletypes.QuotePrice) error
+	GetAllCurrencyPairs(ctx context.Context) []connecttypes.CurrencyPair
+	SetPriceForCurrencyPair(ctx context.Context, cp connecttypes.CurrencyPair, qp oracletypes.QuotePrice) error
 }
 
 // OracleClient defines the interface that must be fulfilled by the connect client.