Skip to content

Commit 06f4f93

Browse files
committed
Fix remaining len zero checks in arg parsers in blockstack_cli
Signed-off-by: Jacinta Ferrant <[email protected]>
1 parent c7d455d commit 06f4f93

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

stackslib/src/blockstack_cli.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ fn handle_contract_publish(
375375
) -> Result<String, CliError> {
376376
let mut args = args_slice.to_vec();
377377

378-
if args.len() >= 1 && args[0] == "-h" {
378+
if !args.is_empty() && args[0] == "-h" {
379379
return Err(CliError::Message(format!("USAGE:\n {}", PUBLISH_USAGE)));
380380
}
381381
if args.len() != 5 {
@@ -433,7 +433,7 @@ fn handle_contract_call(
433433
clarity_version: ClarityVersion,
434434
) -> Result<String, CliError> {
435435
let mut args = args_slice.to_vec();
436-
if args.len() >= 1 && args[0] == "-h" {
436+
if !args.is_empty() && args[0] == "-h" {
437437
return Err(CliError::Message(format!("USAGE:\n {}", CALL_USAGE)));
438438
}
439439
if args.len() < 6 {
@@ -518,7 +518,7 @@ fn handle_token_transfer(
518518
chain_id: u32,
519519
) -> Result<String, CliError> {
520520
let mut args = args_slice.to_vec();
521-
if args.len() >= 1 && args[0] == "-h" {
521+
if !args.is_empty() && args[0] == "-h" {
522522
return Err(CliError::Message(format!(
523523
"USAGE:\n {}",
524524
TOKEN_TRANSFER_USAGE
@@ -575,7 +575,7 @@ fn handle_token_transfer(
575575
}
576576

577577
fn generate_secret_key(args: &[String], version: TransactionVersion) -> Result<String, CliError> {
578-
if args.len() >= 1 && args[0] == "-h" {
578+
if !args.is_empty() && args[0] == "-h" {
579579
return Err(CliError::Message(format!("USAGE:\n {}", GENERATE_USAGE)));
580580
}
581581

@@ -606,7 +606,7 @@ fn generate_secret_key(args: &[String], version: TransactionVersion) -> Result<S
606606
}
607607

608608
fn get_addresses(args: &[String], version: TransactionVersion) -> Result<String, CliError> {
609-
if (args.len() >= 1 && args[0] == "-h") || args.len() != 1 {
609+
if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
610610
return Err(CliError::Message(format!("USAGE:\n {}", ADDRESSES_USAGE)));
611611
}
612612

@@ -645,7 +645,7 @@ fn get_addresses(args: &[String], version: TransactionVersion) -> Result<String,
645645
}
646646

647647
fn decode_transaction(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
648-
if (args.len() >= 1 && args[0] == "-h") || args.len() != 1 {
648+
if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
649649
return Err(CliError::Message(format!(
650650
"Usage: {}\n",
651651
DECODE_TRANSACTION_USAGE
@@ -683,7 +683,7 @@ fn decode_transaction(args: &[String], _version: TransactionVersion) -> Result<S
683683
}
684684

685685
fn decode_header(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
686-
if (args.len() >= 1 && args[0] == "-h") || args.len() != 1 {
686+
if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
687687
return Err(CliError::Message(format!(
688688
"Usage: {}\n",
689689
DECODE_HEADER_USAGE
@@ -722,7 +722,7 @@ fn decode_header(args: &[String], _version: TransactionVersion) -> Result<String
722722
}
723723

724724
fn decode_block(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
725-
if (args.len() >= 1 && args[0] == "-h") || args.len() != 1 {
725+
if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
726726
return Err(CliError::Message(format!(
727727
"Usage: {}\n",
728728
DECODE_BLOCK_USAGE
@@ -759,7 +759,7 @@ fn decode_block(args: &[String], _version: TransactionVersion) -> Result<String,
759759
}
760760

761761
fn decode_microblock(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
762-
if (args.len() >= 1 && args[0] == "-h") || args.len() != 1 {
762+
if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
763763
return Err(CliError::Message(format!(
764764
"Usage: {}\n",
765765
DECODE_MICROBLOCK_USAGE
@@ -798,7 +798,7 @@ fn decode_microblock(args: &[String], _version: TransactionVersion) -> Result<St
798798
}
799799

800800
fn decode_microblocks(args: &[String], _version: TransactionVersion) -> Result<String, CliError> {
801-
if (args.len() >= 1 && args[0] == "-h") || args.len() != 1 {
801+
if (!args.is_empty() && args[0] == "-h") || args.len() != 1 {
802802
return Err(CliError::Message(format!(
803803
"Usage: {}\n",
804804
DECODE_MICROBLOCKS_USAGE

0 commit comments

Comments
 (0)