Skip to content

Commit

Permalink
feat(network): add structs for new Sqmr interface
Browse files Browse the repository at this point in the history
  • Loading branch information
ShahakShama committed Jul 16, 2024
1 parent 5d5ab81 commit 312e076
Showing 1 changed file with 30 additions and 2 deletions.
32 changes: 30 additions & 2 deletions crates/papyrus_network/src/network_manager/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use futures::channel::mpsc::{Receiver, SendError, Sender};
use futures::channel::oneshot;
use futures::future::{ready, BoxFuture, Ready};
use futures::sink::With;
use futures::stream::{self, BoxStream, FuturesUnordered, Map};
use futures::{FutureExt, SinkExt, StreamExt};
use futures::stream::{self, BoxStream, FuturesUnordered, Map, Stream};
use futures::{FutureExt, Sink, SinkExt, StreamExt};
use libp2p::gossipsub::{SubscriptionError, TopicHash};
use libp2p::swarm::SwarmEvent;
use libp2p::{PeerId, StreamProtocol, Swarm};
Expand Down Expand Up @@ -594,6 +594,34 @@ pub fn dummy_report_callback() -> ReportCallback {
Box::new(|| {})
}

pub type GenericSender<T> = Box<dyn Sink<T, Error = SendError>>;
pub type GenericReceiver<T> = Box<dyn Stream<Item = T>>;

pub struct SqmrClientQuery<Query, Response: TryFrom<Bytes>> {
pub query: Query,
pub report_receiver: oneshot::Receiver<()>,
pub responses_sender: GenericSender<Result<Response, <Response as TryFrom<Bytes>>::Error>>,
}
pub type SqmrClientChannel<Query, Response> = GenericSender<SqmrClientQuery<Query, Response>>;
pub struct SqmrServerQuery<Query, Response: TryFrom<Bytes>> {
pub query: Query,
pub report_sender: oneshot::Sender<()>,
pub responses_sender: GenericSender<Result<Response, <Response as TryFrom<Bytes>>::Error>>,
}

#[allow(dead_code)]
struct SqmrClientQueryForNetwork {
pub query: Bytes,
pub report_receiver: BoxFuture<'static, SessionId>,
pub responses_sender: GenericSender<Bytes>,
}
#[allow(dead_code)]
struct SqmrServerQueryForNetwork {
pub query: Bytes,
pub report_sender: oneshot::Sender<()>,
pub responses_sender: GenericSender<Bytes>,
}

// TODO(shahak): Create a custom struct if Box dyn becomes an overhead.
pub type ReportCallback = Box<dyn FnOnce() + Send>;

Expand Down

0 comments on commit 312e076

Please sign in to comment.