Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-04-20 16:06:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle substream request as part of outbound protocol state

Browse Source
This commit is contained in:
Franck Royer 2021-01-19 11:24:20 +11:00
parent 20152a926d
commit cdcfc575d0
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/lib.rs
View File

@ -31,7 +31,7 @@ enum InboundProtocolState<T, E> {
enum OutboundProtocolState<T, E> {
GotFunctionNeedSubstream(OutboundProtocolFn<T, E>),
GotSubstreamNeedFunction(OutboundSubstream),
GotFunctionRequestedSubstream(OutboundProtocolFn<T, E>),
Executing(Protocol<T, E>),
}
@ -45,11 +45,6 @@ enum ProtocolState<I, O, E> {
pub struct NMessageHandler<TInboundOut, TOutboundOut, TErr> {
state: ProtocolState<TInboundOut, TOutboundOut, TErr>,
// TODO: See if it can be included in OutboundProtocolState.
// Or it can be inferred from OutboundProtocolState current variant.
substream_request: Option<SubstreamProtocol<NMessageProtocol, ()>>,
info: &'static [u8],
}
@ -57,7 +52,6 @@ impl<TInboundOut, TOutboundOut, TErr> NMessageHandler<TInboundOut, TOutboundOut,
pub fn new(info: &'static [u8]) -> Self {
Self {
state: ProtocolState::None,
substream_request: None,
info,
}
}
@ -171,18 +165,17 @@ where
_: Self::OutboundOpenInfo,
) {
match mem::replace(&mut self.state, ProtocolState::Poisoned) {
ProtocolState::None => {
self.state = ProtocolState::Outbound(
OutboundProtocolState::GotSubstreamNeedFunction(substream),
);
}
ProtocolState::Outbound(OutboundProtocolState::GotFunctionNeedSubstream(
ProtocolState::Outbound(OutboundProtocolState::GotFunctionRequestedSubstream(
protocol_fn,
)) => {
self.state = ProtocolState::Outbound(OutboundProtocolState::Executing(
protocol_fn(substream),
));
}
ProtocolState::None
| ProtocolState::Outbound(OutboundProtocolState::GotFunctionNeedSubstream(_)) => {
panic!("Illegal state, receiving substream means it was requested.");
}
ProtocolState::Outbound(_) | ProtocolState::Done => {
panic!("Illegal state, substream is already present.");
}
@ -223,22 +216,12 @@ where
}
}
ProtocolInEvent::ExecuteOutbound(protocol_fn) => {
self.substream_request =
Some(SubstreamProtocol::new(NMessageProtocol::new(self.info), ()));
match mem::replace(&mut self.state, ProtocolState::Poisoned) {
ProtocolState::None => {
self.state = ProtocolState::Outbound(
OutboundProtocolState::GotFunctionNeedSubstream(protocol_fn),
);
}
ProtocolState::Outbound(OutboundProtocolState::GotSubstreamNeedFunction(
substream,
)) => {
self.state = ProtocolState::Outbound(OutboundProtocolState::Executing(
protocol_fn(substream),
));
}
ProtocolState::Outbound(_) | ProtocolState::Done => {
panic!("Illegal state, protocol fn is already present.");
}
@ -276,10 +259,6 @@ where
Self::Error,
>,
> {
if let Some(protocol) = self.substream_request.take() {
return Poll::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest { protocol });
}
match mem::replace(&mut self.state, ProtocolState::Poisoned) {
ProtocolState::Inbound(InboundProtocolState::Executing(mut protocol)) => match protocol
.poll_unpin(cx)
@ -322,6 +301,14 @@ where
}
}
}
ProtocolState::Outbound(OutboundProtocolState::GotFunctionNeedSubstream(protocol)) => {
self.state = ProtocolState::Outbound(
OutboundProtocolState::GotFunctionRequestedSubstream(protocol),
);
Poll::Ready(ProtocolsHandlerEvent::OutboundSubstreamRequest {
protocol: SubstreamProtocol::new(NMessageProtocol::new(self.info), ()),
})
}
ProtocolState::Poisoned => {
unreachable!("Protocol is poisoned (transient state)")
}