Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

removes id and shred_version from CrdsGossip (backport #18505) #18554

Merged
merged 2 commits into from
Jul 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2021

This is an automatic backport of pull request #18505 done by Mergify.
Cherry-pick of 4e1333f has failed:

On branch mergify/bp/v1.7/pr-18505
Your branch is up to date with 'origin/v1.7'.

You are currently cherry-picking commit 4e1333fbe.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gossip/src/crds_gossip.rs
	modified:   gossip/tests/crds_gossip.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gossip/src/cluster_info.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

ClusterInfo is the gateway to CrdsGossip function calls, and it already
has node's pubkey and shred version (full ContactInfo and Keypair in
fact).
Duplicating these data in CrdsGossip adds redundancy and possibility for
bugs should they not be consistent with ClusterInfo.

(cherry picked from commit 4e1333f)

# Conflicts:
#	gossip/src/cluster_info.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 9, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 9, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 9, 2021
@codecov
Copy link

codecov bot commented Jul 9, 2021

Codecov Report

Merging #18554 (f331ed9) into v1.7 (7e613c7) will increase coverage by 0.0%.
The diff coverage is 90.5%.

@@           Coverage Diff           @@
##             v1.7   #18554   +/-   ##
=======================================
  Coverage    82.2%    82.2%           
=======================================
  Files         433      433           
  Lines      121531   121537    +6     
=======================================
+ Hits        99988    99993    +5     
- Misses      21543    21544    +1     

@mergify mergify bot merged commit 5d0e1d6 into v1.7 Jul 9, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18505 branch July 9, 2021 15:37
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant