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

ChainSync client: remove redundant intersection check #1080

Merged
merged 1 commit into from
May 13, 2024

Conversation

amesgen
Copy link
Member

@amesgen amesgen commented Apr 26, 2024

This step has caused confusions in the past.

See the commit description of the single commit.

@amesgen amesgen requested a review from a team as a code owner April 26, 2024 13:12
Note that this means we no longer perform this check after every rollback.
However, this should not matter, as a useful remote will eventually have to send
a new header.
@amesgen amesgen force-pushed the amesgen/chainsync-client-simplify-nextStep branch from 14bf419 to bf8a039 Compare April 26, 2024 16:15
@facundominguez
Copy link
Contributor

facundominguez commented Apr 27, 2024

Not sure if it is relevant, but in #1033 (3164620) I found a trace were the removed code sets the candidate fragment to G from G | 1-0. This this is the failure. And I'm attaching the trace where it can be seen that at tick 44, adversary 2 gets its candidate fragment set to G (line 2148). Commenting the transaction that sets the candidate fragment in nextStep' stops setting the candidate fragment to G (new trace)

cabal run ouroboros-consensus-diffusion:consensus-test -- -p '/stalling leashing attack/' --quickcheck-replay=967471

I'm not sure it is relevant because it could be a CSJ artifact.

@amesgen
Copy link
Member Author

amesgen commented Apr 29, 2024

the removed code sets the candidate fragment to G from G | 1-0.

I don't think this can be the case; the code that is removed in this PR never changes the tip of the candidate; it only ever causes us to disconnect or to change the anchor of the candidate fragment.

@facundominguez
Copy link
Contributor

I found a trace were the removed code sets the candidate fragment to G from G | 1-0

Today, with additional tracing, looks like this is not the case. In all likelihood, it is a false alarm.

Copy link
Contributor

@nfrisby nfrisby left a comment

Choose a reason for hiding this comment

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

Thanks for the simplification!

@amesgen amesgen added this pull request to the merge queue May 13, 2024
@disassembler disassembler removed this pull request from the merge queue due to a manual request May 13, 2024
@disassembler disassembler added this pull request to the merge queue May 13, 2024
Merged via the queue into main with commit c06b883 May 13, 2024
15 checks passed
@disassembler disassembler deleted the amesgen/chainsync-client-simplify-nextStep branch May 13, 2024 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants