Skip to content

WIP: Refactor pchain network engine #15

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

Merged
merged 6 commits into from
Oct 12, 2023
Merged

WIP: Refactor pchain network engine #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47046ea
network subscribes to fullnode topics declared in config
ong-jonas Oct 10, 2023
8359198
filter types of messages to pass into handlers
ong-jonas Oct 10, 2023
89af337
removed constant inputs that were redundantly passed into functions
ong-jonas Oct 10, 2023
06d7fd1
changed method of identifying message topics, updated protocol name a…
ong-jonas Oct 11, 2023
34dd150
improve deserialization of messages
ong-jonas Oct 12, 2023
309a0d6
Merge branch 'refactor' into refactor
ong-jonas Oct 12, 2023
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
Next Next commit
network subscribes to fullnode topics declared in config
  • Loading branch information
@ong-jonas
ong-jonas committed Oct 10, 2023
commit 47046eac1d529a137f116c2743ab83ba42ce7160
2 changes: 1 addition & 1 deletion src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ pub(crate) struct Config {
pub kademlia_protocol_names: Vec<String>,
}

fn fullnode_topics(public_address: PublicAddress) -> Vec<Topic> {
pub(crate) fn fullnode_topics(public_address: PublicAddress) -> Vec<Topic> {
vec![Topic::HotStuffRsBroadcast, Topic::HotStuffRsSend(public_address).into(), Topic::Mempool, Topic::DroppedTxns]
}
3 changes: 2 additions & 1 deletion src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use std::time::Duration;

use crate::{
behaviour::{Behaviour, PeerNetworkEvent},
config,
messages::{Envelope, Topic},
peer::{EngineCommand, PeerBuilder, Peer}, conversions,
};
Expand Down Expand Up @@ -89,7 +90,7 @@ pub(crate) async fn start(

// 3. Subscribe to Topic
//TODO jonas
swarm.behaviour_mut().subscribe()?;
swarm.behaviour_mut().subscribe(config::fullnode_topics(local_public_address))?;
Copy link
Contributor

@manngayin612 manngayin612 Oct 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think all applications that uses pchain_network will always subscribe to all topics. For example, fullnode doesn't subscribe to droppedTx. So the topics to be subscribed should be based on the Config we passed in.


// 4. Start p2p networking
let (sender, mut receiver) =
Expand Down