chore: pox3 to pox4 misc renames

zone117x · zone117x · commit fbdf8221ec72 · 2023-12-12T16:14:28.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -520,24 +520,24 @@ jobs:
           flag-name: run-${{ github.job }}
           parallel: true
 
-  test-2_4:
+  test-2_5:
     strategy:
       fail-fast: false
       matrix:
         suite:
           [
             block-zero-handling,
             faucet-stx,
-            pox-3-btc-address-formats,
-            pox-3-delegate-aggregation,
-            pox-3-delegate-stacking,
-            pox-3-delegate-revoked-stacking,
-            pox-3-stack-extend-increase,
-            pox-3-rosetta-btc-addr-types,
-            pox-3-rosetta-cycle-phases,
-            pox-3-rosetta-segwit,
-            pox-3-burnchain-stack-stx,
-            pox-3-burnchain-delegate-stx,
+            pox-4-btc-address-formats,
+            pox-4-delegate-aggregation,
+            pox-4-delegate-stacking,
+            pox-4-delegate-revoked-stacking,
+            pox-4-stack-extend-increase,
+            pox-4-rosetta-btc-addr-types,
+            pox-4-rosetta-cycle-phases,
+            pox-4-rosetta-segwit,
+            pox-4-burnchain-stack-stx,
+            pox-4-burnchain-delegate-stx,
           ]
     runs-on: ubuntu-latest
     steps:
@@ -575,7 +575,7 @@ jobs:
           npm run devenv:logs-krypton -- --no-color &> docker-compose-logs.txt &
 
       - name: Run tests
-        run: npm run test:2.4 -- --testPathPattern "${{ matrix.suite }}"
+        run: npm run test:2.5 -- --testPathPattern "${{ matrix.suite }}"
 
       - name: Print integration environment logs
         run: cat docker-compose-logs.txt
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -316,14 +316,14 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "Jest: 2.4",
+      "name": "Jest: 2.5",
       "program": "${workspaceFolder}/node_modules/.bin/jest",
       "args": [
         "--testTimeout=3600000",
         "--runInBand",
         "--no-cache",
         "--config",
-        "${workspaceRoot}/tests/jest.config.2.4.js"
+        "${workspaceRoot}/tests/jest.config.2.5.js",
       ],
       "outputCapture": "std",
       "console": "integratedTerminal",
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "dev:follower": "npm run devenv:build && concurrently npm:dev npm:devenv:follower",
     "test": "cross-env NODE_ENV=test jest --config ./tests/jest.config.js --coverage --runInBand",
     "test:subnets": "cross-env NODE_ENV=test jest --config ./tests/jest.config.subnets.js --coverage --runInBand",
-    "test:2.4": "cross-env NODE_ENV=test jest --config ./tests/jest.config.2.4.js --coverage --runInBand",
+    "test:2.5": "cross-env NODE_ENV=test jest --config ./tests/jest.config.2.5.js --coverage --runInBand",
     "test:rosetta": "cross-env NODE_ENV=test jest --config ./tests/jest.config.rosetta.js --coverage --runInBand",
     "test:rosetta-construction": "cross-env NODE_ENV=test jest --config ./tests/jest.config.rosetta-construction.js --coverage --runInBand",
     "test:rosetta-cli:data": "cross-env NODE_ENV=test STACKS_CHAIN_ID=0x80000000 jest --config ./tests/jest.config.rosetta-cli-data.js --coverage --runInBand",
@@ -24,7 +24,7 @@
     "test:watch": "cross-env NODE_ENV=test jest --config ./tests/jest.config.js --watch",
     "test:integration": "concurrently \"docker compose -f docker/docker-compose.dev.postgres.yml up --force-recreate -V\" \"cross-env NODE_ENV=test jest --config ./tests/jest.config.js --no-cache --runInBand; npm run devenv:stop:pg\"",
     "test:integration:subnets": "concurrently --hide \"devenv:deploy:subnets\" \"npm:devenv:deploy:subnets\" \"cross-env NODE_ENV=test jest --config ./tests/jest.config.subnets.js --no-cache --runInBand; npm run devenv:stop:subnets\"",
