fix/5274: add test coverage for microforks #5280
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kantai
reviewed
Oct 7, 2024
Comment on lines
+1874
to
+1880
| debug!("Process staging Nakamoto block"; | ||
| "consensus_hash" => %next_ready_block.header.consensus_hash, | ||
| "stacks_block_hash" => %next_ready_block.header.block_hash(), | ||
| "stacks_block_id" => %next_ready_block.header.block_id(), | ||
| "burn_block_hash" => %next_ready_block_snapshot.burn_header_hash, | ||
| "parent_block_id" => %next_ready_block.header.parent_block_id, | ||
| ); |
There was a problem hiding this comment.
It's helpful having this appear earlier (where it was before), because there's a bunch of try macros between the original location and where its moved to. Those try macros will materialize a warn log in an invoking function, but there would be no logs indicating which block the node was considering processing when the error occurred.
kantai
reviewed
Oct 7, 2024
Comment on lines
+335
to
+374
| /// Get a Nakamoto tenure, starting a the given index block hash. | ||
| /// Item 0 in the block list is the tenure-start block. | ||
| /// The last item is the block given by the index block hash | ||
| #[cfg(any(test, feature = "testing"))] | ||
| pub fn load_nakamoto_tenure( | ||
| &self, | ||
| tip: &StacksBlockId, | ||
| ) -> Result<Option<Vec<NakamotoBlock>>, ChainstateError> { | ||
| let Some((block, ..)) = self.get_nakamoto_block(tip)? else { | ||
| return Ok(None); | ||
| }; | ||
| if block.is_wellformed_tenure_start_block().map_err(|_| { | ||
| ChainstateError::InvalidStacksBlock("Malformed tenure-start block".into()) | ||
| })? { | ||
| // we're done | ||
| return Ok(Some(vec![block])); | ||
| } | ||
|
|
||
| // this is an intermediate block | ||
| let mut tenure = vec![]; | ||
| let mut cursor = block.header.parent_block_id.clone(); | ||
| tenure.push(block); | ||
| loop { | ||
| let Some((block, _)) = self.get_nakamoto_block(&cursor)? else { | ||
| return Ok(None); | ||
| }; | ||
|
|
||
| let is_tenure_start = block.is_wellformed_tenure_start_block().map_err(|e| { | ||
| ChainstateError::InvalidStacksBlock("Malformed tenure-start block".into()) | ||
| })?; | ||
| cursor = block.header.parent_block_id.clone(); | ||
| tenure.push(block); | ||
|
|
||
| if is_tenure_start { | ||
| break; | ||
| } | ||
| } | ||
| tenure.reverse(); | ||
| Ok(Some(tenure)) | ||
| } |
There was a problem hiding this comment.
Can this be moved to a test module?
|
Also -- these tests appear to fail in CI. One seems to stall and get aborted after timing out and the other just fails. |
jferrant
approved these changes
Nov 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds test coverage for #5274. #5274 is not a bug -- the downloader works correctly. This PR just adds test coverage to make sure.