test: Update to succeed tests

hirosystems · Oct 18, 2024 · affa2c9 · affa2c9
1 parent f704a8b
commit affa2c9
Show file tree

Hide file tree

Showing 11 changed files with 366 additions and 214 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -22,7 +22,6 @@
   "dependencies": {
     "@scure/bip32": "1.1.3",
     "@scure/bip39": "1.1.0",
-    "@stacks/api": "file:../api",
     "@stacks/auth": "^6.16.1",
     "@stacks/blockchain-api-client": "4.0.1",
     "@stacks/bns": "^6.16.1",

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
@@ -8,9 +8,6 @@
     "composite": true
   },
   "references": [
-    {
-      "path": "../api/tsconfig.build.json"
-    },
     {
       "path": "../auth/tsconfig.build.json"
     },

diff --git a/packages/internal/package.json b/packages/internal/package.json
@@ -7,7 +7,6 @@
     "typecheck:watch": "npm run typecheck -- --watch"
   },
   "devDependencies": {
-    "@stacks/api": "^6.9.0",
     "@stacks/stacking": "^6.9.0",
     "@stacks/blockchain-api-client": "^7.12.0",
     "@stacks/network": "^6.16.0",

diff --git a/packages/internal/src/apiMockingHelpers.ts b/packages/internal/src/apiMockingHelpers.ts
@@ -2,7 +2,6 @@ import { Configuration, TransactionsApi } from '@stacks/blockchain-api-client';
 import { STACKS_TESTNET } from '@stacks/network';
 import { MockResponseInitFunction } from 'jest-fetch-mock';
 import { StackingClient } from '@stacks/stacking';
-import { StacksNodeApi } from '@stacks/api';
 
 // NOTES
 // Capture traffic via the fetchWrapper
@@ -93,8 +92,13 @@ export async function waitForTx(txId: string, apiUrl = 'http://localhost:3999')
 export async function waitForBlock(burnBlockId: number, client?: StackingClient) {
   if (isMocking()) return;
 
-  const api = { url: 'http://localhost:3999' };
-  client = client ?? new StackingClient({ address: '', network: STACKS_TESTNET, api });
+  client =
+    client ??
+    new StackingClient({
+      address: '',
+      network: STACKS_TESTNET,
+      client: { baseUrl: 'http://localhost:3999' },
+    });
 
   let current: number;
   for (let i = 1; i <= MAX_ITERATIONS; i++) {
@@ -117,8 +121,13 @@ export async function waitForBlock(burnBlockId: number, client?: StackingClient)
 export async function waitForCycle(cycleId: number, client?: StackingClient) {
   if (isMocking()) return;
 
-  const api = new StacksNodeApi({ url: 'http://localhost:3999' });
-  client = client ?? new StackingClient({ address: '', network: STACKS_TESTNET, api });
+  client =
+    client ??
+    new StackingClient({
+      address: '',
+      network: STACKS_TESTNET,
+      client: { baseUrl: 'http://localhost:3999' },
+    });
 
   let current: number;
   for (let i = 1; i <= MAX_ITERATIONS; i++) {

diff --git a/packages/internal/tsconfig.build.json b/packages/internal/tsconfig.build.json
@@ -8,9 +8,6 @@
     "composite": true
   },
   "references": [
-    {
-      "path": "../api/tsconfig.build.json"
-    },
     {
       "path": "../stacking/tsconfig.build.json"
     }

diff --git a/packages/stacking/src/index.ts b/packages/stacking/src/index.ts
@@ -1,12 +1,11 @@
+import { ClientOpts, IntegerType, PrivateKey, hexToBytes, intToBigInt } from '@stacks/common';
 import {
-  ClientOpts,
-  IntegerType,
-  PrivateKey,
-  defaultClientOpts,
-  hexToBytes,
-  intToBigInt,
-} from '@stacks/common';
-import { ChainId, StacksNetwork, StacksNetworkName, networkFrom } from '@stacks/network';
+  ChainId,
+  StacksNetwork,
+  StacksNetworkName,
+  defaultClientOptsFromNetwork,
+  networkFrom,
+} from '@stacks/network';
 import {
   BurnchainRewardListResponse,
   BurnchainRewardSlotHolderListResponse,
@@ -342,7 +341,7 @@ export class StackingClient {
   }) {
     this.address = opts.address;
     this.network = networkFrom(opts.network);
-    this.client = defaultClientOpts(opts.client);
+    this.client = defaultClientOptsFromNetwork(this.network, opts.client);
   }
 
   get baseUrl() {
@@ -353,17 +352,17 @@ export class StackingClient {
     return this.client.fetch;
   }
 
-  /** @deprecated alias of StacksNodeApi.getCoreInfo, kept for backwards compatibility */
+  /** @deprecated Kept for backwards compatibility, may be removed in the future */
   getCoreInfo(): Promise<V2CoreInfoResponse> {
     return this.client.fetch(`${this.client.baseUrl}/v2/info`).then(res => res.json());
   }
 
-  /** @deprecated alias of StacksNodeApi.getPoxInfo, kept for backwards compatibility */
+  /** @deprecated Kept for backwards compatibility, may be removed in the future */
   getPoxInfo(): Promise<V2PoxInfoResponse> {
     return this.client.fetch(`${this.client.baseUrl}/v2/pox`).then(res => res.json());
   }
 
-  /** @deprecated alias of StacksNodeApi.getTargetBlockTime, kept for backwards compatibility */
+  /** @deprecated Kept for backwards compatibility, may be removed in the future */
   async getTargetBlockTime(): Promise<number> {
     const res = await this.client
       .fetch(`${this.client.baseUrl}/extended/v1/info/network_block_times`)