refactor(experimental): Move RPC API types from rpc-transport to rpc-…

…types

packages/accounts/package.json

@@ -66,7 +66,6 @@
         "@solana/codecs-core": "workspace:*",
         "@solana/codecs-strings": "workspace:*",
         "@solana/rpc-core": "workspace:*",
-        "@solana/rpc-transport": "workspace:*",
         "@solana/rpc-types": "workspace:*"
     },
     "devDependencies": {

packages/accounts/src/__tests__/__setup__.ts

@@ -1,5 +1,6 @@
 import type { Address } from '@solana/addresses';
 import type { Decoder } from '@solana/codecs-core';
+import type { GetAccountInfoApi, GetMultipleAccountsApi } from '@solana/rpc-core';
 import type {
     AccountInfoBase,
     AccountInfoWithBase58Bytes,
@@ -8,9 +9,7 @@ import type {
     RpcResponse,
     U64UnsafeBeyond2Pow53Minus1,
 } from '@solana/rpc-core/dist/types/rpc-methods/common';
-import type { GetAccountInfoApi } from '@solana/rpc-core/dist/types/rpc-methods/getAccountInfo';
-import type { GetMultipleAccountsApi } from '@solana/rpc-core/dist/types/rpc-methods/getMultipleAccounts';
-import type { PendingRpcRequest, Rpc } from '@solana/rpc-transport/dist/types/json-rpc-types';
+import type { PendingRpcRequest, Rpc } from '@solana/rpc-types';
 
 export type Base64RpcAccount = AccountInfoBase & AccountInfoWithBase64EncodedData;
 export type Base58RpcAccount = AccountInfoBase & (AccountInfoWithBase58Bytes | AccountInfoWithBase58EncodedData);

packages/accounts/src/__typetests__/fetch-account-typetest.ts

@@ -1,7 +1,6 @@
 import { Address } from '@solana/addresses';
-import { GetAccountInfoApi } from '@solana/rpc-core';
-import { GetMultipleAccountsApi } from '@solana/rpc-core/dist/types/rpc-methods/getMultipleAccounts';
-import { Rpc } from '@solana/rpc-transport';
+import type { GetAccountInfoApi, GetMultipleAccountsApi } from '@solana/rpc-core';
+import type { Rpc } from '@solana/rpc-types';
 
 import {
     fetchEncodedAccount,

packages/accounts/src/fetch-account.ts

@@ -2,8 +2,7 @@ import type { Address } from '@solana/addresses';
 import type { Slot } from '@solana/rpc-core/dist/types/rpc-methods/common';
 import type { GetAccountInfoApi } from '@solana/rpc-core/dist/types/rpc-methods/getAccountInfo';
 import type { GetMultipleAccountsApi } from '@solana/rpc-core/dist/types/rpc-methods/getMultipleAccounts';
-import type { Rpc } from '@solana/rpc-transport/dist/types/json-rpc-types';
-import type { Commitment } from '@solana/rpc-types';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 
 import type { MaybeAccount, MaybeEncodedAccount } from './maybe-account';
 import { parseBase64RpcAccount, parseJsonRpcAccount } from './parse-account';

packages/library/src/__tests__/airdrop-test.ts

@@ -1,8 +1,7 @@
 import { Address } from '@solana/addresses';
 import { Signature } from '@solana/keys';
 import type { GetSignatureStatusesApi, RequestAirdropApi } from '@solana/rpc-core';
-import type { Rpc } from '@solana/rpc-transport';
-import { lamports } from '@solana/rpc-types';
+import { lamports, type Rpc } from '@solana/rpc-types';
 
 import { requestAndConfirmAirdrop } from '../airdrop';
 

packages/library/src/__tests__/decode-transaction-test.ts

@@ -1,8 +1,7 @@
 import { FetchAccountsConfig, fetchJsonParsedAccounts } from '@solana/accounts';
 import type { Address } from '@solana/addresses';
 import { GetMultipleAccountsApi } from '@solana/rpc-core';
-import { Rpc } from '@solana/rpc-transport';
-import type { Blockhash } from '@solana/rpc-types';
+import type { Blockhash, Rpc } from '@solana/rpc-types';
 import { decompileTransaction, getCompiledTransactionDecoder } from '@solana/transactions';
 import { CompiledTransaction } from '@solana/transactions/dist/types/compile-transaction';
 

packages/library/src/__tests__/rpc-subscription-coalescer-test.ts

@@ -1,4 +1,4 @@
-import type { RpcSubscriptions } from '@solana/rpc-transport';
+import type { RpcSubscriptions } from '@solana/rpc-types';
 
 import { getRpcSubscriptionsWithSubscriptionCoalescing } from '../rpc-subscription-coalescer';
 

packages/library/src/__tests__/send-transaction-test.ts

@@ -1,7 +1,6 @@
 import { Signature } from '@solana/keys';
 import type { SendTransactionApi } from '@solana/rpc-core';
-import type { Rpc } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import {
     Base64EncodedWireTransaction,
     BaseTransaction,

packages/library/src/__typetests__/api.ts

@@ -1,5 +1,6 @@
 import { SolanaRpcSubscriptions, SolanaRpcSubscriptionsUnstable } from '@solana/rpc-core';
-import { createJsonSubscriptionRpc, type RpcSubscriptions } from '@solana/rpc-transport';
+import { createJsonSubscriptionRpc } from '@solana/rpc-transport';
+import type { RpcSubscriptions } from '@solana/rpc-types';
 
 import { createSolanaRpcSubscriptions, createSolanaRpcSubscriptions_UNSTABLE } from '../rpc';
 

packages/library/src/airdrop-confirmer.ts

@@ -1,6 +1,6 @@
 import { Signature } from '@solana/keys';
 import type { GetSignatureStatusesApi, SignatureNotificationsApi } from '@solana/rpc-core';
-import type { Rpc, RpcSubscriptions } from '@solana/rpc-transport';
+import type { Rpc, RpcSubscriptions } from '@solana/rpc-types';
 
 import { BaseTransactionConfirmationStrategyConfig, raceStrategies } from './transaction-confirmation-strategy-racer';
 import { createRecentSignatureConfirmationPromiseFactory } from './transaction-confirmation-strategy-recent-signature';

packages/library/src/airdrop.ts

@@ -1,7 +1,7 @@
 import { Address } from '@solana/addresses';
 import { Signature } from '@solana/keys';
 import type { GetSignatureStatusesApi, RequestAirdropApi, SignatureNotificationsApi } from '@solana/rpc-core';
-import type { Rpc, RpcSubscriptions } from '@solana/rpc-transport';
+import type { Rpc, RpcSubscriptions } from '@solana/rpc-types';
 import { Commitment, LamportsUnsafeBeyond2Pow53Minus1 } from '@solana/rpc-types';
 
 import { createDefaultSignatureOnlyRecentTransactionConfirmer } from './airdrop-confirmer';

packages/library/src/decode-transaction.ts

@@ -6,7 +6,7 @@ import {
 } from '@solana/accounts';
 import { Address } from '@solana/addresses';
 import type { GetMultipleAccountsApi } from '@solana/rpc-core';
-import type { Rpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import {
     type AddressesByLookupTableAddress,
     type CompilableTransaction,

packages/library/src/rpc-subscription-coalescer.ts

@@ -1,4 +1,4 @@
-import { PendingRpcSubscription, RpcSubscriptions } from '@solana/rpc-transport';
+import { PendingRpcSubscription, RpcSubscriptions } from '@solana/rpc-types';
 
 import { getCachedAbortableIterableFactory } from './cached-abortable-iterable';
 

packages/library/src/rpc.ts

@@ -7,7 +7,8 @@ import {
     SolanaRpcSubscriptions,
     SolanaRpcSubscriptionsUnstable,
 } from '@solana/rpc-core';
-import { createJsonRpc, createJsonSubscriptionRpc, type Rpc, type RpcSubscriptions } from '@solana/rpc-transport';
+import { createJsonRpc, createJsonSubscriptionRpc } from '@solana/rpc-transport';
+import type { Rpc, RpcSubscriptions } from '@solana/rpc-types';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import fastStableStringify from 'fast-stable-stringify';

packages/library/src/send-transaction.ts

@@ -1,7 +1,6 @@
 import { Signature } from '@solana/keys';
 import type { SendTransactionApi } from '@solana/rpc-core';
-import type { Rpc } from '@solana/rpc-transport';
-import { Commitment, commitmentComparator } from '@solana/rpc-types';
+import { type Commitment, commitmentComparator, type Rpc } from '@solana/rpc-types';
 import {
     BaseTransaction,
     getBase64EncodedWireTransaction,

packages/library/src/transaction-confirmation-strategy-blockheight.ts

@@ -1,5 +1,5 @@
 import type { GetEpochInfoApi, SlotNotificationsApi } from '@solana/rpc-core';
-import type { Rpc, RpcSubscriptions } from '@solana/rpc-transport';
+import type { Rpc, RpcSubscriptions } from '@solana/rpc-types';
 import { Commitment } from '@solana/rpc-types';
 
 type GetBlockHeightExceedencePromiseFn = (config: {

packages/library/src/transaction-confirmation-strategy-nonce.ts

@@ -1,8 +1,7 @@
 import { Address } from '@solana/addresses';
 import { getBase58Decoder, getBase64Encoder } from '@solana/codecs';
 import type { AccountNotificationsApi, GetAccountInfoApi } from '@solana/rpc-core';
-import type { Rpc, RpcSubscriptions } from '@solana/rpc-transport';
-import { Base64EncodedDataResponse, Commitment } from '@solana/rpc-types';
+import type { Base64EncodedDataResponse, Commitment, Rpc, RpcSubscriptions } from '@solana/rpc-types';
 import { Nonce } from '@solana/transactions';
 
 type GetNonceInvalidationPromiseFn = (config: {

packages/library/src/transaction-confirmation-strategy-recent-signature.ts

@@ -1,7 +1,6 @@
 import { Signature } from '@solana/keys';
 import type { GetSignatureStatusesApi, SignatureNotificationsApi } from '@solana/rpc-core';
-import type { Rpc, RpcSubscriptions } from '@solana/rpc-transport';
-import { Commitment, commitmentComparator } from '@solana/rpc-types';
+import { type Commitment, commitmentComparator, type Rpc, type RpcSubscriptions } from '@solana/rpc-types';
 
 type GetRecentSignatureConfirmationPromiseFn = (config: {
     abortSignal: AbortSignal;

packages/library/src/transaction-confirmation.ts

@@ -7,7 +7,7 @@ import type {
     Slot,
     SlotNotificationsApi,
 } from '@solana/rpc-core';
-import type { Rpc, RpcSubscriptions } from '@solana/rpc-transport';
+import type { Rpc, RpcSubscriptions } from '@solana/rpc-types';
 import {
     getSignatureFromTransaction,
     IDurableNonceTransaction,

packages/rpc-core/package.json

@@ -61,16 +61,18 @@
         "supports bigint and not dead",
         "maintained node versions"
     ],
-    "devDependencies": {
+    "dependencies": {
         "@solana/addresses": "workspace:*",
         "@solana/codecs-core": "workspace:*",
         "@solana/codecs-strings": "workspace:*",
-        "@solana/eslint-config-solana": "^1.0.2",
         "@solana/keys": "workspace:*",
         "@solana/rpc-parsed-types": "workspace:*",
         "@solana/rpc-transport": "workspace:*",
         "@solana/rpc-types": "workspace:*",
-        "@solana/transactions": "workspace:*",
+        "@solana/transactions": "workspace:*"
+    },
+    "devDependencies": {
+        "@solana/eslint-config-solana": "^1.0.2",
         "@swc/jest": "^0.2.29",
         "@types/jest": "^29.5.11",
         "@typescript-eslint/eslint-plugin": "^6.13.2",

packages/rpc-core/src/response-patcher-allowed-numeric-values.ts

@@ -1,4 +1,4 @@
-import type { IRpcSubscriptionsApi } from '@solana/rpc-transport';
+import type { IRpcSubscriptionsApi } from '@solana/rpc-types';
 
 import { createSolanaRpcApi } from './rpc-methods';
 import { SolanaRpcSubscriptions, SolanaRpcSubscriptionsUnstable } from './rpc-subscriptions';

packages/rpc-core/src/rpc-methods/__tests__/get-account-info-test.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/addresses';
-import type { Rpc, SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import { Commitment } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 

packages/rpc-core/src/rpc-methods/__tests__/get-balance-test.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/addresses';
-import type { Rpc, SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import { Commitment } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 

packages/rpc-core/src/rpc-methods/__tests__/get-block-height.ts

@@ -1,5 +1,5 @@
-import type { Rpc, SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import { Commitment } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 

packages/rpc-core/src/rpc-methods/__tests__/get-block-production-test.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/addresses';
-import type { Rpc, SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import { Commitment } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 

packages/rpc-core/src/rpc-methods/__tests__/get-block-time-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetBlockTimeApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-cluster-nodes-test.ts

@@ -1,6 +1,7 @@
 import { open } from 'node:fs/promises';
 
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 import path from 'path';
 

packages/rpc-core/src/rpc-methods/__tests__/get-epoch-info-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import { Commitment } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 

packages/rpc-core/src/rpc-methods/__tests__/get-epoch-schedule-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetEpochScheduleApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-fee-for-message-test.ts

@@ -1,7 +1,7 @@
 import { fixEncoder } from '@solana/codecs-core';
 import { getBase58Encoder, getBase64Decoder } from '@solana/codecs-strings';
-import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import type { Blockhash, Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Blockhash, Commitment, Rpc } from '@solana/rpc-types';
 import { SerializedMessageBytesBase64 } from '@solana/transactions';
 import fetchMock from 'jest-fetch-mock-fork';
 

packages/rpc-core/src/rpc-methods/__tests__/get-first-available-block-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetFirstAvailableBlockApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-genesis-hash-test.ts

@@ -1,6 +1,7 @@
 import { open } from 'node:fs/promises';
 
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 import path from 'path';
 

packages/rpc-core/src/rpc-methods/__tests__/get-health-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetHealthApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-identity-test.ts

@@ -2,7 +2,8 @@ import { open } from 'node:fs/promises';
 
 import { Address } from '@solana/addresses';
 import { getBase58Decoder } from '@solana/codecs-strings';
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 import path from 'path';
 

packages/rpc-core/src/rpc-methods/__tests__/get-inflation-governor-test.ts

@@ -1,5 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetInflationGovernorApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-inflation-rate-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetInflationRateApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-inflation-reward-test.ts

@@ -1,5 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetInflationRewardApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-largest-accounts-test.ts

@@ -2,8 +2,8 @@ import { open } from 'node:fs/promises';
 
 import { Address } from '@solana/addresses';
 import { getBase58Decoder } from '@solana/codecs-strings';
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 import path from 'path';
 

packages/rpc-core/src/rpc-methods/__tests__/get-latest-blockhash-test.ts

@@ -1,5 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetLatestBlockhashApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-leader-schedule-test.ts

@@ -1,7 +1,7 @@
 import { Address } from '@solana/addresses';
 import { getBase58Decoder } from '@solana/codecs-strings';
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import assert from 'assert';
 import { open } from 'fs/promises';
 import fetchMock from 'jest-fetch-mock-fork';

packages/rpc-core/src/rpc-methods/__tests__/get-max-retransmit-slot-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetMaxRetransmitSlotApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-max-shred-insert-slot-test.ts

@@ -1,4 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetMaxShredInsertSlotApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-minimum-balance-for-rent-exemption-test.ts

@@ -1,5 +1,5 @@
-import { createHttpTransport, createJsonRpc, type Rpc } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc } from '@solana/rpc-transport';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetMinimumBalanceForRentExemptionApi } from '../index';

packages/rpc-core/src/rpc-methods/__tests__/get-multiple-accounts-test.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/addresses';
-import { createHttpTransport, createJsonRpc, type Rpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
-import { Commitment } from '@solana/rpc-types';
+import { createHttpTransport, createJsonRpc, type SolanaJsonRpcErrorCode } from '@solana/rpc-transport';
+import type { Commitment, Rpc } from '@solana/rpc-types';
 import fetchMock from 'jest-fetch-mock-fork';
 
 import { createSolanaRpcApi, GetMultipleAccountsApi } from '../index';