From 17e754b4e360f9ea7a645ab6e1b799878cf07062 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Thu, 25 Jan 2024 16:08:10 +0200 Subject: [PATCH] clippy --- applications/minotari_node/src/bootstrap.rs | 5 +++-- base_layer/contacts/src/chat_client/src/networking.rs | 4 ++-- base_layer/core/tests/helpers/nodes.rs | 10 ++++++---- base_layer/p2p/tests/support/comms_and_services.rs | 10 ++++++---- base_layer/wallet/src/wallet.rs | 2 +- base_layer/wallet/tests/support/comms_and_services.rs | 10 ++++++---- comms/core/src/builder/comms_node.rs | 2 +- comms/core/src/builder/tests.rs | 6 +++++- comms/core/tests/tests/rpc.rs | 6 +++++- comms/core/tests/tests/rpc_stress.rs | 6 +++++- comms/core/tests/tests/substream_stress.rs | 7 +++++-- 11 files changed, 45 insertions(+), 23 deletions(-) diff --git a/applications/minotari_node/src/bootstrap.rs b/applications/minotari_node/src/bootstrap.rs index ccd17d44a7..8d8692332d 100644 --- a/applications/minotari_node/src/bootstrap.rs +++ b/applications/minotari_node/src/bootstrap.rs @@ -86,6 +86,7 @@ pub struct BaseNodeBootstrapper<'a, B> { impl BaseNodeBootstrapper<'_, B> where B: BlockchainBackend + 'static { + #[allow(clippy::too_many_lines)] pub async fn bootstrap(self) -> Result { let mut base_node_config = self.app_config.base_node.clone(); let mut p2p_config = self.app_config.base_node.p2p.clone(); @@ -174,7 +175,7 @@ where B: BlockchainBackend + 'static let comms = if p2p_config.transport.transport_type == TransportType::Tor { let path = base_node_config.tor_identity_file.clone(); - let node_id = comms.node_identity().clone(); + let node_id = comms.node_identity(); let after_comms = move |identity: TorIdentity| { let _result = identity_management::save_as_json(&path, &identity); trace!(target: LOG_TARGET, "resave the tor identity {:?}", identity); @@ -182,7 +183,7 @@ where B: BlockchainBackend + 'static .parse() .expect("Should be able to create address"); if !node_id.public_addresses().contains(&address) { - node_id.add_public_address(address.clone()); + node_id.add_public_address(address); } }; initialization::spawn_comms_using_transport(comms, p2p_config.transport.clone(), after_comms).await diff --git a/base_layer/contacts/src/chat_client/src/networking.rs b/base_layer/contacts/src/chat_client/src/networking.rs index 23e56076f0..cf4d5b9483 100644 --- a/base_layer/contacts/src/chat_client/src/networking.rs +++ b/base_layer/contacts/src/chat_client/src/networking.rs @@ -111,7 +111,7 @@ pub async fn start( } let comms = if p2p_config.transport.transport_type == TransportType::Tor { let path = config.chat_client.tor_identity_file.clone(); - let node_id = comms.node_identity().clone(); + let node_id = comms.node_identity(); let after_comms = move |identity: TorIdentity| { let _result = identity_management::save_as_json(&path, &identity); let address: Multiaddr = format!("/onion3/{}:{}", identity.service_id, identity.onion_port) @@ -119,7 +119,7 @@ pub async fn start( .expect("Should be able to create address"); trace!(target: LOG_TARGET, "resave the chat tor identity {:?}", identity); if !node_id.public_addresses().contains(&address) { - node_id.add_public_address(address.clone()); + node_id.add_public_address(address); } }; spawn_comms_using_transport(comms, p2p_config.transport.clone(), after_comms).await? diff --git a/base_layer/core/tests/helpers/nodes.rs b/base_layer/core/tests/helpers/nodes.rs index 5302c51953..2417789169 100644 --- a/base_layer/core/tests/helpers/nodes.rs +++ b/base_layer/core/tests/helpers/nodes.rs @@ -451,10 +451,12 @@ async fn setup_base_node_services( .await .unwrap(); // Set the public address for tests - let address = comms.connection_manager_requester().wait_until_listening().await.unwrap(); - comms - .node_identity() - .add_public_address(address.bind_address().clone()); + let address = comms + .connection_manager_requester() + .wait_until_listening() + .await + .unwrap(); + comms.node_identity().add_public_address(address.bind_address().clone()); let outbound_nci = handles.expect_handle::(); let local_nci = handles.expect_handle::(); diff --git a/base_layer/p2p/tests/support/comms_and_services.rs b/base_layer/p2p/tests/support/comms_and_services.rs index 168fa09842..a653cb4f7a 100644 --- a/base_layer/p2p/tests/support/comms_and_services.rs +++ b/base_layer/p2p/tests/support/comms_and_services.rs @@ -52,11 +52,13 @@ pub async fn setup_comms_services( .unwrap(); let mut comms = comms.spawn_with_transport(MemoryTransport).await.unwrap(); - let address = comms.connection_manager_requester().wait_until_listening().await.unwrap(); + let address = comms + .connection_manager_requester() + .wait_until_listening() + .await + .unwrap(); // Set the public address for tests - comms - .node_identity() - .add_public_address(address.bind_address().clone()); + comms.node_identity().add_public_address(address.bind_address().clone()); (comms, dht, messaging_events) } diff --git a/base_layer/wallet/src/wallet.rs b/base_layer/wallet/src/wallet.rs index 4b006313da..cf96c8a760 100644 --- a/base_layer/wallet/src/wallet.rs +++ b/base_layer/wallet/src/wallet.rs @@ -259,7 +259,7 @@ where .expect("P2pInitializer was not added to the stack"); let comms = if config.p2p.transport.transport_type == TransportType::Tor { let wallet_db = wallet_database.clone(); - let node_id = comms.node_identity().clone(); + let node_id = comms.node_identity(); let after_comms = move |identity: TorIdentity| { let address: Multiaddr = format!("/onion3/{}:{}", identity.service_id, identity.onion_port) .parse() diff --git a/base_layer/wallet/tests/support/comms_and_services.rs b/base_layer/wallet/tests/support/comms_and_services.rs index 6d9f92d3fc..cf53a469a3 100644 --- a/base_layer/wallet/tests/support/comms_and_services.rs +++ b/base_layer/wallet/tests/support/comms_and_services.rs @@ -59,11 +59,13 @@ pub async fn setup_comms_services( .unwrap(); let mut comms = comms.spawn_with_transport(MemoryTransport).await.unwrap(); - let address = comms.connection_manager_requester().wait_until_listening().await.unwrap(); + let address = comms + .connection_manager_requester() + .wait_until_listening() + .await + .unwrap(); // Set the public address for tests - comms - .node_identity() - .add_public_address(address.bind_address().clone()); + comms.node_identity().add_public_address(address.bind_address().clone()); (comms, dht) } diff --git a/comms/core/src/builder/comms_node.rs b/comms/core/src/builder/comms_node.rs index 8885055e33..b9bd002a98 100644 --- a/comms/core/src/builder/comms_node.rs +++ b/comms/core/src/builder/comms_node.rs @@ -296,7 +296,7 @@ impl CommsNode { self.connection_manager_requester.get_event_subscription() } - pub fn connection_manager_requester(&mut self)-> &mut ConnectionManagerRequester{ + pub fn connection_manager_requester(&mut self) -> &mut ConnectionManagerRequester { &mut self.connection_manager_requester } diff --git a/comms/core/src/builder/tests.rs b/comms/core/src/builder/tests.rs index 3808031dbc..02626c75e7 100644 --- a/comms/core/src/builder/tests.rs +++ b/comms/core/src/builder/tests.rs @@ -107,7 +107,11 @@ async fn spawn_node( .spawn_with_transport(MemoryTransport) .await .unwrap(); - let address = comms_node.connection_manager_requester().wait_until_listening().await.unwrap(); + let address = comms_node + .connection_manager_requester() + .wait_until_listening() + .await + .unwrap(); unpack_enum!(Protocol::Memory(_port) = address.bind_address().iter().next().unwrap()); (comms_node, inbound_rx, outbound_tx, messaging_events_sender) diff --git a/comms/core/tests/tests/rpc.rs b/comms/core/tests/tests/rpc.rs index 24d08b11d8..d4845d226f 100644 --- a/comms/core/tests/tests/rpc.rs +++ b/comms/core/tests/tests/rpc.rs @@ -50,7 +50,11 @@ async fn spawn_node(signal: ShutdownSignal) -> (CommsNode, RpcServerHandle) { .await .unwrap(); - let address = comms.connection_manager_requester().wait_until_listening().await.unwrap(); + let address = comms + .connection_manager_requester() + .wait_until_listening() + .await + .unwrap(); comms .node_identity() .set_public_addresses(vec![address.bind_address().clone()]); diff --git a/comms/core/tests/tests/rpc_stress.rs b/comms/core/tests/tests/rpc_stress.rs index 42fe62cd66..9a445e8f14 100644 --- a/comms/core/tests/tests/rpc_stress.rs +++ b/comms/core/tests/tests/rpc_stress.rs @@ -52,7 +52,11 @@ async fn spawn_node(signal: ShutdownSignal) -> CommsNode { .await .unwrap(); - let address = comms.connection_manager_requester().wait_until_listening().await.unwrap(); + let address = comms + .connection_manager_requester() + .wait_until_listening() + .await + .unwrap(); comms .node_identity() .set_public_addresses(vec![address.bind_address().clone()]); diff --git a/comms/core/tests/tests/substream_stress.rs b/comms/core/tests/tests/substream_stress.rs index cdeba323d6..488ec9064c 100644 --- a/comms/core/tests/tests/substream_stress.rs +++ b/comms/core/tests/tests/substream_stress.rs @@ -47,8 +47,11 @@ pub async fn spawn_node(signal: ShutdownSignal) -> (CommsNode, ProtocolNotificat .await .unwrap(); - - let address = comms.connection_manager_requester().wait_until_listening().await.unwrap(); + let address = comms + .connection_manager_requester() + .wait_until_listening() + .await + .unwrap(); comms .node_identity() .set_public_addresses(vec![address.bind_address().clone()]);