From c1797e7a32b5bf08fc7d8bfe7c7d8ddad29b1533 Mon Sep 17 00:00:00 2001 From: alfred-mk Date: Mon, 23 Jun 2025 09:32:34 +0300 Subject: [PATCH] use the TokenHoldings instead of TokenDetails --- dev/api.go | 10 +++++----- remote/account_service.go | 2 +- remote/http/service.go | 6 +++--- testutil/mocks/service_mock.go | 4 ++-- testutil/testservice/account_service.go | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev/api.go b/dev/api.go index 15bf94b..65a2b19 100644 --- a/dev/api.go +++ b/dev/api.go @@ -864,17 +864,17 @@ func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context, return swapFromList, nil } -func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) { - var swapToList []dataserviceapi.TokenDetails +func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) { + var swapToList []dataserviceapi.TokenHoldings _, ok := das.pools[poolAddress] if !ok { return nil, fmt.Errorf("Invalid pool address: %v", poolAddress) } for _, voucher := range das.vouchers { - swapToList = append(swapToList, dataserviceapi.TokenDetails{ - TokenAddress: voucher.Address, + swapToList = append(swapToList, dataserviceapi.TokenHoldings{ + ContractAddress: voucher.Address, TokenSymbol: voucher.Symbol, - TokenDecimals: defaultDecimals, + TokenDecimals: strconv.Itoa(voucher.Decimals), }) } return swapToList, nil diff --git a/remote/account_service.go b/remote/account_service.go index ea1fffb..d9708ef 100644 --- a/remote/account_service.go +++ b/remote/account_service.go @@ -24,7 +24,7 @@ type AccountService interface { FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error) RetrievePoolDetails(ctx context.Context, sym string) (*dataserviceapi.PoolDetails, error) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) - GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) + GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) diff --git a/remote/http/service.go b/remote/http/service.go index 2a7fce5..af8f056 100644 --- a/remote/http/service.go +++ b/remote/http/service.go @@ -390,7 +390,7 @@ func (as *HTTPAccountService) getPoolSwappableFromVouchers(ctx context.Context, return r.PoolSwappableVouchers, nil } -func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) { +func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) { svc := dev.NewDevAccountService(ctx, as.SS) if as.UseApi { return as.getPoolSwappableVouchers(ctx, poolAddress) @@ -399,9 +399,9 @@ func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, pool } } -func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) { +func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) { var r struct { - PoolSwappableVouchers []dataserviceapi.TokenDetails `json:"filtered"` + PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"` } basePath, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to") diff --git a/testutil/mocks/service_mock.go b/testutil/mocks/service_mock.go index e00377d..93d0358 100644 --- a/testutil/mocks/service_mock.go +++ b/testutil/mocks/service_mock.go @@ -91,9 +91,9 @@ func (m MockAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1) } -func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) { +func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) { args := m.Called(poolAddress) - return args.Get(0).([]dataserviceapi.TokenDetails), args.Error(1) + return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1) } func (m MockAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) { diff --git a/testutil/testservice/account_service.go b/testutil/testservice/account_service.go index 5766184..3177c98 100644 --- a/testutil/testservice/account_service.go +++ b/testutil/testservice/account_service.go @@ -93,8 +93,8 @@ func (m TestAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po return []dataserviceapi.TokenHoldings{}, nil } -func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) { - return []dataserviceapi.TokenDetails{}, nil +func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) { + return []dataserviceapi.TokenHoldings{}, nil } func (m TestAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {