From 967e744af2fbc37539f804430634d8f1a3b555f4 Mon Sep 17 00:00:00 2001
From: friedger <mail@friedger.de>
Date: Tue, 13 Feb 2024 23:37:43 +0100
Subject: [PATCH] chore: add default activation for pox-3 and pox-4

---
 tests/integration/helpers.ts     | 8 ++++++++
 tests/testnet/next-cycle.spec.ts | 6 ++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/integration/helpers.ts b/tests/integration/helpers.ts
index 1ba1eed..92b2327 100644
--- a/tests/integration/helpers.ts
+++ b/tests/integration/helpers.ts
@@ -38,8 +38,10 @@ export const DEFAULT_EPOCH_TIMELINE = {
   pox_2_activation: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION,
   epoch_2_2: Constants.DEVNET_DEFAULT_EPOCH_2_2,
   epoch_2_3: Constants.DEVNET_DEFAULT_EPOCH_2_3,
+  pox_3_activation: Constants.DEVNET_DEFAULT_POX_3_ACTIVATION,
   epoch_2_4: Constants.DEVNET_DEFAULT_EPOCH_2_4,
   epoch_2_5: Constants.DEVNET_DEFAULT_EPOCH_2_5,
+  pox_4_activation: Constants.DEVNET_DEFAULT_POX_4_ACTIVATION,
   epoch_3_0: Constants.DEVNET_DEFAULT_EPOCH_3_0,
 };
 
@@ -88,6 +90,9 @@ function fillTimeline(timeline: EpochTimeline) {
       timeline.epoch_2_3 += POX_CYCLE_LENGTH;
     }
   }
+  if (timeline.pox_3_activation === undefined) {
+    timeline.pox_3_activation = timeline.epoch_2_3 + 1;
+  }
   if (timeline.epoch_2_4 === undefined) {
     timeline.epoch_2_4 = DEFAULT_EPOCH_TIMELINE.epoch_2_4;
     while (timeline.epoch_2_4 <= timeline.epoch_2_3) {
@@ -100,6 +105,9 @@ function fillTimeline(timeline: EpochTimeline) {
       timeline.epoch_2_5 += POX_CYCLE_LENGTH;
     }
   }
+  if (timeline.pox_4_activation === undefined) {
+    timeline.pox_4_activation = timeline.epoch_2_5 + 1;
+  }
   if (timeline.epoch_3_0 === undefined) {
     timeline.epoch_3_0 = DEFAULT_EPOCH_TIMELINE.epoch_2_5;
     while (timeline.epoch_3_0 <= timeline.epoch_2_5) {
diff --git a/tests/testnet/next-cycle.spec.ts b/tests/testnet/next-cycle.spec.ts
index bae5681..9a897e8 100644
--- a/tests/testnet/next-cycle.spec.ts
+++ b/tests/testnet/next-cycle.spec.ts
@@ -1,19 +1,17 @@
 import { StacksTestnet } from "@stacks/network";
+import { Accounts } from "../integration/constants";
 import { getChainInfo } from "../integration/helpers";
 import {
   broadcastStackExtend,
   broadcastStackIncrease,
 } from "../integration/pox/helpers-direct-stacking";
-import { Accounts } from "../integration/constants";
 import {
   broadcastDelegateSTX,
   broadcastDelegateStackExtend,
   broadcastDelegateStackIncrease,
   broadcastDelegateStackSTX,
-  broadcastRevokeDelegateStx,
-  broadcastStackAggregationCommitIndexed,
+  broadcastRevokeDelegateStx
 } from "../integration/pox/helpers-pooled-stacking";
-import { getPoxInfo } from "../integration/pox/helpers";
 
 describe("stack-increase", async () => {
   const fee = 1000;