15484013348

Committed 06 Jun 2025 06:08AM UTC coverage: 72.04% (+0.3%) from 71.789%

Build # 15484013348

Build Type

push

github

Committed by

web-flow

Commit Message

fix(network-discovery): add back idle event handling (#7194)

Description
---
fix(network-discovery): add back idle event handling

Motivation and Context
---
network discovery was spinning at full speed because the Idle event
transition was removed. Network logs would rotate < 1s.

```
[comms::dht::network_discovery::ready] [Thread:123190302967360] DEBUG NetworkDiscovery::Ready: Peer list contains 759 entries. Current discovery rounds in this cycle: 0.
[comms::dht::network_discovery::ready] [Thread:123190302967360] DEBUG First active round (current_num_rounds = 0) and num_peers (759) >= min_desired_peers (16). Forcing DHT discovery.
 [comms::dht::network_discovery::ready] [Thread:123190302967360] DEBUG Selecting 5 random peers for discovery (last round info available: false, new peers in last round: false).
[comms::dht::network_discovery::ready] [Thread:123190302967360] DEBUG No suitable peers found for the forced DHT discovery round (current_num_rounds = 0 path). Transitioning to Idle.
 [comms::dht::network_discovery] [Thread:123190302967360] DEBUG Transition triggered from current state `Ready` by event `Idle`
comms::dht::network_discovery] [Thread:123190302967360] DEBUG No state transition for event `Idle`. The current state is `Ready`

...instant rinse and repeat...
```

This PR adds the idle state transition back. Note that idle will idle
for 30 minutes so should only transition when all work is done and we
have downloaded sufficient peers.

How Has This Been Tested?
---
Manually - console wallet with empty peer db

What process can a PR reviewer use to test or verify this change?
---

<!-- Checklist -->
<!-- 1. Is the title of your PR in the form that would make nice release
notes? The title, excluding the conventional commit
tag, will be included exactly as is in the CHANGELOG, so please think
about it carefully. -->


Breaking Changes
---

- [x] None
- [ ] Requires data directory on base node to be deleted
- [ ] Requires hard fork
- [ ] Other... (continued)

Run Details

3 of 4 new or added lines in 2 files covered. (75.0%)

412 existing lines in 30 files now uncovered.

80882 of 112274 relevant lines covered (72.04%)

242938.65 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

31.25

/base_layer/core/src/base_node/sync/hooks.rs

//  Copyright 2020, The Tari Project
//
//  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
//  following conditions are met:
//
//  1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
//  disclaimer.
//
//  2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
//  following disclaimer in the documentation and/or other materials provided with the distribution.
//
//  3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
//  products derived from this software without specific prior written permission.
//
//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
//  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
//  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
//  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
//  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
//  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
//  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

#![allow(clippy::type_complexity)]

use std::sync::Arc;

use crate::{
    base_node::sync::{horizon_state_sync::HorizonSyncInfo, SyncPeer},
    blocks::ChainBlock,
};

#[derive(Default)]
pub(super) struct Hooks {
    on_starting: Vec<Box<dyn FnOnce(&SyncPeer) + Send + Sync>>,
    on_progress_header: Vec<Box<dyn Fn(u64, u64, &SyncPeer) + Send + Sync>>,
    on_progress_block: Vec<Box<dyn Fn(Arc<ChainBlock>, u64, &SyncPeer) + Send + Sync>>,
    on_progress_horizon_sync: Vec<Box<dyn Fn(HorizonSyncInfo) + Send + Sync>>,
    on_complete: Vec<Box<dyn Fn(Arc<ChainBlock>, u64) + Send + Sync>>,
    on_rewind: Vec<Box<dyn Fn(Vec<Arc<ChainBlock>>) + Send + Sync>>,
}

impl Hooks {
    pub fn add_on_starting_hook<H>(&mut self, hook: H)
    where H: FnOnce(&SyncPeer) + Send + Sync + 'static {
        self.on_starting.push(Box::new(hook));
    }

    pub fn call_on_starting_hook(&mut self, sync_peer: &SyncPeer) {
        self.on_starting.drain(..).for_each(|f| (f)(sync_peer));
    }

    pub fn add_on_progress_header_hook<H>(&mut self, hook: H)
    where H: Fn(u64, u64, &SyncPeer) + Send + Sync + 'static {
        self.on_progress_header.push(Box::new(hook));
    }

    pub fn call_on_progress_header_hooks(&self, local_height: u64, remote_height: u64, sync_peer: &SyncPeer) {
        self.on_progress_header
            .iter()
            .for_each(|f| (*f)(local_height, remote_height, sync_peer));
    }

    pub fn add_on_progress_block_hook<H>(&mut self, hook: H)
    where H: Fn(Arc<ChainBlock>, u64, &SyncPeer) + Send + Sync + 'static {
        self.on_progress_block.push(Box::new(hook));
    }

    pub fn call_on_progress_block_hooks(&self, block: Arc<ChainBlock>, remote_tip_height: u64, sync_peer: &SyncPeer) {
        self.on_progress_block
            .iter()
            .for_each(|f| (*f)(block.clone(), remote_tip_height, sync_peer));
    }

    pub fn add_on_progress_horizon_hook<H>(&mut self, hook: H)
    where H: Fn(HorizonSyncInfo) + Send + Sync + 'static {
        self.on_progress_horizon_sync.push(Box::new(hook));
    }

    pub fn call_on_progress_horizon_hooks(&self, info: HorizonSyncInfo) {
        self.on_progress_horizon_sync.iter().for_each(|f| (*f)(info.clone()));
    }

    pub fn add_on_complete_hook<H>(&mut self, hook: H)
    where H: Fn(Arc<ChainBlock>, u64) + Send + Sync + 'static {
        self.on_complete.push(Box::new(hook));
    }

    pub fn call_on_complete_hooks(&self, final_block: Arc<ChainBlock>, starting_height: u64) {
        self.on_complete
            .iter()
            .for_each(|f| (*f)(final_block.clone(), starting_height));
    }

    pub fn add_on_rewind_hook<H>(&mut self, hook: H)
    where H: Fn(Vec<Arc<ChainBlock>>) + Send + Sync + 'static {
        self.on_rewind.push(Box::new(hook));
    }

    pub fn call_on_rewind_hooks(&mut self, blocks: Vec<Arc<ChainBlock>>) {
        self.on_rewind.iter().for_each(|f| (*f)(blocks.clone()));
    }
}

