remove support for multi-topic messages #73
Merged
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
AgeManning
reviewed
Oct 19, 2020
protocols/gossipsub/src/mcache.rs
Outdated
| @@ -126,7 +126,7 @@ impl<T> MessageCache<T> { | |||
| let mut found_entries: Vec<MessageId> = entries | |||
| .iter() | |||
| .filter_map(|entry| { | |||
| if entry.topics.iter().any(|t| t == topic) { | |||
| if entry.topic.iter().any(|t| t == topic) { | |||
There was a problem hiding this comment.
This and a few others could just be an if let Some()...
protocols/gossipsub/src/behaviour.rs
Outdated
| @@ -2265,7 +2260,7 @@ where | |||
| let mut recipient_peers = HashSet::new(); | |||
|
|
|||
| // add mesh peers | |||
| for topic in &message.topics { | |||
| for topic in &message.topic { | |||
There was a problem hiding this comment.
if let Some() seems more readable to me
|
Although go hasn't done it yet. From the PR it seems they plan to do it in the near future. I think it would be good for us to just drop the optional and make a single topic compulsory for each message. I think it might make our code a bit cleaner and we dont have to worry about the case of messages flying around without topics. |
|
Ok the latest changes make the topic required. Note that we handle now incoming messages that don't contain a topic as invalid. This also implicitly resolves your other comments. |
AgeManning
approved these changes
Oct 20, 2020
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.
Removes support for multi topic messages while staying compatible to the old message format.
If multiple topics are specified in a message only the last one is considered. See also libp2p/go-libp2p-pubsub#388.