From 2dceab28a4eb30a442a70b457d02dd1a2de76453 Mon Sep 17 00:00:00 2001 From: Daniel Karzel Date: Wed, 20 Jan 2021 10:44:24 +1100 Subject: [PATCH] Derive Default --- swap/src/protocol/alice.rs | 15 +-------------- swap/src/protocol/bob.rs | 15 +-------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/swap/src/protocol/alice.rs b/swap/src/protocol/alice.rs index 7d801ef1..e9941172 100644 --- a/swap/src/protocol/alice.rs +++ b/swap/src/protocol/alice.rs @@ -280,7 +280,7 @@ impl From for OutEvent { } /// A `NetworkBehaviour` that represents an XMR/BTC swap node as Alice. -#[derive(NetworkBehaviour)] +#[derive(NetworkBehaviour, Default)] #[behaviour(out_event = "OutEvent", event_process = false)] #[allow(missing_debug_implementations)] pub struct Behaviour { @@ -318,16 +318,3 @@ impl Behaviour { debug!("Sent Message2"); } } - -impl Default for Behaviour { - fn default() -> Self { - Self { - pt: PeerTracker::default(), - amounts: Amounts::default(), - message0: message0::Behaviour::default(), - message1: message1::Behaviour::default(), - message2: message2::Behaviour::default(), - message3: message3::Behaviour::default(), - } - } -} diff --git a/swap/src/protocol/bob.rs b/swap/src/protocol/bob.rs index 906eb80f..5890f5b4 100644 --- a/swap/src/protocol/bob.rs +++ b/swap/src/protocol/bob.rs @@ -261,7 +261,7 @@ impl From for OutEvent { } /// A `NetworkBehaviour` that represents an XMR/BTC swap node as Bob. -#[derive(NetworkBehaviour)] +#[derive(NetworkBehaviour, Default)] #[behaviour(out_event = "OutEvent", event_process = false)] #[allow(missing_debug_implementations)] pub struct Behaviour { @@ -311,16 +311,3 @@ impl Behaviour { self.pt.add_address(peer_id, address) } } - -impl Default for Behaviour { - fn default() -> Behaviour { - Self { - pt: PeerTracker::default(), - amounts: Amounts::default(), - message0: message0::Behaviour::default(), - message1: message1::Behaviour::default(), - message2: message2::Behaviour::default(), - message3: message3::Behaviour::default(), - } - } -}