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

removes id from push_lowest_slot args #18645

Merged
merged 1 commit into from
Jul 13, 2021

Conversation

behzadnouri
Copy link
Contributor

Problem

push_lowest_slot cannot sign the new crds-value unless the id (pubkey)
argument passed-in is the same pubkey as in ClusterInfo::keypair(), in
which case the id argument is redundant:
https://github.com/solana-labs/solana/blob/bb41cf346/gossip/src/cluster_info.rs#L824-L845

Additionally, the lookup is done with self.id(), but insert is done with
the id argument, which is logically a bug.

Summary of Changes

  • removed id: Pubkey from push_lowest_slot arguments, in favor of using ClusterInfo::id.

push_lowest_slot cannot sign the new crds-value unless the id (pubkey)
argument passed-in is the same pubkey as in ClusterInfo::keypair(), in
which case the id argument is redundant:
https://github.com/solana-labs/solana/blob/bb41cf346/gossip/src/cluster_info.rs#L824-L845

Additionally, the lookup is done with self.id(), but insert is done with
the id argument, which is logically a bug.
@behzadnouri behzadnouri requested review from carllin and sakridge July 13, 2021 18:14
@codecov
Copy link

codecov bot commented Jul 13, 2021

Codecov Report

Merging #18645 (5069365) into master (bb41cf3) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##           master   #18645   +/-   ##
=======================================
  Coverage    82.7%    82.7%           
=======================================
  Files         436      436           
  Lines      123482   123476    -6     
=======================================
+ Hits       102144   102145    +1     
+ Misses      21338    21331    -7     

@behzadnouri behzadnouri merged commit c90af3c into solana-labs:master Jul 13, 2021
@behzadnouri behzadnouri deleted the push-lowest-slot branch July 13, 2021 22:33
mergify bot pushed a commit that referenced this pull request Jul 13, 2021
push_lowest_slot cannot sign the new crds-value unless the id (pubkey)
argument passed-in is the same pubkey as in ClusterInfo::keypair(), in
which case the id argument is redundant:
https://github.com/solana-labs/solana/blob/bb41cf346/gossip/src/cluster_info.rs#L824-L845

Additionally, the lookup is done with self.id(), but insert is done with
the id argument, which is logically a bug.

(cherry picked from commit c90af3c)

# Conflicts:
#	gossip/src/cluster_info.rs
@behzadnouri behzadnouri linked an issue Jul 15, 2021 that may be closed by this pull request
CriesofCarrots pushed a commit that referenced this pull request Jul 16, 2021
push_lowest_slot cannot sign the new crds-value unless the id (pubkey)
argument passed-in is the same pubkey as in ClusterInfo::keypair(), in
which case the id argument is redundant:
https://github.com/solana-labs/solana/blob/bb41cf346/gossip/src/cluster_info.rs#L824-L845

Additionally, the lookup is done with self.id(), but insert is done with
the id argument, which is logically a bug.

(cherry picked from commit c90af3c)

# Conflicts:
#	gossip/src/cluster_info.rs
mergify bot added a commit that referenced this pull request Jul 16, 2021
* removes id from push_lowest_slot args (#18645)

push_lowest_slot cannot sign the new crds-value unless the id (pubkey)
argument passed-in is the same pubkey as in ClusterInfo::keypair(), in
which case the id argument is redundant:
https://github.com/solana-labs/solana/blob/bb41cf346/gossip/src/cluster_info.rs#L824-L845

Additionally, the lookup is done with self.id(), but insert is done with
the id argument, which is logically a bug.

(cherry picked from commit c90af3c)

# Conflicts:
#	gossip/src/cluster_info.rs

* removes backport merge conflicts

Co-authored-by: behzad nouri <[email protected]>
@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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

slow push_vote in ReplayStage
2 participants