testing

skip-mev · Apr 5, 2024 · 83616ec · 83616ec
1 parent f2ebef3
commit 83616ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/providers/apis/defi/raydium/price_fetcher.go b/providers/apis/defi/raydium/price_fetcher.go
@@ -178,6 +178,9 @@ func (pf *APIPriceFetcher) Fetch(
 	// We assume that the solana JSON-RPC response returns all accounts in the order
 	// that they were queried, there is not a very good way to handle if this order is incorrect
 	// or verify that the order is correct, as there is no way to correlate account data <> address
+	ctx, cancel := context.WithTimeout(ctx, pf.config.Timeout)
+	defer cancel()
+
 	accountsResp, err := pf.client.GetMultipleAccountsWithOpts(ctx, accounts, &rpc.GetMultipleAccountsOpts{
 		Commitment: rpc.CommitmentFinalized,
 		// TODO(nikhil): Keep track of latest height queried as well?

diff --git a/providers/apis/defi/raydium/price_fetcher_test.go b/providers/apis/defi/raydium/price_fetcher_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/gagliardetto/solana-go"
 	"github.com/gagliardetto/solana-go/programs/token"
 	"github.com/gagliardetto/solana-go/rpc"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
@@ -305,7 +306,11 @@ func TestProviderInit(t *testing.T) {
 			Timeout:          2 * time.Second,
 			ReconnectTimeout: 2 * time.Second,
 			Name:             raydium.Name,
-			URL:              "https://raydium.io",
+			Endpoints: 	  []oracleconfig.Endpoint{
+				{
+					URL: "https://raydium.io",
+				},
+			},
 		}
 		market := oracletypes.ProviderMarketMap{
 			Name: raydium.Name,
@@ -422,7 +427,7 @@ func TestProviderFetch(t *testing.T) {
 		usdcVaultPk := solana.MustPublicKeyFromBase58(USDCVaultAddress)
 		ethVaultPk := solana.MustPublicKeyFromBase58(ETHVaultAddress)
 		usdtVaultPk := solana.MustPublicKeyFromBase58(USDTVaultAddress)
-		client.On("GetMultipleAccountsWithOpts", ctx, []solana.PublicKey{
+		client.On("GetMultipleAccountsWithOpts", mock.Anything, []solana.PublicKey{
 			btcVaultPk, usdcVaultPk, ethVaultPk, usdtVaultPk,
 		}, &rpc.GetMultipleAccountsOpts{
 			Commitment: rpc.CommitmentFinalized,
@@ -447,7 +452,7 @@ func TestProviderFetch(t *testing.T) {
 		usdcVaultPk := solana.MustPublicKeyFromBase58(USDCVaultAddress)
 		ethVaultPk := solana.MustPublicKeyFromBase58(ETHVaultAddress)
 		usdtVaultPk := solana.MustPublicKeyFromBase58(USDTVaultAddress)
-		client.On("GetMultipleAccountsWithOpts", ctx, []solana.PublicKey{
+		client.On("GetMultipleAccountsWithOpts", mock.Anything, []solana.PublicKey{
 			btcVaultPk, usdcVaultPk, ethVaultPk, usdtVaultPk,
 		}, &rpc.GetMultipleAccountsOpts{
 			Commitment: rpc.CommitmentFinalized,
@@ -513,7 +518,7 @@ func TestProviderFetch(t *testing.T) {
 		}
 		solTokenVaultMetadata.MarshalWithEncoder(solEnc)
 
-		client.On("GetMultipleAccountsWithOpts", ctx, []solana.PublicKey{
+		client.On("GetMultipleAccountsWithOpts", mock.Anything, []solana.PublicKey{
 			btcVaultPk, usdcVaultPk, ethVaultPk, usdtVaultPk, mogVaultPk, solVaultPk,
 		}, &rpc.GetMultipleAccountsOpts{
 			Commitment: rpc.CommitmentFinalized,
@@ -556,7 +561,7 @@ func TestProviderFetch(t *testing.T) {
 		btcVaultPk := solana.MustPublicKeyFromBase58(BTCVaultAddress)
 		usdcVaultPk := solana.MustPublicKeyFromBase58(USDCVaultAddress)
 
-		client.On("GetMultipleAccountsWithOpts", ctx, []solana.PublicKey{
+		client.On("GetMultipleAccountsWithOpts", mock.Anything, []solana.PublicKey{
 			btcVaultPk, usdcVaultPk,
 		}, &rpc.GetMultipleAccountsOpts{
 			Commitment: rpc.CommitmentFinalized,