-    "test:integration:2.4": "concurrently --hide \"devenv:deploy-krypton\" \"npm:devenv:deploy-krypton\" \"cross-env NODE_ENV=test jest --config ./tests/jest.config.2.4.js --no-cache --runInBand; npm run devenv:stop-krypton\"",
+    "test:integration:2.5": "concurrently --hide \"devenv:deploy-krypton\" \"npm:devenv:deploy-krypton\" \"cross-env NODE_ENV=test jest --config ./tests/jest.config.2.5.js --no-cache --runInBand; npm run devenv:stop-krypton\"",
     "test:integration:rosetta": "concurrently \"npm:devenv:deploy-krypton\" \"cross-env NODE_ENV=test jest --config ./tests/jest.config.rosetta.js --no-cache --runInBand; npm run devenv:stop-krypton\"",
     "test:integration:rosetta-construction": "concurrently \"npm:devenv:deploy-krypton\" \"cross-env NODE_ENV=test jest --config ./tests/jest.config.rosetta-construction.js --no-cache --runInBand; npm run devenv:stop-krypton\"",
     "test:integration:rosetta-cli:data": "concurrently \"npm:devenv:deploy-krypton\" \"cross-env NODE_ENV=test STACKS_CHAIN_ID=0x80000000 jest --config ./tests/jest.config.rosetta-cli-data.js --no-cache --runInBand; npm run devenv:stop-krypton\"",
diff --git a/src/tests-2.5/block-zero-handling.ts b/src/tests-2.5/block-zero-handling.ts
diff --git a/src/tests-2.5/env-setup.ts b/src/tests-2.5/env-setup.ts
diff --git a/src/tests-2.5/faucet-stx.ts b/src/tests-2.5/faucet-stx.ts
diff --git a/src/tests-2.5/global-setup.ts b/src/tests-2.5/global-setup.ts
diff --git a/src/tests-2.5/global-teardown.ts b/src/tests-2.5/global-teardown.ts
diff --git a/src/tests-2.5/pox-4-btc-address-formats.ts b/src/tests-2.5/pox-4-btc-address-formats.ts
@@ -21,13 +21,13 @@ import {
 } from '../test-utils/test-helpers';
 import { hexToBuffer } from '@hirosystems/api-toolkit';
 
