Merge branch 'development' into philip-connectivity-callbacks

base_layer/core/src/base_node/state_machine_service/states/listening.rs

@@ -55,6 +55,9 @@ use crate::{
 
 const LOG_TARGET: &str = "c::bn::state_machine_service::states::listening";
 
+/// The length of time to wait for a propagated block when one block behind before proceeding to sync
+const ONE_BLOCK_BEHIND_WAIT_PERIOD: Duration = Duration::from_secs(20);
+
 /// This struct contains the info of the peer, and is used to serialised and deserialised.
 #[derive(Serialize, Deserialize)]
 pub struct PeerMetadata {
@@ -195,7 +198,7 @@ impl Listening {
                     if self.is_synced &&
                         best_metadata.height_of_longest_chain() == local.height_of_longest_chain() + 1 &&
                         time_since_better_block
-                            .map(|ts: Instant| ts.elapsed() < Duration::from_secs(60))
+                            .map(|ts: Instant| ts.elapsed() < ONE_BLOCK_BEHIND_WAIT_PERIOD)
                             .unwrap_or(true)
                     {
                         if time_since_better_block.is_none() {