Skip to content

Commit 9eb4e05

Browse files
obycodeobycode
committed
test: remove signer_vote_if_needed
This is not used in signer v0. Fixes `tests::nakamoto_integrations::continue_tenure_extend`
1 parent b9d3b90 commit 9eb4e05

File tree

1 file changed

+0
-154
lines changed

1 file changed

+0
-154
lines changed

‎testnet/stacks-node/src/tests/nakamoto_integrations.rs

Lines changed: 0 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,69 +1155,6 @@ pub fn is_key_set_for_cycle(
11551155
Ok(key.is_some())
11561156
}
11571157

1158-
fn signer_vote_if_needed(
1159-
btc_regtest_controller: &BitcoinRegtestController,
1160-
naka_conf: &Config,
1161-
signer_sks: &[StacksPrivateKey], // TODO: Is there some way to get this from the TestSigners?
1162-
signers: &TestSigners,
1163-
) {
1164-
// When we reach the next prepare phase, submit new voting transactions
1165-
let block_height = btc_regtest_controller.get_headers_height();
1166-
let reward_cycle = btc_regtest_controller
1167-
.get_burnchain()
1168-
.block_height_to_reward_cycle(block_height)
1169-
.unwrap();
1170-
let prepare_phase_start = btc_regtest_controller
1171-
.get_burnchain()
1172-
.pox_constants
1173-
.prepare_phase_start(
1174-
btc_regtest_controller.get_burnchain().first_block_height,
1175-
reward_cycle,
1176-
);
1177-
1178-
if block_height >= prepare_phase_start {
1179-
// If the key is already set, do nothing.
1180-
if is_key_set_for_cycle(
1181-
reward_cycle + 1,
1182-
naka_conf.is_mainnet(),
1183-
&naka_conf.node.rpc_bind,
1184-
)
1185-
.unwrap_or(false)
1186-
{
1187-
return;
1188-
}
1189-
1190-
// If we are self-signing, then we need to vote on the aggregate public key
1191-
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
1192-
1193-
// Get the aggregate key
1194-
let aggregate_key = signers.clone().generate_aggregate_key(reward_cycle + 1);
1195-
let aggregate_public_key = clarity::vm::Value::buff_from(aggregate_key)
1196-
.expect("Failed to serialize aggregate public key");
1197-
1198-
for (i, signer_sk) in signer_sks.iter().enumerate() {
1199-
let signer_nonce = get_account(&http_origin, &to_addr(signer_sk)).nonce;
1200-
1201-
// Vote on the aggregate public key
1202-
let voting_tx = tests::make_contract_call(
1203-
&signer_sk,
1204-
signer_nonce,
1205-
300,
1206-
&StacksAddress::burn_address(false),
1207-
SIGNERS_VOTING_NAME,
1208-
"vote-for-aggregate-public-key",
1209-
&[
1210-
clarity::vm::Value::UInt(i as u128),
1211-
aggregate_public_key.clone(),
1212-
clarity::vm::Value::UInt(0),
1213-
clarity::vm::Value::UInt(reward_cycle as u128 + 1),
1214-
],
1215-
);
1216-
submit_tx(&http_origin, &voting_tx);
1217-
}
1218-
}
1219-
}
1220-
12211158
pub fn setup_epoch_3_reward_set(
12221159
naka_conf: &Config,
12231160
blocks_processed: &Arc<AtomicU64>,
@@ -1553,13 +1490,6 @@ fn simple_neon_integration() {
15531490
&commits_submitted,
15541491
)
15551492
.unwrap();
1556-
1557-
signer_vote_if_needed(
1558-
&btc_regtest_controller,
1559-
&naka_conf,
1560-
&[sender_signer_sk],
1561-
&signers,
1562-
);
15631493
}
15641494

15651495
// Submit a TX
@@ -1595,13 +1525,6 @@ fn simple_neon_integration() {
15951525
&commits_submitted,
15961526
)
15971527
.unwrap();
1598-
1599-
signer_vote_if_needed(
1600-
&btc_regtest_controller,
1601-
&naka_conf,
1602-
&[sender_signer_sk],
1603-
&signers,
1604-
);
16051528
}
16061529

16071530
// load the chain tip, and assert that it is a nakamoto block and at least 30 blocks have advanced in epoch 3
@@ -1805,13 +1728,6 @@ fn simple_neon_integration_with_flash_blocks_on_epoch_3() {
18051728
&commits_submitted,
18061729
)
18071730
.unwrap();
1808-
1809-
signer_vote_if_needed(
1810-
&btc_regtest_controller,
1811-
&naka_conf,
1812-
&[sender_signer_sk],
1813-
&signers,
1814-
);
18151731
}
18161732

