[Merged by Bors] - Remove deficit gossipsub scoring during topic transition #4486
+204
−7
Conversation
This file contains 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
ackintosh
changed the title
…gossipsub-scoring # Conflicts: # beacon_node/network/Cargo.toml # beacon_node/network/src/service.rs # beacon_node/network/src/service/tests.rs
…no getter function to obtain `TopicScoreParams`
# Conflicts: # beacon_node/lighthouse_network/src/service/mod.rs # beacon_node/network/src/service/tests.rs
ackintosh
force-pushed
the
remove-deficit-gossipsub-scoring
branch
from
4168d1b
to
75ac306
Compare
ackintosh
force-pushed
the
remove-deficit-gossipsub-scoring
branch
from
9e54d24
to
1180022
Compare
beacon_node/network/src/service.rs
Outdated
Comment on lines
973
to
981
|
|
||
| #[cfg(test)] | ||
| #[allow(dead_code)] | ||
| fn get_topic_params( | ||
| &self, | ||
| topic: GossipTopic, | ||
| ) -> Option<&lighthouse_network::libp2p::gossipsub::TopicScoreParams> { | ||
| self.libp2p.get_topic_params(topic) | ||
| } |
There was a problem hiding this comment.
#[allow(dead_code)] annotations I think are generally confusing. It's not clear if this is used or not in the tests (because if yes then the #[cfg(test)] should be enough).
To better align this with where it's used, you could move it to beacon_node/network/src/service/tests.rs like this
// use tokio::runtime::Runtime;
// use types::{Epoch, EthSpec, ForkName, MinimalEthSpec, SubnetId};
impl<T: beacon_chain::BeaconChainTypes> NetworkService<T> {
fn get_topic_params(
&self,
topic: GossipTopic,
) -> Option<&lighthouse_network::libp2p::gossipsub::TopicScoreParams> {
self.libp2p.get_topic_params(topic)
}
}
// fn get_logger(actual_log: bool) -> Logger {
// .. rest of the codeand it will not require any extra annotation
AgeManning
approved these changes
Sep 11, 2023
There was a problem hiding this comment.
This looks good to me also. Just pending @divagant-martian comments
Co-authored-by: Divma <26765164+divagant-martian@users.noreply.github.com>
Co-authored-by: Divma <26765164+divagant-martian@users.noreply.github.com>
bors bot
pushed a commit
that referenced
this pull request
Sep 15, 2023
## Issue Addressed This PR closes #3237 ## Proposed Changes Remove topic weight of old topics when the fork happens. ## Additional Info - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
|
Build failed (retrying...): |
bors bot
pushed a commit
that referenced
this pull request
Sep 15, 2023
## Issue Addressed This PR closes #3237 ## Proposed Changes Remove topic weight of old topics when the fork happens. ## Additional Info - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
|
Build failed: |
|
We are in the process of fixing the CI, so this should be able to merged smoother |
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Sep 20, 2023
## Issue Addressed This PR closes #3237 ## Proposed Changes Remove topic weight of old topics when the fork happens. ## Additional Info - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
|
Build failed (retrying...): |
bors bot
pushed a commit
that referenced
this pull request
Sep 20, 2023
## Issue Addressed This PR closes #3237 ## Proposed Changes Remove topic weight of old topics when the fork happens. ## Additional Info - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
|
Build failed (retrying...): |
michaelsproul
requested changes
Sep 21, 2023
|
bors r- |
|
Canceled. |
michaelsproul
added
waiting-on-author
divagant-martian
added
ready-for-merge
michaelsproul
approved these changes
Oct 3, 2023
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Oct 4, 2023
## Issue Addressed This PR closes #3237 ## Proposed Changes Remove topic weight of old topics when the fork happens. ## Additional Info - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
|
Pull request successfully merged into unstable. Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page.
|
bors
bot
changed the title
Woodpile37
pushed a commit
to Woodpile37/lighthouse
that referenced
this pull request
Jan 6, 2024
## Issue Addressed This PR closes sigp#3237 ## Proposed Changes Remove topic weight of old topics when the fork happens. ## Additional Info - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
Woodpile37
pushed a commit
to Woodpile37/lighthouse
that referenced
this pull request
Jan 6, 2024
This PR closes sigp#3237 Remove topic weight of old topics when the fork happens. - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
Woodpile37
pushed a commit
to Woodpile37/lighthouse
that referenced
this pull request
Jan 6, 2024
This PR closes sigp#3237 Remove topic weight of old topics when the fork happens. - Divided `NetworkService::start()` into `NetworkService::build()` and `NetworkService::start()` for ease of testing.
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.
Issue Addressed
This PR closes #3237
Proposed Changes
Remove topic weight of old topics when the fork happens.
Additional Info
NetworkService::start()intoNetworkService::build()andNetworkService::start()for ease of testing.