Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 7b5afea

Browse files
t-nelsonmergify[bot]
authored andcommitted
token-cli: Dedupe 'transfer' help message --owner value name
1 parent e8b555f commit 7b5afea

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

token/cli/src/main.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,19 @@ pub fn owner_address_arg<'a, 'b>() -> Arg<'a, 'b> {
9898
.help(OWNER_ADDRESS_ARG.help)
9999
}
100100

101-
pub fn owner_keypair_arg<'a, 'b>() -> Arg<'a, 'b> {
101+
pub fn owner_keypair_arg_with_value_name<'a, 'b>(value_name: &'static str) -> Arg<'a, 'b> {
102102
Arg::with_name(OWNER_KEYPAIR_ARG.name)
103103
.long(OWNER_KEYPAIR_ARG.long)
104104
.takes_value(true)
105-
.value_name("OWNER_KEYPAIR")
105+
.value_name(value_name)
106106
.validator(is_valid_signer)
107107
.help(OWNER_KEYPAIR_ARG.help)
108108
}
109109

110+
pub fn owner_keypair_arg<'a, 'b>() -> Arg<'a, 'b> {
111+
owner_keypair_arg_with_value_name("OWNER_KEYPAIR")
112+
}
113+
110114
pub fn mint_address_arg<'a, 'b>() -> Arg<'a, 'b> {
111115
Arg::with_name(MINT_ADDRESS_ARG.name)
112116
.long(MINT_ADDRESS_ARG.long)
@@ -1629,8 +1633,7 @@ fn main() {
16291633
.help("Specify the sending token account \
16301634
[default: owner's associated token account]")
16311635
)
1632-
.arg(owner_keypair_arg()
1633-
.value_name("SENDER_TOKEN_OWNER_KEYPAIR")
1636+
.arg(owner_keypair_arg_with_value_name("SENDER_TOKEN_OWNER_KEYPAIR")
16341637
.help(
16351638
"Specify the owner of the sending token account. \
16361639
This may be a keypair file, the ASK keyword. \
@@ -1694,8 +1697,7 @@ fn main() {
16941697
.required(true)
16951698
.help("Amount to burn, in tokens"),
16961699
)
1697-
.arg(owner_keypair_arg()
1698-
.value_name("SOURCE_TOKEN_OWNER_KEYPAIR")
1700+
.arg(owner_keypair_arg_with_value_name("SOURCE_TOKEN_OWNER_KEYPAIR")
16991701
.help(
17001702
"Specify the source token owner account. \
17011703
This may be a keypair file, the ASK keyword. \

0 commit comments

Comments
 (0)