Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add miner timeout config option #5331

Merged
merged 1 commit into from
Apr 20, 2023
Merged

feat: add miner timeout config option #5331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions applications/tari_miner/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ pub struct MinerConfig {
pub coinbase_extra: String,
/// Selected network
pub network: Network,
/// Base node reconnect timeout after any GRPC or miner error
pub wait_timeout_on_error: u64,
}

#[derive(Serialize, Deserialize, Debug, Default)]
Expand Down Expand Up @@ -104,6 +106,7 @@ impl Default for MinerConfig {
mining_worker_name: String::new(),
coinbase_extra: "tari_miner".to_string(),
network: Default::default(),
wait_timeout_on_error: 10,
}
}
}
Expand All @@ -119,8 +122,7 @@ impl MinerConfig {
}

pub fn wait_timeout(&self) -> Duration {
// TODO: add config parameter
Duration::from_secs(10)
Duration::from_secs(self.wait_timeout_on_error)
}

pub fn validate_tip_interval(&self) -> Duration {
Expand Down
3 changes: 3 additions & 0 deletions common/config/presets/g_miner.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@

# Stratum Mode configuration - mining worker name (e.g. "worker1")
# mining_worker_name = "worker1"

# Base node reconnect timeout after any GRPC or miner error (default: 10 s)
# wait_timeout_on_error = 10
7 changes: 7 additions & 0 deletions common/config/presets/j_dan_wallet_daemon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@

########################################################################################################################
# #
# DAN Wallet Daemon Configuration Options () #
# #
########################################################################################################################

[dan_wallet_daemon]
# JSON-RPC listener address (default = "127.0.0.1:9000")
# listen_addr = "127.0.0.1:9000"
Expand Down