Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

p2p: use precalculated topic hash #2378

Merged
merged 7 commits into from
Oct 22, 2024
Merged

p2p: use precalculated topic hash #2378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3061d9
Use TopicHash on publish
yaziciahmet Oct 21, 2024
d1dcbeb
Remove GossipTopic type
yaziciahmet Oct 22, 2024
e3ae098
Do not store Sha256Topic
yaziciahmet Oct 22, 2024
d5cec54
Merge branch 'master' into p2p-use-precalculated-topic-hash
xgreenx Oct 22, 2024
0806ca6
CHANGELOG
yaziciahmet Oct 22, 2024
620af3d
Update CHANGELOG.md
xgreenx Oct 22, 2024
b77785a
Update CHANGELOG.md
xgreenx Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions crates/services/p2p/src/behavior.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ use crate::{
},
config::Config,
discovery,
gossipsub::{
config::build_gossipsub_behaviour,
topics::GossipTopic,
},
gossipsub::config::build_gossipsub_behaviour,
heartbeat,
peer_report,
request_response::messages::{
Expand All @@ -24,6 +21,7 @@ use libp2p::{
MessageAcceptance,
MessageId,
PublishError,
TopicHash,
},
identify,
request_response::{
Expand Down Expand Up @@ -149,10 +147,10 @@ impl FuelBehaviour {

pub fn publish_message(
&mut self,
topic: GossipTopic,
topic_hash: TopicHash,
encoded_data: Vec<u8>,
) -> Result<MessageId, PublishError> {
self.gossipsub.publish(topic, encoded_data)
self.gossipsub.publish(topic_hash, encoded_data)
}

pub fn send_request_msg(
Expand Down
12 changes: 6 additions & 6 deletions crates/services/p2p/src/gossipsub/topics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ impl GossipsubTopics {
}
}

/// Given a `GossipsubBroadcastRequest` returns a `GossipTopic`
/// Given a `GossipsubBroadcastRequest` returns a `TopicHash`
/// which is broadcast over the network with the serialized inner value of `GossipsubBroadcastRequest`
pub fn get_gossipsub_topic(
pub fn get_gossipsub_topic_hash(
&self,
outgoing_request: &GossipsubBroadcastRequest,
) -> GossipTopic {
) -> TopicHash {
match outgoing_request {
GossipsubBroadcastRequest::NewTx(_) => self.new_tx_topic.1.clone(),
GossipsubBroadcastRequest::NewTx(_) => self.new_tx_topic.0.clone(),
}
}
}
Expand Down Expand Up @@ -78,11 +78,11 @@ mod tests {
Some(GossipTopicTag::NewTx)
);

// Test given a `GossipsubBroadcastRequest` that `get_gossipsub_topic()` returns matching `Topic`
// Test given a `GossipsubBroadcastRequest` that `get_gossipsub_topic_hash()` returns matching `TopicHash`
let broadcast_req =
GossipsubBroadcastRequest::NewTx(Arc::new(Transaction::default_test_tx()));
assert_eq!(
gossipsub_topics.get_gossipsub_topic(&broadcast_req).hash(),
gossipsub_topics.get_gossipsub_topic_hash(&broadcast_req),
new_tx_topic.hash()
);
}
Expand Down
6 changes: 3 additions & 3 deletions crates/services/p2p/src/p2p_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,17 +375,17 @@ impl FuelP2PService {
&mut self,
message: GossipsubBroadcastRequest,
) -> Result<MessageId, PublishError> {
let topic = self
let topic_hash = self
.network_metadata
.gossipsub_data
.topics
.get_gossipsub_topic(&message);
.get_gossipsub_topic_hash(&message);

match self.network_codec.encode(message) {
Ok(encoded_data) => self
.swarm
.behaviour_mut()
.publish_message(topic, encoded_data),
.publish_message(topic_hash, encoded_data),
Err(e) => Err(PublishError::TransformFailed(e)),
}
}
Expand Down