Skip to content

WIP: Update pchain network engine #14

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

Closed
wants to merge 7 commits into from
Closed

WIP: Update pchain network engine #14

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
d8db512
renamed Peer to PeerInfo
ong-jonas Oct 9, 2023
e36f22e
renamed NetworkHandle to Peer
ong-jonas Oct 9, 2023
0f6d4ba
added engine JoinHandle for Peer, renamed sender to to_engine
ong-jonas Oct 9, 2023
bba5041
renamed SendCommand to EngineCommand
ong-jonas Oct 9, 2023
183abd0
update EngineCommand enum to Publish and Shutdown
ong-jonas Oct 9, 2023
f41b8b7
renamed Peer functions and message topics
ong-jonas Oct 9, 2023
67b3b6a
combine send_to and broadcast functions to publish
ong-jonas Oct 9, 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
renamed Peer to PeerInfo
  • Loading branch information
@ong-jonas
ong-jonas committed Oct 9, 2023
commit d8db512b375f971b03b838506adb60364aef8be2
16 changes: 8 additions & 8 deletions src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub struct Config {
pub port: u16,

/// bootstrap nodes for initial connection
pub boot_nodes: Vec<Peer>,
pub boot_nodes: Vec<PeerInfo>,

/// buffer size of commands initiated from caller
pub send_command_buffer_size: usize,
Expand Down Expand Up @@ -120,7 +120,7 @@ impl Config {
}

/// Set the bootstrap nodes for initial connection.
pub fn set_boot_nodes(mut self, boot_nodes: Vec<Peer>) -> Self {
pub fn set_boot_nodes(mut self, boot_nodes: Vec<PeerInfo>) -> Self {
self.boot_nodes = boot_nodes;
self
}
Expand All @@ -132,10 +132,10 @@ impl Config {
}
}

/// [Peer] consists of required information to identify an entity in the network, such as
/// [PeerInfo] consists of required information to identify an entity in the network, such as
/// PeerId, IPv4 Address and port number.
#[derive(Clone)]
pub struct Peer {
pub struct PeerInfo {
/// Peer ID in the P2P network
pub peer_id: PeerId,

Expand All @@ -146,8 +146,8 @@ pub struct Peer {
pub port: u16,
}

impl Peer {
/// Instantiation of [Peer]. It is used in bootstrap nodes in [crate::configuration::Config].
impl PeerInfo {
/// Instantiation of [PeerInfo]. It is used in bootstrap nodes in [crate::configuration::Config].
///
/// ## Panics
/// Panics if address is not a valid Ed25519 public key.
Expand Down Expand Up @@ -270,7 +270,7 @@ mod tests {
let boot_node_ip_address = Ipv4Addr::new(127, 0, 0, 1);
let boot_node_port: u16 = 1;

let boot_node = Peer::new(
let boot_node = PeerInfo::new(
boot_node_public_address,
boot_node_ip_address,
boot_node_port,
Expand Down Expand Up @@ -298,7 +298,7 @@ mod tests {
let port: u16 = 1;

//create new instance of Peer Info
let peer_info = Peer::new(test_public_address, ip_address, port);
let peer_info = PeerInfo::new(test_public_address, ip_address, port);

//test new instance of Peer Info
assert_eq!(&peer_info.ip_address.to_string(), "127.0.0.1");
Expand Down
18 changes: 9 additions & 9 deletions tests/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use futures::lock::Mutex;
use hotstuff_rs::messages::SyncRequest;
use libp2p::{identity::{Keypair, PublicKey}, gossipsub::TopicHash};
use pchain_network::{
config::{Config, Peer},
config::{Config, PeerInfo},
message_gate::{MessageGate, MessageGateChain},
messages::{Topic, Envelope, Message},
NetworkHandle,
Expand Down Expand Up @@ -42,7 +42,7 @@ async fn test_broadcast() {
let (address_1, node_1, _) = node(30001, vec![], None, vec![]).await;
let (_address_2, _node_2, receiver_gate) = node(
30002,
vec![Peer::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30001)],
vec![PeerInfo::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30001)],
Some(Topic::Mempool),
vec![Topic::Mempool],
)
Expand Down Expand Up @@ -82,7 +82,7 @@ async fn test_send_to() {

let (address_2, _node_2, receiver_gate) = node(
30004,
vec![Peer::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30003)],
vec![PeerInfo::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30003)],
None,
vec![],
)
Expand Down Expand Up @@ -124,15 +124,15 @@ async fn test_send_to_only_specific_receiver() {

let (address_2, _node_2, _) = node(
30006,
vec![Peer::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30005)],
vec![PeerInfo::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30005)],
None,
vec![],
)
.await;

let (_address_3, _node_3, receiver_gate) = node(
30007,
vec![Peer::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30005)],
vec![PeerInfo::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30005)],
None,
vec![],
)
Expand Down Expand Up @@ -171,15 +171,15 @@ async fn test_sparse_messaging() {

let (address_2, _node_2, _) = node(
30009,
vec![Peer::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30008)],
vec![PeerInfo::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30008)],
None,
vec![],
)
.await;

let (address_3, node_3, receiver_gate_3) = node(
30010,
vec![Peer::new(address_2, Ipv4Addr::new(127, 0, 0, 1), 30009)],
vec![PeerInfo::new(address_2, Ipv4Addr::new(127, 0, 0, 1), 30009)],
None,
vec![],
)
Expand Down Expand Up @@ -259,7 +259,7 @@ async fn test_broadcast_different_topics() {

let (_address_2, _node_2, receiver_gate) = node(
30015,
vec![Peer::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30014)],
vec![PeerInfo::new(address_1, Ipv4Addr::new(127, 0, 0, 1), 30014)],
Some(Topic::Mempool),
vec![Topic::Consensus],
)
Expand Down Expand Up @@ -287,7 +287,7 @@ async fn test_broadcast_different_topics() {

pub async fn node(
port: u16,
boot_nodes: Vec<Peer>,
boot_nodes: Vec<PeerInfo>,
gate_topic: Option<Topic>,
subscribe_topics: Vec<Topic>,
) -> (PublicAddress, NetworkHandle, MessageCounts) {
Expand Down