fix clippy lints; deprecated update_authority_nft field on set-and-ve…

…rify-nft (samuelvanderwaal#290)
IkigaiLabsETH · Aug 30, 2023 · befc8d5 · befc8d5
1 parent 1663dcc
commit befc8d5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/src/collections/items.rs b/src/collections/items.rs
@@ -83,19 +83,18 @@ pub async fn check_collection_items(
             (Ok(res), _index, remaining) => {
                 handles = remaining;
 
-                if res.is_ok() {
-                    let (mint, collection_opt) = res.unwrap();
+                if let Ok((mint, collection_opt)) = res {
                     match collection_opt {
                         Some(collection) => {
                             collections
                                 .entry(collection.key.to_string())
-                                .or_insert_with(Vec::new)
+                                .or_default()
                                 .push(mint.to_string());
                         }
                         None => {
                             collections
                                 .entry("none".to_string())
-                                .or_insert_with(Vec::new)
+                                .or_default()
                                 .push(mint.to_string());
                         }
                     }

diff --git a/src/collections/methods.rs b/src/collections/methods.rs
@@ -20,7 +20,6 @@ pub fn set_and_verify_nft_collection(
     keypair_path: Option<String>,
     nft_mint: String,
     collection_mint: String,
-    _nft_auth: String,
     is_delegate_present: bool,
 ) -> AnyResult<()> {
     let solana_opts = parse_solana_config();

diff --git a/src/opt.rs b/src/opt.rs
@@ -499,9 +499,10 @@ pub enum CollectionsSubcommands {
         #[structopt(short = "n", long)]
         nft_mint: String,
 
-        /// NFT update authority
+        /// NFT update authority: deprecated--does not need to be passed in
+        #[deprecated]
         #[structopt(short, long)]
-        update_authority_nft: String,
+        update_authority_nft: Option<String>,
 
         /// Option if the signing keypair is a collection authority delegate.
         #[structopt(short = "d", long)]

diff --git a/src/process_subcommands.rs b/src/process_subcommands.rs
@@ -119,20 +119,14 @@ pub async fn process_collections(
             nft_mint,
         } => unverify_nft_collection(client, keypair, nft_mint, collection_mint, is_delegate),
 
+        #[allow(deprecated)]
         CollectionsSubcommands::SetAndVerifyCollection {
             keypair,
             nft_mint,
-            update_authority_nft,
             collection_mint,
+            update_authority_nft: _,
             is_delegate,
-        } => set_and_verify_nft_collection(
-            client,
-            keypair,
-            nft_mint,
-            collection_mint,
-            update_authority_nft,
-            is_delegate,
-        ),
+        } => set_and_verify_nft_collection(client, keypair, nft_mint, collection_mint, is_delegate),
 
         CollectionsSubcommands::ApproveAuthority {
             keypair,