Skip to content

Commit 38edce9

Browse files
authored
refactor: revert api refactor (#1848)
1 parent b54bf07 commit 38edce9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+123
-134
lines changed

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@
116116
"default": "./esm/index.js"
117117
},
118118
"./api": {
119-
"types": "./esm/core/api/index.d.ts",
120-
"module": "./esm/core/api/index.js",
121-
"import": "./esm/core/api/index.js",
122-
"default": "./esm/core/api/index.js"
119+
"types": "./esm/api/index.d.ts",
120+
"module": "./esm/api/index.js",
121+
"import": "./esm/api/index.js",
122+
"default": "./esm/api/index.js"
123123
},
124124
"./buy": {
125125
"types": "./esm/buy/index.d.ts",

src/core/api/buildMintTransaction.test.ts src/api/buildMintTransaction.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { CDP_MINT_TOKEN } from '@/core/network/definitions/nft';
2+
import { sendRequest } from '@/core/network/request';
13
import { type Mock, describe, expect, it, vi } from 'vitest';
2-
import { CDP_MINT_TOKEN } from '../network/definitions/nft';
3-
import { sendRequest } from '../network/request';
44
import { buildMintTransaction } from './buildMintTransaction';
55
import type { BuildMintTransactionParams } from './types';
66

7-
vi.mock('../network/request', () => ({
7+
vi.mock('@/core/network/request', () => ({
88
sendRequest: vi.fn(),
99
}));
1010

src/core/api/buildMintTransaction.ts src/api/buildMintTransaction.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { CDP_MINT_TOKEN } from '../network/definitions/nft';
2-
import { sendRequest } from '../network/request';
1+
import { CDP_MINT_TOKEN } from '../core/network/definitions/nft';
2+
import { sendRequest } from '../core/network/request';
33
import type {
44
BuildMintTransactionParams,
55
BuildMintTransactionResponse,

src/core/api/buildPayTransaction.test.ts src/api/buildPayTransaction.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { afterEach, describe, expect, it, vi } from 'vitest';
2-
import type { Mock } from 'vitest';
31
import {
42
CHECKOUT_INVALID_CHARGE_ERROR_MESSAGE,
53
UNCAUGHT_CHECKOUT_ERROR_MESSAGE,
6-
} from '../../checkout/constants';
4+
} from '@/checkout/constants';
75
import {
86
CDP_CREATE_PRODUCT_CHARGE,
97
CDP_HYDRATE_CHARGE,
10-
} from '../network/definitions/pay';
11-
import { sendRequest } from '../network/request';
8+
} from '@/core/network/definitions/pay';
9+
import { sendRequest } from '@/core/network/request';
10+
import { afterEach, describe, expect, it, vi } from 'vitest';
11+
import type { Mock } from 'vitest';
1212
/**
1313
* @vitest-environment node
1414
*/
@@ -28,7 +28,7 @@ import type {
2828
HydrateChargeAPIParams,
2929
} from './types';
3030

31-
vi.mock('../network/request');
31+
vi.mock('@/core/network/request');
3232

3333
describe('buildPayTransaction', () => {
3434
afterEach(() => {

src/core/api/buildPayTransaction.ts src/api/buildPayTransaction.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
22
CDP_CREATE_PRODUCT_CHARGE,
33
CDP_HYDRATE_CHARGE,
4-
} from '../network/definitions/pay';
5-
import { type JSONRPCResult, sendRequest } from '../network/request';
4+
} from '../core/network/definitions/pay';
5+
import { type JSONRPCResult, sendRequest } from '../core/network/request';
66
import type {
77
BuildPayTransactionParams,
88
BuildPayTransactionResponse,

src/core/api/buildSwapTransaction.test.ts src/api/buildSwapTransaction.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { CDP_GET_SWAP_TRADE } from '@/core/network/definitions/swap';
2+
import { sendRequest } from '@/core/network/request';
3+
import { DEGEN_TOKEN, ETH_TOKEN } from '@/swap/mocks';
14
import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
2-
import { DEGEN_TOKEN, ETH_TOKEN } from '../../swap/mocks';
3-
import { CDP_GET_SWAP_TRADE } from '../network/definitions/swap';
4-
import { sendRequest } from '../network/request';
55
import { buildSwapTransaction } from './buildSwapTransaction';
66
import type { BuildSwapTransaction } from './types';
77
/**
@@ -10,7 +10,7 @@ import type { BuildSwapTransaction } from './types';
1010
import { getAPIParamsForToken } from './utils/getAPIParamsForToken';
1111
import { getSwapTransaction } from './utils/getSwapTransaction';
1212

13-
vi.mock('../network/request');
13+
vi.mock('@/core/network/request');
1414

1515
const testFromAddress = '0x6Cd01c0F55ce9E0Bf78f5E90f72b4345b16d515d';
1616
const testAmount = '3305894409732200';

src/core/api/buildSwapTransaction.ts src/api/buildSwapTransaction.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { SwapAPIResponse } from '../../swap/types';
2-
import { getSwapErrorCode } from '../../swap/utils/getSwapErrorCode';
3-
import { CDP_GET_SWAP_TRADE } from '../network/definitions/swap';
4-
import { sendRequest } from '../network/request';
1+
import { CDP_GET_SWAP_TRADE } from '../core/network/definitions/swap';
2+
import { sendRequest } from '../core/network/request';
3+
import type { SwapAPIResponse } from '../swap/types';
4+
import { getSwapErrorCode } from '../swap/utils/getSwapErrorCode';
55
import type {
66
BuildSwapTransactionParams,
77
BuildSwapTransactionResponse,

src/core/api/getMintDetails.test.ts src/api/getMintDetails.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { CDP_GET_MINT_DETAILS } from '@/core/network/definitions/nft';
2+
import { sendRequest } from '@/core/network/request';
13
import { type Mock, describe, expect, it, vi } from 'vitest';
2-
import { CDP_GET_MINT_DETAILS } from '../network/definitions/nft';
3-
import { sendRequest } from '../network/request';
44
import { getMintDetails } from './getMintDetails';
55
import type { GetMintDetailsParams } from './types';
66

7-
vi.mock('../network/request', () => ({
7+
vi.mock('@/core/network/request', () => ({
88
sendRequest: vi.fn(),
99
}));
1010

src/core/api/getMintDetails.ts src/api/getMintDetails.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { CDP_GET_MINT_DETAILS } from '../network/definitions/nft';
2-
import { sendRequest } from '../network/request';
1+
import { CDP_GET_MINT_DETAILS } from '../core/network/definitions/nft';
2+
import { sendRequest } from '../core/network/request';
33
import type { GetMintDetailsParams, GetMintDetailsResponse } from './types';
44

55
/**

src/core/api/getPortfolioTokenBalances.test.ts src/api/getPortfolioTokenBalances.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import type {
22
PortfolioTokenBalances,
33
PortfolioTokenWithFiatValue,
4-
} from '@/core/api/types';
4+
} from '@/api/types';
5+
import { CDP_GET_PORTFOLIO_TOKEN_BALANCES } from '@/core/network/definitions/wallet';
56
import type { Address } from 'viem';
67
import { type Mock, describe, expect, it, vi } from 'vitest';
7-
import { CDP_GET_PORTFOLIO_TOKEN_BALANCES } from '../network/definitions/wallet';
8-
import { sendRequest } from '../network/request';
8+
import { sendRequest } from '../core/network/request';
99
import { getPortfolioTokenBalances } from './getPortfolioTokenBalances';
1010

11-
vi.mock('../network/request', () => ({
11+
vi.mock('@/core/network/request', () => ({
1212
sendRequest: vi.fn(),
1313
}));
1414

src/core/api/getPortfolioTokenBalances.ts src/api/getPortfolioTokenBalances.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { CDP_GET_PORTFOLIO_TOKEN_BALANCES } from '../network/definitions/wallet';
2-
import { sendRequest } from '../network/request';
1+
import { CDP_GET_PORTFOLIO_TOKEN_BALANCES } from '@/core/network/definitions/wallet';
2+
import { sendRequest } from '@/core/network/request';
33
import type {
44
GetPortfolioTokenBalancesParams,
55
GetPortfoliosAPIResponse,

src/core/api/getSwapQuote.test.ts src/api/getSwapQuote.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
import { CDP_GET_SWAP_QUOTE } from '@/core/network/definitions/swap';
2+
import { sendRequest } from '@/core/network/request';
13
import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
2-
import { DEGEN_TOKEN, ETH_TOKEN } from '../../swap/mocks';
3-
import { CDP_GET_SWAP_QUOTE } from '../network/definitions/swap';
4-
import { sendRequest } from '../network/request';
4+
import { DEGEN_TOKEN, ETH_TOKEN } from '../swap/mocks';
55
/**
66
* @vitest-environment node
77
*/
88
import { getSwapQuote } from './getSwapQuote';
99
import { getAPIParamsForToken } from './utils/getAPIParamsForToken';
1010

11-
vi.mock('../network/request');
11+
vi.mock('@/core/network/request');
1212

1313
const testAmount = '3305894409732200';
1414
const testAmountReference = 'from';

src/core/api/getSwapQuote.ts src/api/getSwapQuote.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { SwapQuote } from '../../swap/types';
2-
import { getSwapErrorCode } from '../../swap/utils/getSwapErrorCode';
3-
import { CDP_GET_SWAP_QUOTE } from '../network/definitions/swap';
4-
import { sendRequest } from '../network/request';
1+
import { CDP_GET_SWAP_QUOTE } from '../core/network/definitions/swap';
2+
import { sendRequest } from '../core/network/request';
3+
import type { SwapQuote } from '../swap/types';
4+
import { getSwapErrorCode } from '../swap/utils/getSwapErrorCode';
55
import type {
66
GetSwapQuoteParams,
77
GetSwapQuoteResponse,

src/core/api/getTokenDetails.test.ts src/api/getTokenDetails.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { CDP_GET_TOKEN_DETAILS } from '@/core/network/definitions/nft';
2+
import { sendRequest } from '@/core/network/request';
13
import { type Mock, describe, expect, it, vi } from 'vitest';
2-
import { CDP_GET_TOKEN_DETAILS } from '../network/definitions/nft';
3-
import { sendRequest } from '../network/request';
44
import { getTokenDetails } from './getTokenDetails';
55
import type { GetTokenDetailsParams } from './types';
66

7-
vi.mock('../network/request', () => ({
7+
vi.mock('@/core/network/request', () => ({
88
sendRequest: vi.fn(),
99
}));
1010

src/core/api/getTokenDetails.ts src/api/getTokenDetails.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { CDP_GET_TOKEN_DETAILS } from '../network/definitions/nft';
2-
import { sendRequest } from '../network/request';
1+
import { CDP_GET_TOKEN_DETAILS } from '../core/network/definitions/nft';
2+
import { sendRequest } from '../core/network/request';
33
import type { GetTokenDetailsParams, GetTokenDetailsResponse } from './types';
44

55
/**

src/core/api/getTokens.test.ts src/api/getTokens.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { CDP_LIST_SWAP_ASSETS } from '@/core/network/definitions/swap';
2+
import { sendRequest } from '@/core/network/request';
13
import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
2-
import { CDP_LIST_SWAP_ASSETS } from '../network/definitions/swap';
3-
import { sendRequest } from '../network/request';
44
/**
55
* @vitest-environment node
66
*/
77
import { getTokens } from './getTokens';
88

9-
vi.mock('../network/request');
9+
vi.mock('@/core/network/request');
1010

1111
describe('getTokens', () => {
1212
afterEach(() => {

src/core/api/getTokens.ts src/api/getTokens.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { Token } from '../../token/types';
2-
import { CDP_LIST_SWAP_ASSETS } from '../network/definitions/swap';
3-
import { sendRequest } from '../network/request';
1+
import { CDP_LIST_SWAP_ASSETS } from '../core/network/definitions/swap';
2+
import { sendRequest } from '../core/network/request';
3+
import type { Token } from '../token/types';
44
import type { GetTokensOptions, GetTokensResponse } from './types';
55

66
/**
File renamed without changes.
File renamed without changes.

src/core/api/types.ts src/api/types.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
import type { Address } from 'viem';
2-
import type {
3-
Fee,
4-
QuoteWarning,
5-
SwapQuote,
6-
Transaction,
7-
} from '../../swap/types';
8-
import type { Token } from '../../token/types';
2+
import type { Fee, QuoteWarning, SwapQuote, Transaction } from '../swap/types';
3+
import type { Token } from '../token/types';
94

105
export type AddressOrETH = Address | 'ETH';
116

src/core/api/utils/getAPIParamsForToken.test.ts src/api/utils/getAPIParamsForToken.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest';
22
/**
33
* @vitest-environment node
44
*/
5-
import { DEGEN_TOKEN, ETH_TOKEN } from '../../../swap/mocks';
5+
import { DEGEN_TOKEN, ETH_TOKEN } from '../../swap/mocks';
66
import { getAPIParamsForToken } from './getAPIParamsForToken';
77

88
describe('getAPIParamsForToken', () => {

src/core/api/utils/getAPIParamsForToken.ts src/api/utils/getAPIParamsForToken.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { formatDecimals } from '../../../swap/utils/formatDecimals';
1+
import { formatDecimals } from '../../swap/utils/formatDecimals';
22
import type {
33
APIError,
44
BuildSwapTransactionParams,

src/core/api/utils/getPayErrorMessage.test.ts src/api/utils/getPayErrorMessage.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
CHECKOUT_TOO_MANY_REQUESTS_ERROR_MESSAGE,
66
GENERAL_CHECKOUT_ERROR_MESSAGE,
77
UNCAUGHT_CHECKOUT_ERROR_MESSAGE,
8-
} from '../../../checkout/constants';
8+
} from '../../checkout/constants';
99
import { getPayErrorMessage } from './getPayErrorMessage';
1010

1111
describe('getPayErrorMessage', () => {

src/core/api/utils/getPayErrorMessage.ts src/api/utils/getPayErrorMessage.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
CHECKOUT_TOO_MANY_REQUESTS_ERROR_MESSAGE,
55
GENERAL_CHECKOUT_ERROR_MESSAGE,
66
UNCAUGHT_CHECKOUT_ERROR_MESSAGE,
7-
} from '../../../checkout/constants';
7+
} from '../../checkout/constants';
88

99
export function getPayErrorMessage(errorCode?: number) {
1010
if (!errorCode) {

src/core/api/utils/getSwapTransaction.ts src/api/utils/getSwapTransaction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Address, Hex } from 'viem';
2-
import type { Transaction } from '../../../swap/types';
2+
import type { Transaction } from '../../swap/types';
33
import type { RawTransactionData } from '../types';
44

55
/**

src/buy/components/BuyProvider.test.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ import { waitForTransactionReceipt } from 'wagmi/actions';
2929
import { base } from 'wagmi/chains';
3030
import { mock } from 'wagmi/connectors';
3131
import { useSendCalls } from 'wagmi/experimental';
32+
import { buildSwapTransaction } from '../../api/buildSwapTransaction';
33+
import type { GetSwapQuoteResponse } from '../../api/types';
3234
import { useCapabilitiesSafe } from '../../core-react/internal/hooks/useCapabilitiesSafe';
3335
import { useOnchainKit } from '../../core-react/useOnchainKit';
34-
import { buildSwapTransaction } from '../../core/api/buildSwapTransaction';
35-
import type { GetSwapQuoteResponse } from '../../core/api/types';
3636
import type { LifecycleStatus, SwapError, SwapUnit } from '../../swap/types';
3737
import { getSwapErrorCode } from '../../swap/utils/getSwapErrorCode';
3838
import {
@@ -63,7 +63,7 @@ vi.mock('../hooks/useBuyTokens', () => ({
6363
useBuyTokens: vi.fn(),
6464
}));
6565

66-
vi.mock('../../core/api/buildSwapTransaction', () => ({
66+
vi.mock('@/api/buildSwapTransaction', () => ({
6767
buildSwapTransaction: vi
6868
.fn()
6969
.mockRejectedValue(new Error('buildSwapTransaction')),

src/buy/components/BuyProvider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import { base } from 'viem/chains';
1010
import { useAccount, useConfig, useSendTransaction } from 'wagmi';
1111
import { useSwitchChain } from 'wagmi';
1212
import { useSendCalls } from 'wagmi/experimental';
13+
import { buildSwapTransaction } from '../../api/buildSwapTransaction';
1314
import { useCapabilitiesSafe } from '../../core-react/internal/hooks/useCapabilitiesSafe';
1415
import { useValue } from '../../core-react/internal/hooks/useValue';
1516
import { useOnchainKit } from '../../core-react/useOnchainKit';
16-
import { buildSwapTransaction } from '../../core/api/buildSwapTransaction';
1717
import { FALLBACK_DEFAULT_MAX_SLIPPAGE } from '../../swap/constants';
1818
import { useAwaitCalls } from '../../swap/hooks/useAwaitCalls';
1919
import type { LifecycleStatus, SwapUnit } from '../../swap/types';

src/buy/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import type { APIError, GetSwapQuoteResponse } from '@/api/types';
12
import type { LifecycleStatusUpdate } from '@/core-react/internal/types';
2-
import type { APIError, GetSwapQuoteResponse } from '@/core/api/types';
33
import type {
44
LifecycleStatus,
55
SwapConfig,

src/buy/utils/getBuyQuote.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { getSwapQuote } from '@/core/api/getSwapQuote';
1+
import { getSwapQuote } from '@/api/getSwapQuote';
22
import { formatTokenAmount } from '@/core/utils/formatTokenAmount';
33
import type { Token } from '@/token/types';
44
import { base } from 'viem/chains';
55
import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
66
import { isSwapError } from '../../swap/utils/isSwapError';
77
import { getBuyQuote } from './getBuyQuote';
88

9-
vi.mock('@/core/api/getSwapQuote');
9+
vi.mock('@/api/getSwapQuote');
1010
vi.mock('@/core/utils/formatTokenAmount');
1111
vi.mock('../../swap/utils/isSwapError');
1212

src/buy/utils/getBuyQuote.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
import { getSwapQuote } from '@/core/api/getSwapQuote';
2-
import type {
3-
GetSwapQuoteParams,
4-
GetSwapQuoteResponse,
5-
} from '@/core/api/types';
1+
import { getSwapQuote } from '@/api/getSwapQuote';
2+
import type { GetSwapQuoteParams, GetSwapQuoteResponse } from '@/api/types';
63
import { formatTokenAmount } from '@/core/utils/formatTokenAmount';
74
import type { SwapError, SwapUnit } from '../../swap/types';
85
import { isSwapError } from '../../swap/utils/isSwapError';

src/buy/utils/validateQuote.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
2-
import type { GetSwapQuoteResponse } from '../../core/api/types';
2+
import type { GetSwapQuoteResponse } from '../../api/types';
33
import type { SwapUnit } from '../../swap/types';
44
import { isSwapError } from '../../swap/utils/isSwapError';
55
import { validateQuote } from './validateQuote';

src/buy/utils/validateQuote.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import type { GetSwapQuoteResponse } from '@/api/types';
12
import type { LifecycleStatusUpdate } from '@/core-react/internal/types';
2-
import type { GetSwapQuoteResponse } from '@/core/api/types';
33
import type { LifecycleStatus, SwapUnit } from '@/swap/types';
44
import { isSwapError } from '../../swap/utils/isSwapError';
55

src/checkout/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { LifecycleStatusUpdate } from '@/core-react/internal/types';
22
import type { ContractFunctionParameters, TransactionReceipt } from 'viem';
33
import type { Address } from 'viem';
44
import type { Config } from 'wagmi';
5-
import type { PayTransaction } from '../core/api/types';
5+
import type { PayTransaction } from '../api/types';
66
import type { TransactionError } from '../transaction';
77

88
/**

src/checkout/utils/getCommerceContracts.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { PayTransaction } from '@/core/api/types';
1+
import type { PayTransaction } from '@/api/types';
22
import { erc20Abi } from 'viem';
33
import { describe, expect, it } from 'vitest';
44
import { COMMERCE_ABI, CONTRACT_METHODS } from '../constants';

src/checkout/utils/handlePayRequest.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { Address } from 'viem';
22
import { type Mock, describe, expect, it, vi } from 'vitest';
33

4-
import { buildPayTransaction } from '../../core/api';
4+
import { buildPayTransaction } from '@/api';
55
import { handlePayRequest } from './handlePayRequest';
66

7-
vi.mock('../../core/api', () => ({
7+
vi.mock('@/api', () => ({
88
buildPayTransaction: vi.fn(),
99
}));
1010

0 commit comments

Comments
 (0)