config/config.go

@@ -19,9 +19,8 @@ const (
 	poolDepositPrefix          = "/api/v2/pool/deposit"
 	poolSwapQoutePrefix        = "/api/v2/pool/quote"
 	poolSwapPrefix             = "/api/v2/pool/swap"
-	topPoolsPrefix              = "/api/v1/pool/top"
-	retrievePoolDetailsPrefix   = "/api/v1/pool/reverse"
-	poolSwappableVouchersPrefix = "/api/v1/pool"
+	topPoolsPrefix             = "/api/v1/pool/top"
+	retrievePoolDetailsPrefix  = "/api/v1/pool/reverse"
 )
 
 var (
@@ -31,21 +30,20 @@ var (
 )
 
 var (
-	CreateAccountURL         string
-	TrackStatusURL           string
-	BalanceURL               string
-	TrackURL                 string
-	TokenTransferURL         string
-	VoucherHoldingsURL       string
-	VoucherTransfersURL      string
-	VoucherDataURL           string
-	CheckAliasURL            string
-	PoolDepositURL           string
-	PoolSwapQuoteURL         string
-	PoolSwapURL              string
-	TopPoolsURL              string
-	RetrievePoolDetailsURL   string
-	PoolSwappableVouchersURL string
+	CreateAccountURL       string
+	TrackStatusURL         string
+	BalanceURL             string
+	TrackURL               string
+	TokenTransferURL       string
+	VoucherHoldingsURL     string
+	VoucherTransfersURL    string
+	VoucherDataURL         string
+	CheckAliasURL          string
+	PoolDepositURL         string
+	PoolSwapQuoteURL       string
+	PoolSwapURL            string
+	TopPoolsURL            string
+	RetrievePoolDetailsURL string
 )
 
 func setBase() error {
@@ -86,7 +84,6 @@ func LoadConfig() error {
 	PoolSwapURL, _ = url.JoinPath(custodialURLBase, poolSwapPrefix)
 	TopPoolsURL, _ = url.JoinPath(dataURLBase, topPoolsPrefix)
 	RetrievePoolDetailsURL, _ = url.JoinPath(dataURLBase, retrievePoolDetailsPrefix)
-	PoolSwappableVouchersURL, _ = url.JoinPath(dataURLBase, poolSwappableVouchersPrefix)
 
 	return nil
 }

remote/http/service.go

@@ -339,56 +339,13 @@ func (as *HTTPAccountService) GetPoolSwapQuote(ctx context.Context, amount, from
 }
 
 func (as *HTTPAccountService) GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
-	if as.UseApi {
-		return as.getPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
-	} else {
-		svc := dev.NewDevAccountService(ctx, as.SS)
-		return svc.GetPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
-	}
-
-}
-
-func (as *HTTPAccountService) getPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
-	var r struct {
-		PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
-	}
-	ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "from", publicKey)
-	if err != nil {
-		return nil, err
-	}
-	req, err := http.NewRequest("GET", ep, nil)
-	if err != nil {
-		return nil, err
-	}
-	_, err = doRequest(ctx, req, &r)
-
-	return r.PoolSwappableVouchers, nil
+	svc := dev.NewDevAccountService(ctx, as.SS)
+	return svc.GetPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
 }
 
 func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
 	svc := dev.NewDevAccountService(ctx, as.SS)
-	if as.UseApi {
-		return as.getPoolSwappableFromVouchers(ctx, poolAddress, publicKey)
-	} else {
-		return svc.GetPoolSwappableVouchers(ctx, poolAddress, publicKey)
-	}
-}
-
-func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
-	var r struct {
-		PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
-	}
-
-	ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to", publicKey)
-	if err != nil {
-		return nil, err
-	}
-	req, err := http.NewRequest("GET", ep, nil)
-	if err != nil {
-		return nil, err
-	}
-	_, err = doRequest(ctx, req, &r)
-	return r.PoolSwappableVouchers, nil
+	return svc.GetPoolSwappableVouchers(ctx, poolAddress, publicKey)
 }
 
 func (as *HTTPAccountService) PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error) {
@@ -419,30 +376,8 @@ func (as *HTTPAccountService) PoolSwap(ctx context.Context, amount, from, fromTo
 }
 
 func (as *HTTPAccountService) GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error) {
-	if as.UseApi {
-		return as.getSwapFromTokenMaxLimit(ctx, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
-	} else {
-		svc := dev.NewDevAccountService(ctx, as.SS)
-		return svc.GetSwapFromTokenMaxLimit(ctx, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
-	}
-}
-
-func (as *HTTPAccountService) getSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokeAddress, publicKey string) (*models.MaxLimitResult, error) {
-	var r struct {
-		MaxPoolLimitResult models.MaxLimitResult `json:"max"`
-	}
-
-	ep, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "limit", fromTokenAddress, toTokeAddress, publicKey)
-	if err != nil {
-		return nil, err
-	}
-	req, err := http.NewRequest("GET", ep, nil)
-	if err != nil {
-		return nil, err
-	}
-	_, err = doRequest(ctx, req, &r)
-
-	return &r.MaxPoolLimitResult, nil
+	svc := dev.NewDevAccountService(ctx, as.SS)
+	return svc.GetSwapFromTokenMaxLimit(ctx, poolAddress, fromTokenAddress, toTokenAddress, publicKey)
 }
 
 // TODO: Use actual custodial api to request available alias