Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions client/chain/markets_assistant.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/shopspring/decimal"

"github.com/InjectiveLabs/sdk-go/client/core"
"github.com/InjectiveLabs/sdk-go/client/exchange"
)

type TokenMetadata interface {
Expand Down Expand Up @@ -56,15 +55,19 @@ func NewHumanReadableMarketsAssistant(ctx context.Context, chainClient ChainClie
return assistant, err
}

func NewMarketsAssistantWithAllTokens(ctx context.Context, exchangeClient exchange.ExchangeClient, chainClient ChainClient) (MarketsAssistant, error) {
// NewMarketsAssistantWithAllTokens initializes a MarketsAssistant by first fetching all token metadata from the chain's bank module
// @deprecated removed exchangeClient
func NewMarketsAssistantWithAllTokens(ctx context.Context, exchangeClient any, chainClient ChainClient) (MarketsAssistant, error) {
assistant := newMarketsAssistant()
assistant.initializeTokensFromChainDenoms(ctx, chainClient)
err := assistant.initializeFromChainV1Markets(ctx, chainClient)

return assistant, err
}

func NewHumanReadableMarketsAssistantWithAllTokens(ctx context.Context, exchangeClient exchange.ExchangeClient, chainClient ChainClientV2) (MarketsAssistant, error) {
// NewHumanReadableMarketsAssistantWithAllTokens initializes a MarketsAssistant by first fetching all token metadata from the chain's bank module
// @deprecated removed exchangeClient
func NewHumanReadableMarketsAssistantWithAllTokens(ctx context.Context, exchangeClient any, chainClient ChainClientV2) (MarketsAssistant, error) {
assistant := newMarketsAssistant()
assistant.initializeTokensFromChainDenoms(ctx, chainClient)
err := assistant.initializeFromChainV2Markets(ctx, chainClient)
Expand Down
9 changes: 2 additions & 7 deletions client/chain/markets_assistant_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
exchangev2types "github.com/InjectiveLabs/sdk-go/chain/exchange/types/v2"
"github.com/InjectiveLabs/sdk-go/client/common"
"github.com/InjectiveLabs/sdk-go/client/core"
"github.com/InjectiveLabs/sdk-go/client/exchange"
)

func TestMarketAssistantCreation(t *testing.T) {
Expand Down Expand Up @@ -179,8 +178,6 @@ func TestMarketAssistantCreationWithAllTokens(t *testing.T) {
network := common.NewNetwork()
network.OfficialTokensListURL = httpServer.URL

mockExchange := exchange.MockExchangeClient{}
mockExchange.Network = network
mockChain := MockChainClient{}
smartDenomMetadata := createSmartDenomMetadata()

Expand All @@ -193,7 +190,7 @@ func TestMarketAssistantCreationWithAllTokens(t *testing.T) {
})

ctx := context.Background()
assistant, err := NewMarketsAssistantWithAllTokens(ctx, &mockExchange, &mockChain)
assistant, err := NewMarketsAssistantWithAllTokens(ctx, nil, &mockChain)

assert.NoError(t, err)

Expand Down Expand Up @@ -365,8 +362,6 @@ func TestHumanReadableMarketAssistantCreationWithAllTokens(t *testing.T) {
network := common.NewNetwork()
network.OfficialTokensListURL = httpServer.URL

mockExchange := exchange.MockExchangeClient{}
mockExchange.Network = network
mockChain := MockChainClientV2{}
smartDenomMetadata := createSmartDenomMetadata()

Expand All @@ -379,7 +374,7 @@ func TestHumanReadableMarketAssistantCreationWithAllTokens(t *testing.T) {
})

ctx := context.Background()
assistant, err := NewHumanReadableMarketsAssistantWithAllTokens(ctx, &mockExchange, &mockChain)
assistant, err := NewHumanReadableMarketsAssistantWithAllTokens(ctx, nil, &mockChain)

assert.NoError(t, err)

Expand Down