Feat: Merge confirmed Branches with the MasterBranch #1770
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Base automatically changed from
dev/consensus-performance-optimizations
to
dev/consensus
October 29, 2021 11:10
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
hmoog
changed the title
…to feat/mergemaster
karimodm
force-pushed
the
feat/mergemaster
branch
from
96bcd52 to
4b3804e
Compare
# Conflicts: # packages/ledgerstate/branch_dag.go # packages/tangle/booker.go # pkged.go
| func (b *Booker) collectShallowLikedParentsBranchIDs(message *Message) (likedBranchIDs, dislikedBranchIDs ledgerstate.BranchIDs, err error) { | ||
| likedBranchIDs = ledgerstate.NewBranchIDs() | ||
| dislikedBranchIDs = ledgerstate.NewBranchIDs() | ||
| message.ForEachParentByType(ShallowLikeParentType, func(parentMessageID MessageID) bool { |
There was a problem hiding this comment.
🚫 [golangci] reported by reviewdog 🐶
388-416 lines are duplicate of packages/tangle/booker.go:425-453 (dupl)
| // the supplied ArithmeticBranchIDs. | ||
| func (b *Booker) collectShallowDislikedParentsBranchIDs(message *Message) (dislikedBranchIDs ledgerstate.BranchIDs, err error) { | ||
| dislikedBranchIDs = ledgerstate.NewBranchIDs() | ||
| message.ForEachParentByType(ShallowDislikeParentType, func(parentMessageID MessageID) bool { |
There was a problem hiding this comment.
🚫 [golangci] reported by reviewdog 🐶
425-453 lines are duplicate of packages/tangle/booker.go:388-416 (dupl)
| } | ||
|
|
||
| // ProcessMessageScenario2 creates a scenario useful to validate strong / weak propagation paths. | ||
| //nolint:gomnd |
There was a problem hiding this comment.
🚫 [golangci] reported by reviewdog 🐶
directive //nolint:gomnd is unused for linter "gomnd" (nolintlint)
…d add support for multiple branches instead of aggregated branch
jonastheis
approved these changes
Feb 11, 2022
karimodm
approved these changes
Feb 11, 2022
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
This PR adds the logic to merge confirmed Branches back to the MasterBranch to keep the network performant.
Type of change
Change checklist