[token-upgrade] Remove clap deprecated functions #6951
Conversation
| @@ -336,7 +334,7 @@ async fn main() -> Result<(), Box<dyn Error>> { | |||
| .value_parser(SignerSourceParserBuilder::default().allow_all().build()) | |||
| .value_name("MULTISIG_SIGNER") | |||
| .takes_value(true) | |||
| .multiple(true) | |||
| .action(ArgAction::Append) | |||
There was a problem hiding this comment.
The documentation seems to imply that we should use multiple_occurrences instead, ie:
Arg::multiple_occurrences in favor of Arg::multiple_values (positional), ArgAction::Append (flag with value), or ArgAction::Count (flag without value)
from clap-rs/clap#3797, and:
Replace Arg::multiple(bool) with Arg::multiple_values / Arg::multiple_occurrences
from https://github.com/clap-rs/clap/releases/tag/v3.0.0
Is there a reason to use your approach instead?
There was a problem hiding this comment.
Yeah multiple was deprecated in favor of multiple_occurrences in v3.0.0, but multiple_occurrences was deprecated in favor of ArgAction in v3.2.0 (https://github.com/clap-rs/clap/releases/tag/v3.2.0) 😅.
There was a problem hiding this comment.
Haha I had a feeling, thanks for the info!
Problem
The token-upgrade cli tool still uses some deprecated functions from clap-v2.
Summary
Updated the deprecated functions from clap-v2. Most of the changes should be straightforward:
Arg::multiplewithArgAction::Append, which should be functionally identicalis_presentwithtry_contains_id. The oldis_presentpanics if the arg is not previously known/defined whiletry_contains_idgives an error. Otherwise, the two functions are identical.try_pubkey_ofwithSignerSource::try_get_pubkey. Thetry_pubkey_ofinternally tries to parsePubkeyfromSignerSource, which unfortunately, solana-clap-v3-utils does not yet support. TheSignerSource::try_get_pubkeyparsesSignerSourcecorrectly and then extractsPubkeyfrom it.The only non-trivial change would be replacing
value_of. This should technically be updated totry_get_one::<T>(...)orget_one::<T>(...), but I replaced it with a convenience functiontry_get_signer, which was added withsolana-clap-v3-utils 2.0. I ended up removing the use ofDefaultSignerand just added the logic to parse signers directly.The feature
deprecatedin clap v3 allows us to toggle warnings from the use of deprecated functions. The deprecated functions are all removed from this crate, but other crates in the repo still uses some deprecated functions, so I removed this feature from clap for now.This is an analogous PR to #6952.