Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-25 07:29:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded From<Never> impl

Browse Source
This commit is contained in:
Tobin C. Harding 2020-10-16 12:46:47 +11:00
parent 40e97ffdc3
commit 47eaa44f76
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swap/src/alice.rs
View File

@ -19,7 +19,7 @@ use crate::{
request_response::{AliceToBob, TIMEOUT}, request_response::{AliceToBob, TIMEOUT},
transport, TokioExecutor, transport, TokioExecutor,
}, },
Never, SwapParams, SwapParams,
}; };
pub type Swarm = libp2p::Swarm<Alice>; pub type Swarm = libp2p::Swarm<Alice>;
@ -68,13 +68,6 @@ fn new_swarm(listen: Multiaddr) -> Result<Swarm> {
pub enum BehaviourOutEvent { pub enum BehaviourOutEvent {
Request(messenger::BehaviourOutEvent), Request(messenger::BehaviourOutEvent),
ConnectionEstablished(PeerId), ConnectionEstablished(PeerId),
Never, // FIXME: Why do we need this?
}
impl From<Never> for BehaviourOutEvent {
fn from(_: Never) -> Self {
BehaviourOutEvent::Never
}
} }
impl From<messenger::BehaviourOutEvent> for BehaviourOutEvent { impl From<messenger::BehaviourOutEvent> for BehaviourOutEvent {

9
swap/src/bob.rs
View File

@ -19,7 +19,7 @@ use crate::{
request_response::TIMEOUT, request_response::TIMEOUT,
transport, TokioExecutor, transport, TokioExecutor,
}, },
Cmd, Never, Rsp, Cmd, Rsp,
}; };
pub async fn swap( pub async fn swap(
@ -85,13 +85,6 @@ fn new_swarm() -> Result<Swarm> {
pub enum BehaviourOutEvent { pub enum BehaviourOutEvent {
Response(messenger::BehaviourOutEvent), Response(messenger::BehaviourOutEvent),
ConnectionEstablished(PeerId), ConnectionEstablished(PeerId),
Never, // FIXME: Why do we need this?
}
impl From<Never> for BehaviourOutEvent {
fn from(_: Never) -> Self {
BehaviourOutEvent::Never
}
} }
impl From<messenger::BehaviourOutEvent> for BehaviourOutEvent { impl From<messenger::BehaviourOutEvent> for BehaviourOutEvent {