fix withdraw-withheld-tokens CLI subcommand showing wrong order of arguments in 'Usage'

[nazreen]

Motivation

Closes #311

Changes

renamed arguments and amended descriptions.

From

<TOKEN_ACCOUNT_ADDRESS>    The address of the token account to receive withdrawn tokens

to

<FEE_RECIPIENT_ADDRESS>    The address of the token account to receive withdrawn tokens

and from

 <ACCOUNT_ADDRESS>...       The token accounts to withdraw from

to

<SOURCE_ADDRESS>...        The token account(s) to withdraw fees from.

The Usage output has been updated (corrected) from

USAGE:
    spl-token withdraw-withheld-tokens [OPTIONS] <ACCOUNT_ADDRESS|--include-mint> <TOKEN_ACCOUNT_ADDRESS> [--]

to

USAGE:
    spl-token withdraw-withheld-tokens [OPTIONS] <FEE_RECIPIENT_ADDRESS> <SOURCE_ADDRESS|--include-mint> [--]

Testing

Run

cargo run -- withdraw-withheld-tokens --help

Output will be like so:

USAGE:
    spl-token withdraw-withheld-tokens [OPTIONS] <FEE_RECIPIENT_ADDRESS> <SOURCE_ADDRESS|--include-mint> [--]

ARGS:
    <FEE_RECIPIENT_ADDRESS>    The token account to send withdrawn fees to.
    <SOURCE_ADDRESS>...        The token account(s) to withdraw fees from.

Which correctly

[joncinque]

Thanks for the contribution! The updated value names and help text is definitely good, but let's see what we can do with the arg group part

[joncinque]

This would create a bug unfortunately -- if you just want to withdraw withheld fees from the mint, the command would fail since accounts are required.

Rather than adding this new group, we can remove the following group (ArgGroup::with_name("source_or_mint")). That would cause no-ops if neither --include-mint nor any accounts are provided, but maybe that's better than the help text being incorrect.

[joncinque]

Oh never mind, this actually works! I tested it out and it actually does everything properly.

Let's just go with this -- can you just add a comment explaining that we need this in order to show the help text correctly?

[nazreen]

Ok will do. I’ll add the comment in a bit! Currently not at laptop

…

On Mon, 24 Mar 2025 at 20:19, Jon C ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In clients/cli/src/clap_app.rs <#312 (comment)> : > + .group( + ArgGroup::with_name("account_group") + .arg("account") + .required(true) + ) Oh never mind, this actually works! I tested it out and it actually does everything properly. Let's just go with this -- can you just add a comment explaining that we need this in order to show the help text correctly? — Reply to this email directly, view it on GitHub <#312 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ACTU44UWX64FSP344EIQGLT2V7Z3TAVCNFSM6AAAAABZTCWE52VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDOMJQGE4DMNBVG4> . You are receiving this because you authored the thread.Message ID: ***@***.***>

[joncinque]

Thanks!