fix: error mismatch

cli/Cargo.toml

@@ -24,6 +24,7 @@ commit_verify = { workspace = true }
 bp-seals = { workspace = true }
 bp-std = { workspace = true, features = ["serde"] }
 bp-wallet = { workspace = true, features = ["cli"] }
+nonasync = { workspace = true }
 psbt = { workspace = true }
 rgb-std = { workspace = true, features = ["serde"] }
 rgb-interfaces = { workspace = true }

cli/src/args.rs

@@ -27,8 +27,9 @@
 use std::path::PathBuf;
 
 use bpstd::{Wpkh, XpubDerivable};
-use bpwallet::cli::{Args as BpArgs, Config, DescriptorOpts};
 use bpwallet::Wallet;
+use bpwallet::cli::{Args as BpArgs, Config, DescriptorOpts};
+use nonasync::persistence::PersistenceError;
 use rgb::persistence::Stock;
 use rgb::resolvers::AnyResolver;
 use rgb::{RgbDescr, RgbWallet, TapretKey, WalletError};
@@ -104,20 +105,33 @@
         }
 
         let provider = FsBinStore::new(stock_path.clone())?;
-        let mut stock = Stock::load(provider, true).map_err(WalletError::WalletPersist).or_else(|err| {
-            if matches!(err, WalletError::Deserialize(DeserializeError::Decode(DecodeError::Io(ref err))) if err.kind() == ErrorKind::NotFound) {
-                if self.verbose > 1 {
-                    eprint!("stock file is absent, creating a new one ... ");
+        let mut stock = Stock::load(provider, true)
+            .or_else(|err| {
+                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);
                 }
-                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);
-            }
-            eprintln!("stock file is damaged, failing");
-            Err(err)
-        })?;
+                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::cli::{BpCommand, Config, Exec};
 use bpwallet::Wallet;
+use bpwallet::cli::{BpCommand, Config, Exec};
 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::encoding::{FieldName, TypeName};
 use strict_types::StrictVal;
+use strict_types::encoding::{FieldName, TypeName};
 
 use crate::RgbArgs;
 

psbt/src/lib.rs

@@ -28,12 +28,12 @@ use bp::dbc::opret::OpretProof;
 use bp::dbc::tapret::TapretProof;
 pub use psbt::*;
 pub use rgb::*;
-use rgbstd::containers::{AnchorSet, Batch, CloseMethodSet, Fascia, PubWitness, XPubWitness};
 use rgbstd::XChain;
+use rgbstd::containers::{AnchorSet, Batch, CloseMethodSet, Fascia, PubWitness, XPubWitness};
 
 pub use self::rgb::{
-    ProprietaryKeyRgb, RgbExt, RgbInExt, RgbOutExt, RgbPsbtError, PSBT_GLOBAL_RGB_TRANSITION,
-    PSBT_IN_RGB_CONSUMED_BY, PSBT_OUT_RGB_VELOCITY_HINT, PSBT_RGB_PREFIX,
+    PSBT_GLOBAL_RGB_TRANSITION, PSBT_IN_RGB_CONSUMED_BY, PSBT_OUT_RGB_VELOCITY_HINT,
+    PSBT_RGB_PREFIX, ProprietaryKeyRgb, RgbExt, RgbInExt, RgbOutExt, RgbPsbtError,
 };
 
 #[derive(Clone, Eq, PartialEq, Debug, Display, Error)]

psbt/src/rgb.rs

@@ -22,7 +22,7 @@
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 
 use amplify::confinement::{Confined, SmallOrdMap, U24};
-use amplify::{confinement, FromSliceError};
+use amplify::{FromSliceError, confinement};
 use bp::dbc::Method;
 use bp::seals::txout::CloseMethod;
 use commit_verify::mpc;

src/descriptor.rs

@@ -25,8 +25,8 @@ use std::iter;
 use std::str::FromStr;
 
 use amplify::Wrapper;
-use bp::dbc::tapret::TapretCommitment;
 use bp::dbc::Method;
+use bp::dbc::tapret::TapretCommitment;
 use bp::seals::txout::CloseMethod;
 use bp::{LegacyPk, SigScript, Witness};
 use bpstd::{

src/errors.rs

@@ -36,7 +36,7 @@ use rgbstd::persistence::{
 };
 use strict_types::encoding::{DeserializeError, Ident, SerializeError};
 
-use crate::{validation, TapTweakAlreadyAssigned};
+use crate::{TapTweakAlreadyAssigned, validation};
 
 #[derive(Debug, Display, Error, From)]
 #[display(inner)]

src/indexers/any.rs

@@ -25,9 +25,9 @@ use std::collections::HashMap;
 
 use bp::Tx;
 use bpstd::Network;
+use rgbstd::XWitnessId;
 use rgbstd::containers::Consignment;
 use rgbstd::validation::{ResolveWitness, WitnessResolverError};
-use rgbstd::XWitnessId;
 
 use crate::vm::{WitnessOrd, XWitnessTx};
 use crate::{Txid, XChain};

src/pay.rs

@@ -25,7 +25,7 @@ use std::marker::PhantomData;
 use bp::dbc::tapret::TapretProof;
 use bp::seals::txout::ExplicitSeal;
 use bp::{Outpoint, Sats, ScriptPubkey, Vout};
-use bpstd::{psbt, Address};
+use bpstd::{Address, psbt};
 use bpwallet::{Wallet, WalletDescr};
 use psrgbt::{
     Beneficiary as BpBeneficiary, Psbt, PsbtConstructor, PsbtMeta, RgbPsbt, TapretKeyError,
@@ -351,9 +351,9 @@ where Self::Descr: DescriptorRgb<K>
 }
 
 impl<K, D: DescriptorRgb<K>> WalletProvider<K> for Wallet<K, D> {
-    type Filter<'a> = WalletWrapper<'a, K, D>
-    where
-        Self: 'a;
+    type Filter<'a>
+        = WalletWrapper<'a, K, D>
+    where Self: 'a;
     fn filter(&self) -> Self::Filter<'_> { WalletWrapper(self) }
     fn with_descriptor_mut<R>(&mut self, f: impl FnOnce(&mut WalletDescr<K, D>) -> R) -> R {
         self.descriptor_mut(f)

src/wallet.rs

@@ -26,9 +26,9 @@ use std::path::PathBuf;
 
 use bpstd::XpubDerivable;
 #[cfg(feature = "fs")]
-use bpwallet::fs::FsTextStore;
-#[cfg(feature = "fs")]
 use bpwallet::Wallet;
+#[cfg(feature = "fs")]
+use bpwallet::fs::FsTextStore;
 #[cfg(not(target_arch = "wasm32"))]
 use nonasync::persistence::PersistenceProvider;
 use psrgbt::{Psbt, PsbtMeta};