Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 11 additions & 7 deletions src/network/peer_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ use std::collections::HashMap;
use std::sync::Arc;
use std::time::Duration;

use gasket::messaging::{tokio::ChannelRecvAdapter, InputPort};
use gasket::messaging::{tokio::ChannelRecvAdapter, InputPort, Message};
use pallas::network::miniprotocols::peersharing::PeerAddress;
use rand::seq::{IndexedMutRandom, IndexedRandom};
use serde::Deserialize;
use thiserror::Error;
use tokio::sync::RwLock;
use tokio::sync::{broadcast::Sender, RwLock};
use tokio::time::timeout;
use tracing::{error, info, warn};

Expand All @@ -25,14 +25,14 @@ pub enum PeerManagerError {
pub struct PeerManager {
network_magic: u64,
peers: RwLock<HashMap<String, Option<Peer>>>,
receiver: ChannelRecvAdapter<Vec<u8>>,
sender: Sender<Message<Vec<u8>>>,
}

impl PeerManager {
pub fn new(
network_magic: u64,
peer_addresses: Vec<String>,
receiver: ChannelRecvAdapter<Vec<u8>>,
sender: Sender<Message<Vec<u8>>>,
) -> Self {
let peers = peer_addresses
.into_iter()
Expand All @@ -42,7 +42,7 @@ impl PeerManager {
Self {
network_magic,
peers: RwLock::new(peers),
receiver,
sender,
}
}

Expand All @@ -52,7 +52,9 @@ impl PeerManager {
let mut new_peer = Peer::new(peer_addr, self.network_magic);

let mut input = InputPort::<Vec<u8>>::default();
input.connect(self.receiver.clone());
let receiver = ChannelRecvAdapter::Broadcast(self.sender.subscribe());

input.connect(receiver);
new_peer.input = Arc::new(RwLock::new(input));

new_peer.is_peer_sharing_enabled = new_peer
Expand Down Expand Up @@ -124,7 +126,9 @@ impl PeerManager {
let mut new_peer = Peer::new(peer_addr, self.network_magic);

let mut input = InputPort::<Vec<u8>>::default();
input.connect(self.receiver.clone());
let receiver = ChannelRecvAdapter::Broadcast(self.sender.subscribe());

input.connect(receiver);
new_peer.input = Arc::new(RwLock::new(input));

let timeout_duration = Duration::from_secs(5);
Expand Down
10 changes: 8 additions & 2 deletions src/pipeline/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::sync::Arc;

use anyhow::Result;
use gasket::messaging::tokio::ChannelSendAdapter;

use crate::{
ledger::{
Expand Down Expand Up @@ -31,10 +32,15 @@ pub async fn run(
let relay_adapter: Arc<dyn RelayDataAdapter + Send + Sync> =
Arc::new(MockRelayDataAdapter::new());

let (sender, receiver) = gasket::messaging::tokio::broadcast_channel::<Vec<u8>>(CAP as usize);
let (sender, _) = gasket::messaging::tokio::broadcast_channel::<Vec<u8>>(CAP as usize);

let broadcast_sender = match &sender {
ChannelSendAdapter::Broadcast(sender) => sender.clone(),
_ => panic!("Expected broadcast sender"),
};

let peer_addrs = config.peer_manager.peers.clone();
let peer_manager = PeerManager::new(2, peer_addrs, receiver);
let peer_manager = PeerManager::new(2, peer_addrs, broadcast_sender);

peer_manager.init().await?;

Expand Down