Skip to content

Commit

Permalink
Refactor config and CLI for better readability
Browse files Browse the repository at this point in the history
  • Loading branch information
sergeytimoshin committed Sep 16, 2024
1 parent 94e840d commit 6d350e9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 6 deletions.
12 changes: 10 additions & 2 deletions forester/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,21 @@ pub struct StartArgs {
#[arg(long, env = "FORESTER_STATE_QUEUE_START_INDEX", default_value = "0")]
pub state_queue_start_index: u16,

#[arg(long, env = "FORESTER_STATE_PROCESSING_LENGTH", default_value = "28807")]
#[arg(
long,
env = "FORESTER_STATE_PROCESSING_LENGTH",
default_value = "28807"
)]
pub state_queue_processing_length: u16,

#[arg(long, env = "FORESTER_ADDRESS_QUEUE_START_INDEX", default_value = "0")]
pub address_queue_start_index: u16,

#[arg(long, env = "FORESTER_ADDRESS_PROCESSING_LENGTH", default_value = "28807")]
#[arg(
long,
env = "FORESTER_ADDRESS_PROCESSING_LENGTH",
default_value = "28807"
)]
pub address_queue_processing_length: u16,
}

Expand Down
12 changes: 8 additions & 4 deletions forester/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,12 @@ impl ForesterConfig {
.map_err(|e| ForesterError::ConfigError(e.to_string()))?,
None => return Err(ForesterError::ConfigError("Payer is required".to_string())),
};
let payer = Keypair::from_bytes(&payer)
.map_err(|e| ForesterError::ConfigError(e.to_string()))?;
let payer =
Keypair::from_bytes(&payer).map_err(|e| ForesterError::ConfigError(e.to_string()))?;

let rpc_url = args.rpc_url.clone()
let rpc_url = args
.rpc_url
.clone()
.ok_or_else(|| ForesterError::ConfigError("RPC URL is required".to_string()))?;

Ok(Self {
Expand Down Expand Up @@ -151,7 +153,9 @@ impl ForesterConfig {
}

pub fn new_for_status(args: &StatusArgs) -> Result<Self, ForesterError> {
let rpc_url = args.rpc_url.clone()
let rpc_url = args
.rpc_url
.clone()
.ok_or_else(|| ForesterError::ConfigError("RPC URL is required".to_string()))?;

Ok(Self {
Expand Down

0 comments on commit 6d350e9

Please sign in to comment.