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.

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

chore(test): Fix the unstable spec ForksContainSameUncle caused by block hash collision #4611

Merged

Conversation

chenyukang
Copy link
Collaborator

@chenyukang chenyukang commented Aug 25, 2024

What problem does this PR solve?

ForksContainSameUncle has the chance of 1/10 to fail in my local machine with error Uncles(DoubleInclusion), after debugging I found the uncle block hash is same with new block hash in node_b.mine(1).

This issue was fixed in 0dc63c2

But it's reverted in the following changes, I believe it is unintentional.

What is changed and how it works?

Make sure the uncle block timestamp is different from the next block timestamp in main fork

What's Changed:

Related changes

  • PR to update owner/repo:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code ci-runs-only: [ quick_checks,linters ]

Release note

None: Exclude this PR from the release note.

@chenyukang chenyukang requested a review from a team as a code owner August 25, 2024 03:54
@chenyukang chenyukang requested review from zhangsoledad and removed request for a team August 25, 2024 03:54
@chenyukang chenyukang added the t:test: Integration Test Type: This issue is related to test. label Aug 25, 2024
@chenyukang chenyukang added this pull request to the merge queue Aug 25, 2024
Merged via the queue into nervosnetwork:develop with commit 76ebab4 Aug 25, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
t:test: Integration Test Type: This issue is related to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants