FIx poor merge

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stacks-signer/src/config.rs

@@ -291,12 +291,6 @@ impl TryFrom<RawConfigFile> for GlobalConfig {
                 .unwrap_or(DEFAULT_TENURE_LAST_BLOCK_PROPOSAL_TIMEOUT_SECS),
         );
 
-        let tenure_last_block_proposal_timeout = Duration::from_secs(
-            raw_data
-                .tenure_last_block_proposal_timeout_secs
-                .unwrap_or(DEFAULT_TENURE_LAST_BLOCK_PROPOSAL_TIMEOUT_SECS),
-        );
-
         let block_proposal_validation_timeout = Duration::from_millis(
             raw_data
                 .block_proposal_validation_timeout_ms

testnet/stacks-node/src/tests/signer/v0.rs

@@ -6195,6 +6195,7 @@ fn block_validation_response_timeout() {
     info!("------------------------- Propose Another Block Before Hitting the Timeout -------------------------");
     let proposal_conf = ProposalEvalConfig {
         first_proposal_burn_block_timing: Duration::from_secs(0),
+        tenure_last_block_proposal_timeout: Duration::from_secs(30),
         block_proposal_timeout: Duration::from_secs(100),
     };
     let mut block = NakamotoBlock {