Update cli/src/args.rs

Co-authored-by: Dr. Maxim Orlovsky <[email protected]>

cli/src/args.rs

@@ -27,8 +27,8 @@ use std::ops::{Deref, DerefMut};
 use std::path::PathBuf;
 
 use bpstd::{Wpkh, XpubDerivable};
-use bpwallet::Wallet;
 use bpwallet::cli::{Args as BpArgs, Config, DescriptorOpts};
+use bpwallet::Wallet;
 use nonasync::persistence::PersistenceError;
 use rgb::persistence::Stock;
 use rgb::resolvers::AnyResolver;
@@ -106,29 +106,32 @@ impl RgbArgs {
 
         let provider = FsBinStore::new(stock_path.clone())?;
         let mut stock = Stock::load(provider, true)
-            .map_err(WalletError::WalletPersist)
             .or_else(|err| {
-                if let WalletError::WalletPersist(PersistenceError(ref err)) = err {
-                    if let Some(DeserializeError::Decode(DecodeError::Io(io_err))) =
-                        err.downcast_ref::<DeserializeError>()
-                    {
-                        if io_err.kind() == ErrorKind::NotFound {
-                            if self.verbose > 1 {
-                                eprint!("stock file is absent, creating a new one ... ");
-                            }
-                            fs::create_dir_all(&stock_path)?;
-                            let provider = FsBinStore::new(stock_path)?;
-                            let mut stock = Stock::in_memory();
-                            stock
-                                .make_persistent(provider, true)
-                                .map_err(WalletError::StockPersist)?;
-                            return Ok(stock);
-                        }
+                let Some(DeserializeError::Decode(DecodeError::Io(io_err))) =
+                    err.0.downcast_ref::<DeserializeError>()
+                else {
+                    eprintln!("stock file is damaged, failing");
+                    return Err(err);
+                };
+
+                if io_err.kind() == ErrorKind::NotFound {
+                    if self.verbose > 1 {
+                        eprint!("stock file is absent, creating a new one ... ");
                     }
+                    fs::create_dir_all(&stock_path)
+                        .map_err(|err| PersistenceError(Box::new(err)))?;
+                    let provider = FsBinStore::new(stock_path)
+                        .map_err(|err| PersistenceError(Box::new(err)))?;
+                    let mut stock = Stock::in_memory();
+                    stock
+                        .make_persistent(provider, true)
+                        .map_err(|err| PersistenceError(Box::new(err)))?;
+                    return Ok(stock);
                 }
                 eprintln!("stock file is damaged, failing");
                 Err(err)
-            })?;
+            })
+            .map_err(WalletError::WalletPersist)?;
 
         if self.sync {
             let resolver = self.resolver()?;

cli/src/command.rs

@@ -27,8 +27,8 @@ use std::str::FromStr;
 use amplify::confinement::{SmallOrdMap, TinyOrdMap, TinyOrdSet, U16 as MAX16};
 use baid64::DisplayBaid64;
 use bpstd::{Sats, XpubDerivable};
-use bpwallet::Wallet;
 use bpwallet::cli::{BpCommand, Config, Exec};
+use bpwallet::Wallet;
 use ifaces::{IfaceStandard, Rgb20, Rgb21, Rgb25};
 use psbt::{Psbt, PsbtVer};
 use rgb::containers::{
@@ -50,8 +50,8 @@ use rgbstd::containers::ConsignmentExt;
 use rgbstd::persistence::{MemContract, Stock};
 use seals::SecretSeal;
 use serde_crate::{Deserialize, Serialize};
-use strict_types::StrictVal;
 use strict_types::encoding::{FieldName, TypeName};
+use strict_types::StrictVal;
 
 use crate::RgbArgs;