Skip to content

Commit f6bfe0a

Browse files
authored
Merge pull request #5161 from stacks-network/feat/use-burnchain-timeout
feat: use `timeout` param from burnchain config
2 parents 319e93b + f4d5779 commit f6bfe0a

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

testnet/stacks-node/src/burnchains/bitcoin_regtest_controller.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2817,7 +2817,7 @@ impl BitcoinRPCRequest {
28172817

28182818
fn send(config: &Config, payload: BitcoinRPCRequest) -> RPCResult<serde_json::Value> {
28192819
let request = BitcoinRPCRequest::build_rpc_request(&config, &payload);
2820-
let timeout = Duration::from_secs(60);
2820+
let timeout = Duration::from_secs(u64::from(config.burnchain.timeout));
28212821

28222822
let host = request.preamble().host.hostname();
28232823
let port = request.preamble().host.port();

testnet/stacks-node/src/config.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,6 +1416,7 @@ pub struct BurnchainConfig {
14161416
pub rpc_ssl: bool,
14171417
pub username: Option<String>,
14181418
pub password: Option<String>,
1419+
/// Timeout, in seconds, for communication with bitcoind
14191420
pub timeout: u32,
14201421
pub magic_bytes: MagicBytes,
14211422
pub local_mining_public_key: Option<String>,
@@ -1555,6 +1556,7 @@ pub struct BurnchainConfigFile {
15551556
pub rpc_ssl: Option<bool>,
15561557
pub username: Option<String>,
15571558
pub password: Option<String>,
1559+
/// Timeout, in seconds, for communication with bitcoind
15581560
pub timeout: Option<u32>,
15591561
pub magic_bytes: Option<String>,
15601562
pub local_mining_public_key: Option<String>,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3178,6 +3178,7 @@ fn min_gap_between_blocks() {
31783178
.as_stacks_nakamoto()
31793179
.unwrap()
31803180
.timestamp;
3181+
assert!(blocks.len() >= 2, "Expected at least 2 mined blocks");
31813182
let penultimate_block = blocks.get(blocks.len() - 2).unwrap();
31823183
let penultimate_block_time = penultimate_block
31833184
.anchored_header

0 commit comments

Comments
 (0)