1	// Copyright 2020, The Tari Project
2	//
3	// Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
4	// following conditions are met:
5	//
6	// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
7	// disclaimer.
8	//
9	// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
10	// following disclaimer in the documentation and/or other materials provided with the distribution.
11	//
12	// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote
13	// products derived from this software without specific prior written permission.
14	//
15	// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
16	// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17	// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
18	// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
19	// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
20	// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
21	// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22
23	#![allow(clippy::type_complexity)]
24
25	use std::sync::Arc;
26
27	use crate::{
28	base_node::sync::{horizon_state_sync::HorizonSyncInfo, SyncPeer},
29	blocks::ChainBlock,
30	};
31
32	#[derive(Default)]
33	pub(super) struct Hooks {
34	on_starting: Vec<Box<dyn FnOnce(&SyncPeer) + Send + Sync>>,
35	on_progress_header: Vec<Box<dyn Fn(u64, u64, &SyncPeer) + Send + Sync>>,
36	on_progress_block: Vec<Box<dyn Fn(Arc<ChainBlock>, u64, &SyncPeer) + Send + Sync>>,
37	on_progress_horizon_sync: Vec<Box<dyn Fn(HorizonSyncInfo) + Send + Sync>>,
38	on_complete: Vec<Box<dyn Fn(Arc<ChainBlock>, u64) + Send + Sync>>,
39	on_rewind: Vec<Box<dyn Fn(Vec<Arc<ChainBlock>>) + Send + Sync>>,
40	}
41
42	impl Hooks {
43	pub fn add_on_starting_hook<H>(&mut self, hook: H)	10✔
44	where H: FnOnce(&SyncPeer) + Send + Sync + 'static {	10✔
45	self.on_starting.push(Box::new(hook));	10✔
46	}	10✔
47
48	pub fn call_on_starting_hook(&mut self, sync_peer: &SyncPeer) {	10✔
49	self.on_starting.drain(..).for_each(\|f\| (f)(sync_peer));	10✔
50	}	10✔
51
52	pub fn add_on_progress_header_hook<H>(&mut self, hook: H)	10✔
53	where H: Fn(u64, u64, &SyncPeer) + Send + Sync + 'static {	10✔
54	self.on_progress_header.push(Box::new(hook));	10✔
55	}	10✔
56
UNCOV 57	pub fn call_on_progress_header_hooks(&self, local_height: u64, remote_height: u64, sync_peer: &SyncPeer) {	×
UNCOV 58	self.on_progress_header	×
UNCOV 59	.iter()	×
UNCOV 60	.for_each(\|f\| (*f)(local_height, remote_height, sync_peer));	×
UNCOV 61	}	×
62
63	pub fn add_on_progress_block_hook<H>(&mut self, hook: H)	×
64	where H: Fn(Arc<ChainBlock>, u64, &SyncPeer) + Send + Sync + 'static {	×
65	self.on_progress_block.push(Box::new(hook));	×
66	}	×
67
68	pub fn call_on_progress_block_hooks(&self, block: Arc<ChainBlock>, remote_tip_height: u64, sync_peer: &SyncPeer) {	×
69	self.on_progress_block	×
70	.iter()	×
71	.for_each(\|f\| (*f)(block.clone(), remote_tip_height, sync_peer));	×
72	}	×
73
74	pub fn add_on_progress_horizon_hook<H>(&mut self, hook: H)	×
75	where H: Fn(HorizonSyncInfo) + Send + Sync + 'static {	×
76	self.on_progress_horizon_sync.push(Box::new(hook));	×
77	}	×
78
79	pub fn call_on_progress_horizon_hooks(&self, info: HorizonSyncInfo) {	×
80	self.on_progress_horizon_sync.iter().for_each(\|f\| (*f)(info.clone()));	×
81	}	×
82
83	pub fn add_on_complete_hook<H>(&mut self, hook: H)	×
84	where H: Fn(Arc<ChainBlock>, u64) + Send + Sync + 'static {	×
85	self.on_complete.push(Box::new(hook));	×
86	}	×
87
88	pub fn call_on_complete_hooks(&self, final_block: Arc<ChainBlock>, starting_height: u64) {	×
89	self.on_complete	×
90	.iter()	×
91	.for_each(\|f\| (*f)(final_block.clone(), starting_height));	×
92	}	×
93
94	pub fn add_on_rewind_hook<H>(&mut self, hook: H)	10✔
95	where H: Fn(Vec<Arc<ChainBlock>>) + Send + Sync + 'static {	10✔
96	self.on_rewind.push(Box::new(hook));	10✔
97	}	10✔
98
UNCOV 99	pub fn call_on_rewind_hooks(&mut self, blocks: Vec<Arc<ChainBlock>>) {	×
UNCOV 100	self.on_rewind.iter().for_each(\|f\| (*f)(blocks.clone()));	×
UNCOV 101	}	×
102	}

tari-project / tari / 15484013348

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous