Fix Api client e2e

tatumio · Jun 27, 2024 · a42edbd · a42edbd
1 parent 6778adc
commit a42edbd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 28 deletions.
diff --git a/packages/api-client/src/lib/api-client.ts b/packages/api-client/src/lib/api-client.ts
@@ -85,12 +85,6 @@ export type BtcBasedApiService = BitcoinService | BitcoinCashService | DogecoinS
 
 export type EvmBasedApiService = EthereumService | CeloService
 
-export type ApiServiceTypes = typeof TokenApiService &
-  typeof NftApiService &
-  typeof WalletApiService &
-  typeof TransactionsApiService &
-  typeof DeFiApiService
-
 export const ApiServices = {
   blockchain: {
     ada: CardanoService,
@@ -145,16 +139,15 @@ export const ApiServices = {
   },
   security: MaliciousAddressService,
   kms: KeyManagementSystemService,
-  data: {
-    ...DeFiApiService,
-    ...WalletApiService,
-    ...TokenApiService,
-    ...TransactionsApiService,
-    ...NftApiService,
-  },
   exchangeRate: ExchangeRateService,
   tatum: ServiceUtilsService,
   custodial: CustodialManagedWalletsService,
   auction: AuctionService,
   gasPump: GasPumpService,
+  data: {
+    defi: DeFiApiService,
+    wallet: WalletApiService,
+    token: TokenApiService,
+    nftService: NftApiService,
+  },
 }
diff --git a/packages/blockchain/btc/src/lib/__tests__/btc.tx.spec.ts b/packages/blockchain/btc/src/lib/__tests__/btc.tx.spec.ts
@@ -155,9 +155,9 @@ describe('BTC transactions', () => {
     },
   ) {
     if (obj === -1) {
-      mockedApi.data.getUtxosByAddress.mockResolvedValue([])
+      mockedApi.data.wallet.getUtxosByAddress.mockResolvedValue([])
     } else {
-      mockedApi.data.getUtxosByAddress.mockResolvedValue([obj])
+      mockedApi.data.wallet.getUtxosByAddress.mockResolvedValue([obj])
     }
   }
 

diff --git a/packages/blockchain/cardano/src/lib/cardano.sdk.tx.ts b/packages/blockchain/cardano/src/lib/cardano.sdk.tx.ts
@@ -3,7 +3,7 @@ import {
   AdaTransactionFromAddressKMS,
   AdaTransactionFromUTXO,
   AdaTransactionFromUTXOKMS,
-  ApiServices, ApiServiceTypes,
+  ApiServices,
   Currency,
   NodeRpcService,
   PendingTransaction,
@@ -19,7 +19,7 @@ type CardanoTxOptions = { testnet: boolean }
 
 type ApiCallsType = {
   cardanoBroadcast: typeof ApiServices.blockchain.ada.adaBroadcast;
-  getUTXOsByAddress: ApiServiceTypes['getUtxosByAddress'];
+  getUTXOsByAddress: typeof WalletApiService.getUtxosByAddress;
   rpcCall: typeof NodeRpcService.nodeJsonPostRpcDriver;
 };
 

diff --git a/packages/blockchain/ltc/src/lib/transaction/ltc.tx.spec.ts b/packages/blockchain/ltc/src/lib/transaction/ltc.tx.spec.ts
@@ -157,9 +157,9 @@ describe('LTC transactions', () => {
     },
   ) {
     if (obj === -1) {
-      mockedApi.data.getUtxosByAddress.mockResolvedValue([])
+      mockedApi.data.wallet.getUtxosByAddress.mockResolvedValue([])
     } else {
-      mockedApi.data.getUtxosByAddress.mockResolvedValue([obj])
+      mockedApi.data.wallet.getUtxosByAddress.mockResolvedValue([obj])
     }
   }
 

diff --git a/packages/blockchain/optimism/src/lib/__tests__/optimism.blockchain.spec.ts b/packages/blockchain/optimism/src/lib/__tests__/optimism.blockchain.spec.ts
@@ -30,15 +30,6 @@ describe('OptimismSDK - blockchain', () => {
     getBlockchainAccountBalance: [api.optimismGetBalance, testData.TESTNET.ADDRESS_0],
     getTransaction: [api.optimismGetTransaction, testData.TX_HASH],
     smartContractGetAddress: [BlockchainUtilsService.scGetContractAddress, 'OPTIMISM', testData.TX_HASH],
-    estimateGas: [
-      blockchain.estimateGas,
-      {
-        from: testData.TESTNET.ADDRESS_0,
-        to: testData.TESTNET.ADDRESS_100,
-        contractAddress: testData.TESTNET.SMART_CONTRACT.CONTRACT_ADDRESS,
-        amount: '10',
-      } as OptimismEstimateGas,
-    ],
     smartContractInvocation: [
       api.optimismBlockchainSmartContractInvocation,
       {