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

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

Merged
merged 5 commits into from
Jun 6, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99d5002
remove non-mainnet check for PIBD requests
yeastplume Jun 1, 2023
5c74311
remove surplus flag
yeastplume Jun 1, 2023
28f4c62
use matches! macro
yeastplume Jun 1, 2023
87a91b2
fix match logic
yeastplume Jun 1, 2023
439756f
correct match logic
yeastplume Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions servers/src/grin/sync/state_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,7 @@ impl StateSync {
} else if self.pibd_aborted {
false
} else {
// Only on testing chains for now
if global::get_chain_type() != global::ChainTypes::Mainnet {
true
//false
} 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 •
edited
Loading

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 •
edited
Loading

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.

};

// Check whether we've errored and should restart pibd
Expand Down