Skip to content

Commit

Permalink
chore: fmt code by +nightly toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
will-bitlight committed Sep 25, 2024
1 parent b4f0c08 commit 2481c5f
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion cli/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ use std::ops::{Deref, DerefMut};
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;
Expand Down
4 changes: 2 additions & 2 deletions cli/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand All @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions psbt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion psbt/src/rgb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/descriptor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/indexers/any.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
8 changes: 4 additions & 4 deletions src/pay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down

0 comments on commit 2481c5f

Please sign in to comment.