Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix multiple_miners* tests #5237

Merged
merged 23 commits into from
Oct 2, 2024
Merged

Fix multiple_miners* tests #5237

merged 23 commits into from
Oct 2, 2024

Conversation

jferrant
Copy link
Collaborator

@jferrant jferrant commented Sep 24, 2024 •
edited
Loading

Fixes both multiple_miners and multiple_miners_with_nakamoto_blocks tests.

@jferrant
Add positive integer for pox_sync_sample_secs and wait_on_interim_blo…
8ddddae 
…cks for multiple_miners* tests

Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant jferrant requested review from a team as code owners September 24, 2024 18:12
@jferrant jferrant changed the title Add positive integer for pox_sync_sample_secs and wait_on_interim_bocks Fix multiple_miners* tests by using positive pox_sync_sample_secs in default configs and setting wait_on_interim_blocks to a low number Sep 24, 2024
@jferrant jferrant marked this pull request as draft September 24, 2024 18:42
@jferrant jferrant marked this pull request as ready for review September 25, 2024 15:24
@jferrant jferrant changed the title Fix multiple_miners* tests by using positive pox_sync_sample_secs in default configs and setting wait_on_interim_blocks to a low number Fix multiple_miners* tests Sep 25, 2024
@jferrant
Do not blanket set pox_sync_sample_secs to a postiive integer
1f53fac 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Merge branch 'develop' of https://github.com/stacks-network/stacks-core…
b126d17 
… into chore/fix-multiple-miners
@jferrant
Do not advance unless the bootstrapped or follower node also hits epo…
cd49977 
…ch 3 and shutdown the runloop

Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Merge branch 'develop' of https://github.com/stacks-network/stacks-core…
db564e9 
… into chore/fix-multiple-miners
@jferrant
Test: try increasing a timeout to see what CI does
c60e4a6 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Merge branch 'develop' of https://github.com/stacks-network/stacks-core…
28d06b7 
… into chore/fix-multiple-miners
@hstove
Copy link
Contributor

hstove commented Sep 30, 2024

Unfortunately it looks like multiple_miners is failing on c60e4a6

@jferrant
Copy link
Collaborator Author

Unfortunately it looks like multiple_miners is failing on c60e4a6

NEIN! haha taking another wack at it.

@jferrant
Do not wait for an exact number of block rejections
9c89e46 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Merge branch 'develop' of https://github.com/stacks-network/stacks-core…
065a89b 
… into chore/fix-multiple-miners
@jferrant
Add some logging to bitcoind test
fdcfcdf 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant jferrant marked this pull request as draft September 30, 2024 20:20
@jferrant
Fix microblocks disabled test to allow at least one rather than stric…
51d6000 
…tly one microblocks

Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant
Convert logs to info in test
4c311bb 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
hstove
hstove previously approved these changes Oct 1, 2024
View reviewed changes
Copy link
Contributor

@hstove hstove left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

kantai
kantai previously approved these changes Oct 1, 2024
View reviewed changes
@kantai
Copy link
Member

kantai commented Oct 1, 2024

This LGTM -- my only comment is that you should use the approach from 6a3746c in the rejection tracking.

@jferrant
Change vec to hashset in wait_for_block_rejections
61eab90 
Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant jferrant dismissed stale reviews from kantai and hstove via 61eab90 October 1, 2024 18:53
@jferrant
Do not attempt to process a block validation response for an already …
4752a90 
…globally processed block

Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant jferrant requested review from kantai and hstove October 1, 2024 19:16
hstove
hstove previously approved these changes Oct 1, 2024
View reviewed changes
@obycode
Copy link
Contributor

obycode commented Oct 1, 2024

This fixes tests::signer::v0::partial_tenure_fork too!

@jferrant jferrant requested a review from hstove October 1, 2024 20:49
@obycode
test: remove signer_vote_if_needed
9eb4e05 
This is not used in signer v0. Fixes `tests::nakamoto_integrations::continue_tenure_extend`
kantai
kantai previously approved these changes Oct 2, 2024
View reviewed changes
@jferrant
Increase pox_sync_sample_secs to 5 to be on the safe side when waitin…
db105e0 
…g for anchor blocks to arrive

Signed-off-by: Jacinta Ferrant <jacinta@trustmachines.co>
@jferrant jferrant requested a review from kantai October 2, 2024 14:57
@jferrant jferrant added this pull request to the merge queue Oct 2, 2024
Merged via the queue into develop with commit a4597f5 Oct 2, 2024
1 check passed
@blockstack-devops
Copy link
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Oct 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@kantai kantai kantai approved these changes

@obycode obycode obycode approved these changes

@jcnelson jcnelson Awaiting requested review from jcnelson

@hstove hstove Awaiting requested review from hstove

Assignees
No one assigned
Labels
3.0-must locked
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jferrant @hstove @kantai @obycode @blockstack-devops @jcnelson