18171733
// Submit a TX
@@ -1847,13 +1763,6 @@ fn simple_neon_integration_with_flash_blocks_on_epoch_3() {
18471763
&commits_submitted,
18481764
)
18491765
.unwrap();
1850-
1851-
signer_vote_if_needed(
1852-
&btc_regtest_controller,
1853-
&naka_conf,
1854-
&[sender_signer_sk],
1855-
&signers,
1856-
);
18571766
}
18581767

18591768
// load the chain tip, and assert that it is a nakamoto block and at least 30 blocks have advanced in epoch 3
@@ -2580,13 +2489,6 @@ fn correct_burn_outs() {
25802489
&naka_conf,
25812490
);
25822491

2583-
signer_vote_if_needed(
2584-
&btc_regtest_controller,
2585-
&naka_conf,
2586-
&[sender_signer_sk],
2587-
&signers,
2588-
);
2589-
25902492
run_until_burnchain_height(
25912493
&mut btc_regtest_controller,
25922494
&blocks_processed,
@@ -2646,13 +2548,6 @@ fn correct_burn_outs() {
26462548
tip_sn.block_height > prior_tip,
26472549
"The new burnchain tip must have been processed"
26482550
);
2649-
2650-
signer_vote_if_needed(
2651-
&btc_regtest_controller,
2652-
&naka_conf,
2653-
&[sender_signer_sk],
2654-
&signers,
2655-
);
26562551
}
26572552

26582553
coord_channel
@@ -4752,13 +4647,6 @@ fn forked_tenure_is_ignored() {
47524647
})
47534648
.unwrap();
47544649

4755-
signer_vote_if_needed(
4756-
&btc_regtest_controller,
4757-
&naka_conf,
4758-
&[sender_signer_sk],
4759-
&signers,
4760-
);
4761-
47624650
info!("Commit op is submitted; unpause Tenure B's block");
47634651

47644652
// Unpause the broadcast of Tenure B's block, do not submit commits, and do not allow blocks to
@@ -6199,13 +6087,6 @@ fn signer_chainstate() {
61996087
make_stacks_transfer(&sender_sk, sender_nonce, send_fee, &recipient, send_amt);
62006088
submit_tx(&http_origin, &transfer_tx);
62016089

6202-
signer_vote_if_needed(
6203-
&btc_regtest_controller,
6204-
&naka_conf,
6205-
&[sender_signer_sk],
6206-
&signers,
6207-
);
6208-
62096090
let timer = Instant::now();
62106091
while proposals_submitted.load(Ordering::SeqCst) <= before {
62116092
thread::sleep(Duration::from_millis(5));
@@ -6682,13 +6563,6 @@ fn continue_tenure_extend() {
66826563
)
66836564
.unwrap();
66846565

6685-
signer_vote_if_needed(
6686-
&btc_regtest_controller,
6687-
&naka_conf,
6688-
&[sender_signer_sk],
6689-
&signers,
6690-
);
6691-
66926566
wait_for(5, || {
66936567
let blocks_processed = coord_channel
66946568
.lock()
@@ -6708,13 +6582,6 @@ fn continue_tenure_extend() {
67086582

67096583
next_block_and(&mut btc_regtest_controller, 60, || Ok(true)).unwrap();
67106584

6711-
signer_vote_if_needed(
6712-
&btc_regtest_controller,
6713-
&naka_conf,
6714-
&[sender_signer_sk],
6715-
&signers,
6716-
);
6717-
67186585
wait_for(5, || {
67196586
let blocks_processed = coord_channel
67206587
.lock()
@@ -6756,13 +6623,6 @@ fn continue_tenure_extend() {
67566623
next_block_and_process_new_stacks_block(&mut btc_regtest_controller, 60, &coord_channel)
67576624
.unwrap();
67586625

6759-
signer_vote_if_needed(
6760-
&btc_regtest_controller,
6761-
&naka_conf,
6762-
&[sender_signer_sk],
6763-
&signers,
6764-
);
6765-
67666626
wait_for(5, || {
67676627
let blocks_processed = coord_channel
67686628
.lock()
@@ -6779,13 +6639,6 @@ fn continue_tenure_extend() {
67796639

67806640
next_block_and(&mut btc_regtest_controller, 60, || Ok(true)).unwrap();
67816641

6782-
signer_vote_if_needed(
6783-
&btc_regtest_controller,
6784-
&naka_conf,
6785-
&[sender_signer_sk],
6786-
&signers,
6787-
);
6788-
67896642
wait_for(5, || {
67906643
let blocks_processed = coord_channel
67916644
.lock()
@@ -6811,13 +6664,6 @@ fn continue_tenure_extend() {
68116664
})
68126665
.unwrap();
68136666

6814-
signer_vote_if_needed(
6815-
&btc_regtest_controller,
6816-
&naka_conf,
6817-
&[sender_signer_sk],
6818-
&signers,
6819-
);
6820-
68216667
wait_for(5, || {
68226668
let blocks_processed = coord_channel
68236669
.lock()

0 commit comments

Comments
 (0)