@@ -98,15 +98,19 @@ pub fn owner_address_arg<'a, 'b>() -> Arg<'a, 'b> {
98
98
. help ( OWNER_ADDRESS_ARG . help )
99
99
}
100
100
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 > {
102
102
Arg :: with_name ( OWNER_KEYPAIR_ARG . name )
103
103
. long ( OWNER_KEYPAIR_ARG . long )
104
104
. takes_value ( true )
105
- . value_name ( "OWNER_KEYPAIR" )
105
+ . value_name ( value_name )
106
106
. validator ( is_valid_signer)
107
107
. help ( OWNER_KEYPAIR_ARG . help )
108
108
}
109
109
110
+ pub fn owner_keypair_arg < ' a , ' b > ( ) -> Arg < ' a , ' b > {
111
+ owner_keypair_arg_with_value_name ( "OWNER_KEYPAIR" )
112
+ }
113
+
110
114
pub fn mint_address_arg < ' a , ' b > ( ) -> Arg < ' a , ' b > {
111
115
Arg :: with_name ( MINT_ADDRESS_ARG . name )
112
116
. long ( MINT_ADDRESS_ARG . long )
@@ -1629,8 +1633,7 @@ fn main() {
1629
1633
. help ( "Specify the sending token account \
1630
1634
[default: owner's associated token account]")
1631
1635
)
1632
- . arg ( owner_keypair_arg ( )
1633
- . value_name ( "SENDER_TOKEN_OWNER_KEYPAIR" )
1636
+ . arg ( owner_keypair_arg_with_value_name ( "SENDER_TOKEN_OWNER_KEYPAIR" )
1634
1637
. help (
1635
1638
"Specify the owner of the sending token account. \
1636
1639
This may be a keypair file, the ASK keyword. \
@@ -1694,8 +1697,7 @@ fn main() {
1694
1697
. required ( true )
1695
1698
. help ( "Amount to burn, in tokens" ) ,
1696
1699
)
1697
- . arg ( owner_keypair_arg ( )
1698
- . value_name ( "SOURCE_TOKEN_OWNER_KEYPAIR" )
1700
+ . arg ( owner_keypair_arg_with_value_name ( "SOURCE_TOKEN_OWNER_KEYPAIR" )
1699
1701
. help (
1700
1702
"Specify the source token owner account. \
1701
1703
This may be a keypair file, the ASK keyword. \
0 commit comments