From 9873a364638732d72e7e24df0c0a63ecd9c6adee Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Tue, 23 Aug 2022 15:45:14 +0200 Subject: [PATCH] node: Update `Config` `Default` instance Signed-off-by: Alexis Sellier --- node/src/protocol.rs | 13 ++++++++++++- node/src/test/tests.rs | 24 ++---------------------- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/node/src/protocol.rs b/node/src/protocol.rs index 2b3a2dc0..b2ffa513 100644 --- a/node/src/protocol.rs +++ b/node/src/protocol.rs @@ -141,7 +141,7 @@ pub enum RemoteTracking { } /// Protocol configuration. -#[derive(Debug, Default)] +#[derive(Debug)] pub struct Config { /// Peers to connect to on startup. /// Connections to these peers will be maintained. @@ -154,6 +154,17 @@ pub struct Config { pub relay: bool, } +impl Default for Config { + fn default() -> Self { + Self { + connect: Vec::default(), + project_tracking: ProjectTracking::default(), + remote_tracking: RemoteTracking::default(), + relay: true, + } + } +} + impl Config { pub fn is_persistent(&self, addr: &net::SocketAddr) -> bool { self.connect.contains(addr) diff --git a/node/src/test/tests.rs b/node/src/test/tests.rs index 6bd9b527..23de5832 100644 --- a/node/src/test/tests.rs +++ b/node/src/test/tests.rs @@ -103,17 +103,7 @@ fn test_wrong_peer_magic() { #[test] fn test_inventory_relay_bad_seq() { - let mut alice = Peer::config( - "alice", - Config { - relay: true, - ..Config::default() - }, - [7, 7, 7, 7], - vec![], - MockStorage::empty(), - fastrand::Rng::new(), - ); + let mut alice = Peer::new("alice", [7, 7, 7, 7], MockStorage::empty()); let bob = Peer::new("bob", [8, 8, 8, 8], MockStorage::empty()); alice.connect_to(&bob.addr()); @@ -135,17 +125,7 @@ fn test_inventory_relay_bad_seq() { #[test] fn test_inventory_relay() { // Topology is eve <-> alice <-> bob - let mut alice = Peer::config( - "alice", - Config { - relay: true, - ..Config::default() - }, - [7, 7, 7, 7], - vec![], - MockStorage::empty(), - fastrand::Rng::new(), - ); + let mut alice = Peer::new("alice", [7, 7, 7, 7], MockStorage::empty()); let bob = Peer::new("bob", [8, 8, 8, 8], MockStorage::empty()); let eve = Peer::new("eve", [9, 9, 9, 9], MockStorage::empty()); let inv = vec![];