-describe('PoX-3 - Stack using supported bitcoin address formats', () => {
+describe('PoX-4 - Stack using supported bitcoin address formats', () => {
   test('Standby for next cycle', async () => {
     const poxInfo = await testEnv.client.getPox();
     await standByUntilBurnBlock(poxInfo.next_cycle.reward_phase_start_block_height); // a good time to stack
   });
 
-  describe('PoX-3 - Stacking operations P2SH-P2WPKH', () => {
+  describe('PoX-4 - Stacking operations P2SH-P2WPKH', () => {
     const account = testnetKeys[1];
     let btcAddr: string;
     let btcRegtestAccount: VerboseKeyOutput;
@@ -276,7 +276,7 @@ describe('PoX-3 - Stack using supported bitcoin address formats', () => {
     });
   });
 
-  describe('PoX-3 - Stacking operations P2WPKH', () => {
+  describe('PoX-4 - Stacking operations P2WPKH', () => {
     const account = testnetKeys[1];
     let btcAddr: string;
     let btcRegtestAddr: string;
@@ -524,7 +524,7 @@ describe('PoX-3 - Stack using supported bitcoin address formats', () => {
     });
   });
 
-  describe('PoX-3 - Stacking operations P2WSH', () => {
+  describe('PoX-4 - Stacking operations P2WSH', () => {
     const account = testnetKeys[1];
     let btcAddr: string;
     let btcRegtestAddr: string;
@@ -776,7 +776,7 @@ describe('PoX-3 - Stack using supported bitcoin address formats', () => {
     });
   });
 
-  describe('PoX-3 - Stacking operations P2TR', () => {
+  describe('PoX-4 - Stacking operations P2TR', () => {
     const account = testnetKeys[2];
     let btcAddr: string;
     let btcRegtestAddr: string;
diff --git a/src/tests-2.5/pox-4-burnchain-delegate-stx.ts b/src/tests-2.5/pox-4-burnchain-delegate-stx.ts
@@ -172,7 +172,7 @@ async function createPox2DelegateStx(args: {
   };
 }
 
-describe('PoX-3 - Stack using Bitcoin-chain ops', () => {
+describe('PoX-4 - Stack using Bitcoin-chain ops', () => {
   const seedAccount = testnetKeys[0];
 
   let db: PgWriteStore;
diff --git a/src/tests-2.5/pox-4-burnchain-stack-stx.ts b/src/tests-2.5/pox-4-burnchain-stack-stx.ts
@@ -134,7 +134,7 @@ async function createPox2StackStx(args: {
   };
 }
 
-describe('PoX-3 - Stack using Bitcoin-chain ops', () => {
+describe('PoX-4 - Stack using Bitcoin-chain ops', () => {
   const seedAccount = testnetKeys[0];
 
   let db: PgWriteStore;
diff --git a/src/tests-2.5/pox-4-delegate-aggregation.ts b/src/tests-2.5/pox-4-delegate-aggregation.ts
@@ -32,7 +32,7 @@ import {
 } from 'stacks-encoding-native-js';
 import { AddressStxBalanceResponse } from '@stacks/stacks-blockchain-api-types';
 
-describe('PoX-3 - Delegate aggregation increase operations', () => {
+describe('PoX-4 - Delegate aggregation increase operations', () => {
   const seedKey = testnetKeys[4].secretKey;
   const delegatorKey = '04608922f3ce63971bb120fa9c9454c5bd06370f61414040a737a6ee8ef8a10f01';
   const delegateeKey = 'b038e143cf4ee4c079b3c3605a8ed28732e5745c138b728408e80faf7a59b8c201';
diff --git a/src/tests-2.5/pox-4-delegate-revoked-stacking.ts b/src/tests-2.5/pox-4-delegate-revoked-stacking.ts
@@ -30,7 +30,7 @@ import {
   testEnv,
 } from '../test-utils/test-helpers';
 
-describe('PoX-3 - Delegate Revoked Stacking', () => {
+describe('PoX-4 - Delegate Revoked Stacking', () => {
   const seedKey = testnetKeys[4].secretKey;
   const delegatorKey = '72e8e3725324514c38c2931ed337ab9ab8d8abaae83ed2275456790194b1fd3101';
   const delegateeKey = '0d174cf0be276cedcf21727611ef2504aed093d8163f65985c07760fda12a7ea01';
diff --git a/src/tests-2.5/pox-4-delegate-stacking.ts b/src/tests-2.5/pox-4-delegate-stacking.ts
@@ -24,7 +24,7 @@ import {
 import { ClarityValueTuple, ClarityValueUInt } from 'stacks-encoding-native-js';
 import { AddressStxBalanceResponse } from '@stacks/stacks-blockchain-api-types';
 
-describe('PoX-3 - Delegate Stacking operations', () => {
+describe('PoX-4 - Delegate Stacking operations', () => {
   const seedKey = testnetKeys[4].secretKey;
   const delegatorKey = '72e8e3725324514c38c2931ed337ab9ab8d8abaae83ed2275456790194b1fd3101';
   const delegateeKey = '0d174cf0be276cedcf21727611ef2504aed093d8163f65985c07760fda12a7ea01';
diff --git a/src/tests-2.5/pox-4-rosetta-btc-addr-types.ts b/src/tests-2.5/pox-4-rosetta-btc-addr-types.ts
@@ -21,7 +21,7 @@ const BTC_ADDRESS_CASES = [
 ] as const;
 
 describe.each(BTC_ADDRESS_CASES)(
-  'PoX-3 - Rosetta - Stack with BTC address format $addressFormat',
+  'PoX-4 - Rosetta - Stack with BTC address format $addressFormat',
   ({ addressFormat }) => {
     let poxInfo: CoreRpcPoxInfo;
     const account = testnetKeys[1];
diff --git a/src/tests-2.5/pox-4-rosetta-cycle-phases.ts b/src/tests-2.5/pox-4-rosetta-cycle-phases.ts
@@ -11,7 +11,7 @@ const account = testnetKeys[1];
 const btcAddr = '2N74VLxyT79VGHiBK2zEg3a9HJG7rEc5F3o';
 
 describe.each(BLOCK_SHIFT_COUNT)(
-  'PoX-3 - Rosetta - Stack on any phase of cycle $shift',
+  'PoX-4 - Rosetta - Stack on any phase of cycle $shift',
   ({ shift }) => {
     test('Standby for cycle phase', async () => {
       const poxInfo = await testEnv.client.getPox();
diff --git a/src/tests-2.5/pox-4-rosetta-segwit.ts b/src/tests-2.5/pox-4-rosetta-segwit.ts
@@ -27,7 +27,7 @@ import {
 } from '../test-utils/test-helpers';
 import { hexToBuffer } from '@hirosystems/api-toolkit';
 
-describe('PoX-3 - Rosetta - Stacking with segwit', () => {
+describe('PoX-4 - Rosetta - Stacking with segwit', () => {
   let btcAddr: string;
   let btcAddrTestnet: string;
   const seedAccount = testnetKeys[0];
diff --git a/src/tests-2.5/pox-4-stack-extend-increase.ts b/src/tests-2.5/pox-4-stack-extend-increase.ts
@@ -21,7 +21,7 @@ import {
 import { decodeBtcAddress } from '@stacks/stacking';
 import { hexToBuffer } from '@hirosystems/api-toolkit';
 
-describe('PoX-3 - Stack extend and increase operations', () => {
+describe('PoX-4 - Stack extend and increase operations', () => {
   const account = testnetKeys[1];
   let btcAddr: string;
   let btcRegtestAccount: VerboseKeyOutput;
diff --git a/tests/jest.config.2.5.js b/tests/jest.config.2.5.js
@@ -3,19 +3,19 @@ const config = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   rootDir: `${require('path').dirname(__dirname)}/src`,
-  testMatch: ['<rootDir>/tests-2.4/**/*.ts'],
+  testMatch: ['<rootDir>/tests-2.5/**/*.ts'],
   testPathIgnorePatterns: [
-    '<rootDir>/tests-2.4/global-setup.ts',
-    '<rootDir>/tests-2.4/global-teardown.ts',
-    '<rootDir>/tests-2.4/env-setup.ts',
-    '<rootDir>/tests-2.4/test-helpers.ts',
+    '<rootDir>/tests-2.5/global-setup.ts',
+    '<rootDir>/tests-2.5/global-teardown.ts',
+    '<rootDir>/tests-2.5/env-setup.ts',
+    '<rootDir>/tests-2.5/test-helpers.ts',
   ],
   collectCoverageFrom: ['<rootDir>/**/*.ts'],
   coveragePathIgnorePatterns: ['<rootDir>/tests*'],
   coverageDirectory: '<rootDir>/../coverage',
-  globalSetup: '<rootDir>/tests-2.4/global-setup.ts',
-  globalTeardown: '<rootDir>/tests-2.4/global-teardown.ts',
-  setupFilesAfterEnv: ['<rootDir>/tests-2.4/env-setup.ts'],
+  globalSetup: '<rootDir>/tests-2.5/global-setup.ts',
+  globalTeardown: '<rootDir>/tests-2.5/global-teardown.ts',
+  setupFilesAfterEnv: ['<rootDir>/tests-2.5/env-setup.ts'],
   testTimeout: 60_000,
   verbose: true,
   bail: true,

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ async function createPox2DelegateStx(args: {`
`172`	`172`	`};`
`173`	`173`	`}`
`174`	`174`
`175`		`-describe('PoX-3 - Stack using Bitcoin-chain ops', () => {`
	`175`	`+describe('PoX-4 - Stack using Bitcoin-chain ops', () => {`
`176`	`176`	`const seedAccount = testnetKeys[0];`
`177`	`177`
`178`	`178`	`let db: PgWriteStore;`