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

Remove the PartSetHeader from VoteSetMaj23, VoteSetBits, and state.State #479

Merged
merged 5 commits into from
Aug 6, 2021

Conversation

evan-forbes
Copy link
Member

Description

This PR is the next step in #418 in removing the PartSetHeader as much as possible, as it removes it from VoteSetMaj23, VoteSetBits, and state.State. Once again, I was careful that I didn't actually change anything meaningful, and only removed the PartSetHeader from the mentioned structs.

I think that removing the PartSetHeader further will require slightly more meaningful changes, so I figured I try to get as many of the cumbersome but easy changes out of the way as possible.

@evan-forbes evan-forbes self-assigned this Jul 29, 2021
@codecov-commenter
Copy link

codecov-commenter commented Jul 30, 2021

Codecov Report

Merging #479 (bad9169) into master (818be04) will decrease coverage by 0.05%.
The diff coverage is 75.92%.

@@            Coverage Diff             @@
##           master     #479      +/-   ##
==========================================
- Coverage   62.86%   62.80%   -0.06%     
==========================================
  Files         263      263              
  Lines       32499    32455      -44     
==========================================
- Hits        20430    20383      -47     
- Misses      10525    10531       +6     
+ Partials     1544     1541       -3     
Impacted Files Coverage Δ
consensus/types/height_vote_set.go 32.21% <0.00%> (ø)
statesync/stateprovider.go 0.00% <ø> (ø)
types/vote_set.go 50.68% <50.00%> (ø)
consensus/reactor.go 73.10% <56.00%> (+0.65%) ⬆️
consensus/msgs.go 81.12% <100.00%> (+0.95%) ⬆️
state/execution.go 61.74% <100.00%> (-0.11%) ⬇️
state/state.go 83.57% <100.00%> (+0.62%) ⬆️
state/validation.go 94.54% <100.00%> (ø)
types/validator_set.go 91.00% <100.00%> (+1.13%) ⬆️
libs/events/events.go 93.23% <0.00%> (-5.27%) ⬇️
... and 11 more

@adlerjohn
Copy link
Member

@liamsi
Copy link
Member

liamsi commented Aug 3, 2021

it only indicates that the protos were changed (and it's a breaking change).

@liamsi liamsi requested a review from adlerjohn August 3, 2021 13:25
state/state.go Outdated Show resolved Hide resolved
@@ -142,7 +142,7 @@ func TestValidateBlockCommit(t *testing.T) {
wrongHeightVote, err := types.MakeVote(
height,
state.LastBlockID,
state.LastPartSetHeader,
types.PartSetHeader{},
Copy link
Member

Choose a reason for hiding this comment

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

I know the title of the PR doesn't include Votes proper, but is there a reason not to remove it from votes too?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's a great question! The next step in removing the PartSetHeader will be removing from Vote and Commit. Unfortunately, that will include more meaningful changes to how the consensus reactor passes data around, and I figured I should get as many easily isolated changes out of the way as possible to make those more complex changes easier to review.

evan-forbes and others added 2 commits August 3, 2021 11:48
Co-authored-by: John Adler <adlerjohn@users.noreply.github.com>
@evan-forbes evan-forbes merged commit 3ba47c2 into master Aug 6, 2021
@evan-forbes evan-forbes deleted the evan/remove-psh-3 branch August 6, 2021 09:14
evan-forbes added a commit that referenced this pull request Aug 23, 2021
evan-forbes added a commit that referenced this pull request Aug 25, 2021
* Revert "Remove the PartSetHeader from VoteSetMaj23, VoteSetBits, and state.State (#479)"

This reverts commit 3ba47c2.

* Revert "Stop Signing over the `PartSetHeader` for Votes and remove it from the `Header` (#457)"

This reverts commit 818be04.

* Revert "Decouple PartSetHeader from BlockID (#441)"

This reverts commit 9d4265d.
evan-forbes added a commit that referenced this pull request Aug 25, 2021
* Revert "Remove the PartSetHeader from VoteSetMaj23, VoteSetBits, and state.State (#479)"

This reverts commit 3ba47c2.

* Revert "Stop Signing over the `PartSetHeader` for Votes and remove it from the `Header` (#457)"

This reverts commit 818be04.

* Revert "Decouple PartSetHeader from BlockID (#441)"

This reverts commit 9d4265d.

* Revert "Save and load block data using IPFS (#374)"

This reverts commit 8da1644.

* fix merge error

* Revert "Add the ipfs dag api object in Blockstore (#356)" and get rid of embedded ipfs objects

This reverts commit 40acb17.

* remove ipfs node provider from new node

* stop init ipfs repos

* remove IPFS node config

* clean up remaining ipfs stuff
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