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

'Turn on' PIBD on main-net, in advance of 5.2.0 release #3750

Merged
merged 5 commits into from Jun 6, 2023

Conversation

yeastplume
Copy link
Member

Removes the check that restricts PIBD requests to testnet only.

@yeastplume yeastplume requested review from phyro and tromp June 1, 2023 08:40
Copy link
Contributor

@tromp tromp left a comment

Choose a reason for hiding this comment

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

See my question about different bits of data recording aborted status...

} else {
false
}
true
Copy link
Contributor

Choose a reason for hiding this comment

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

Lines 102 - 104 can be rewritten as

                    } else {
                            !self.pibd_aborted
                    };

Even better would be having some accessor for the aborted field in SyncStatus::TxHashsetPibd (is there?) so that we could write

let using_pibd = ! self.sync_state.status().aborted() && ! self.pibd_aborted;

Btw, why do we have these two different bits of data to record what seems to be the same fact??

Copy link
Member Author

@yeastplume yeastplume Jun 1, 2023

Choose a reason for hiding this comment

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

Good catch, no idea why there's a redundant flag in there, vestigial logic left over from previous mutations I guess.

I've removed that, think it reads fine now. You need to pattern match somehow to access the values in SyncStatus::TxHashsetPibd, so creating an accessor to clean up that one line would be likely more trouble than it's worth.

Copy link
Contributor

@tromp tromp Jun 1, 2023

Choose a reason for hiding this comment

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

It is better rewritten as

let using_pibd = matches!(self.sync_state.status(), SyncStatus::TxHashsetPibd { aborted: true, .. });

Copy link
Member Author

Choose a reason for hiding this comment

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

aborted: false but otherwise good

Copy link
Contributor

Choose a reason for hiding this comment

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

No, changing aborted value is not the same as negating matches; we need

let using_pibd = !matches!(self.sync_state.status(), SyncStatus::TxHashsetPibd { aborted: true, .. });

Copy link
Member Author

Choose a reason for hiding this comment

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

Coming to that realisation. Okay, last time is the charm.

@tromp tromp self-requested a review June 1, 2023 14:09
@yeastplume yeastplume merged commit 0649ba9 into mimblewimble:master Jun 6, 2023
10 checks passed
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.

None yet

2 participants