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

Jump to bottom

Remove duplication between Qbft protocol schedule and Ibft protocol schedule #2751

Merged
merged 36 commits into from
Sep 23, 2021
Merged

Remove duplication between Qbft protocol schedule and Ibft protocol schedule #2751

merged 36 commits into from
Sep 23, 2021

Conversation

jframe
Copy link
Contributor

@jframe jframe commented Sep 10, 2021 •
edited
Loading

PR description

Remove duplication between Qbft protocol schedule and Ibft protocol schedule

Fixed Issue(s)

Changelog

jframe added 30 commits August 18, 2021 15:26
@jframe
qbft block to transaction based voting migration
42a853f 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Merge branch 'main' into qbft_validator_contract_migration
9a20054
@jframe
allow validator mode to be case-insensitive
3f8ed54 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
resolve vote provider
021918a 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
additional tests
4932d09 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
remove the validator provider factory
c39e106 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
fix integration test
6dfb6cb 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
fix genesis fork
ee5a2de 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Merge remote-tracking branch 'upstream/main' into qbft_validator_cont…
b3a9ef1 
…ract_migration
@jframe
don't override the blocks on genesis block as it's unnecessary
a144345 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
sort validators for block result as well in case it is being used to …
757b484 
…override results

Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Merge remote-tracking branch 'upstream/main' into qbft_validator_cont…
d28da8f 
…ract_migration
@jframe
spotless
7703f30 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
refactoring controller with isContractValidatorSelectionMode fn
9b98e90 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
migration integration test
8cadc7c 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
remove todo
92f6434 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Handle switching header validation and block extra data strategy when…
1cc6d2f 
… switching to validator contract

Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
build issues
c728193 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
fix unit test
d6e3ad5 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
cleanup TestContextBuilder
c414eed 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Use domain class for validator selection config instead of QbftFork t…
62f563e 
…o cleanup code

Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Remove unneeded create methods on the Bft and Qbft protocol schedules
aee0e57 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Remove duplication between BftProtocolSchedule and QbftProtocolSchedule
d5a71b3 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Fix unit tests
3ed80d5 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Fix unit tests
0c03ba1 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Fix tests
f8e387c 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Merge remote-tracking branch 'upstream/main' into qbft_dedupe_qbft_pr…
d36d7fb 
…otocol_schedule
@jframe
Merge remote-tracking branch 'upstream/main' into qbft_dedupe_qbft_pr…
8f56a60 
…otocol_schedule
@jframe
cleanup qbft validator contract changelog entry
ca977ca 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
spotless
b8f8929 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
compile error
87d079a 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
Merge remote-tracking branch 'upstream/main' into qbft_dedupe_qbft_pr…
c35c966 
…otocol_schedule
@jframe
spotless
ca3e2c7 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe jframe requested a review from usmansaleem September 23, 2021 02:55
@jframe
rename BftProtocolSchedule to BaseBftProtocolSchedule
055628c 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
remove broken imports
954cc85 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe
remove broken imports
ba70e18 
Signed-off-by: Jason Frame <jasonwframe@gmail.com>
@jframe jframe marked this pull request as ready for review September 23, 2021 04:02
usmansaleem
usmansaleem approved these changes Sep 23, 2021
View reviewed changes
Copy link
Member

@usmansaleem usmansaleem left a comment

Choose a reason for hiding this comment

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

LGTM

@jframe jframe merged commit 2541b15 into hyperledger:main Sep 23, 2021
@jframe jframe deleted the qbft_dedupe_qbft_protocol_schedule branch September 23, 2021 05:25
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
@jframe @eum602
Remove duplication between Qbft protocol schedule and Ibft protocol s…
e8ad36d 
…chedule (hyperledger#2751)

Signed-off-by: Jason Frame <jasonwframe@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@usmansaleem usmansaleem usmansaleem approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jframe @usmansaleem