fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-14 18:41:22 +00:00
Code Issues Projects Releases Wiki Activity

core/muxing: Introduce StreamMuxerEvent::map_inbound_stream (#2691)

Browse Source 
Co-authored-by: Max Inden <mail@max-inden.de>
This commit is contained in:
Thomas Eizinger
2022-06-15 21:33:32 +02:00
committed by GitHub
parent 04f31cd501
commit 3c120ef971
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/CHANGELOG.md
View File

@ -1,3 +1,9 @@
# 0.33.1 - unreleased
- Introduce `StreamMuxerEvent::map_inbound_stream`. See [PR 2691].
[PR 2691]: https://github.com/libp2p/rust-libp2p/pull/2691
# 0.33.0
- Have methods on `Transport` take `&mut self` instead of `self`. See [PR 2529].

2
core/Cargo.toml
View File

@ -3,7 +3,7 @@ name = "libp2p-core"
edition = "2021"
rust-version = "1.56.1"
description = "Core traits and structs of libp2p"
version = "0.33.0"
version = "0.33.1"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"

24
core/src/either.rs
View File

@ -210,22 +210,14 @@ where
cx: &mut Context<'_>,
) -> Poll<Result<StreamMuxerEvent<Self::Substream>, Self::Error>> {
match self {
EitherOutput::First(inner) => inner.poll_event(cx).map(|result| {
result.map_err(|e| e.into()).map(|event| match event {
StreamMuxerEvent::AddressChange(addr) => StreamMuxerEvent::AddressChange(addr),
StreamMuxerEvent::InboundSubstream(substream) => {
StreamMuxerEvent::InboundSubstream(EitherOutput::First(substream))
}
})
}),
EitherOutput::Second(inner) => inner.poll_event(cx).map(|result| {
result.map_err(|e| e.into()).map(|event| match event {
StreamMuxerEvent::AddressChange(addr) => StreamMuxerEvent::AddressChange(addr),
StreamMuxerEvent::InboundSubstream(substream) => {
StreamMuxerEvent::InboundSubstream(EitherOutput::Second(substream))
}
})
}),
EitherOutput::First(inner) => inner
.poll_event(cx)
.map_err(|e| e.into())
.map_ok(|event| event.map_inbound_stream(EitherOutput::First)),
EitherOutput::Second(inner) => inner
.poll_event(cx)
.map_err(|e| e.into())
.map_ok(|event| event.map_inbound_stream(EitherOutput::Second)),
}
}

10
core/src/muxing.rs
View File

@ -236,6 +236,16 @@ impl<T> StreamMuxerEvent<T> {
None
}
}
/// Map the stream within [`StreamMuxerEvent::InboundSubstream`] to a new type.
pub fn map_inbound_stream<O>(self, map: impl FnOnce(T) -> O) -> StreamMuxerEvent<O> {
match self {
StreamMuxerEvent::InboundSubstream(stream) => {
StreamMuxerEvent::InboundSubstream(map(stream))
}
StreamMuxerEvent::AddressChange(addr) => StreamMuxerEvent::AddressChange(addr),
}
}
}
/// Polls for an event from the muxer and, if an inbound substream, wraps this substream in an