From: Steve Myers <steve@notmandatory.org>
Date: Thu, 27 Oct 2022 03:01:07 +0000 (-0500)
Subject: Merge branch 'master' into fix_wallet_checksum
X-Git-Tag: v0.24.0-rc.1~2^2
X-Git-Url: http://internal-gitweb-vhost/script/%22https:/struct.CommandStringError.html?a=commitdiff_plain;h=9cb6f70fc09c200417d3fdb8032e8f928987c6c7;p=bdk

Merge branch 'master' into fix_wallet_checksum
---

9cb6f70fc09c200417d3fdb8032e8f928987c6c7
diff --cc src/descriptor/mod.rs
index 3b6e7d35,c8f4d29d..1329063a
--- a/src/descriptor/mod.rs
+++ b/src/descriptor/mod.rs
@@@ -39,9 -37,7 +37,8 @@@ pub mod error
  pub mod policy;
  pub mod template;
  
 -pub use self::checksum::get_checksum;
 +pub use self::checksum::calc_checksum;
 +use self::checksum::calc_checksum_bytes;
- pub use self::derived::{AsDerived, DerivedDescriptorKey};
  pub use self::error::Error as DescriptorError;
  pub use self::policy::Policy;
  use self::template::DescriptorTemplateOut;
diff --cc src/descriptor/policy.rs
index 8f64a5d2,413fe6e3..964ec291
--- a/src/descriptor/policy.rs
+++ b/src/descriptor/policy.rs
@@@ -58,9 -61,9 +61,9 @@@ use log::{debug, error, info, trace}
  use crate::descriptor::ExtractPolicy;
  use crate::keys::ExtScriptContext;
  use crate::wallet::signer::{SignerId, SignersContainer};
- use crate::wallet::utils::{self, After, Older, SecpCtx};
+ use crate::wallet::utils::{After, Older, SecpCtx};
  
 -use super::checksum::get_checksum;
 +use super::checksum::calc_checksum;
  use super::error::Error;
  use super::XKeyUtils;
  use bitcoin::util::psbt::{Input as PsbtInput, PartiallySignedTransaction as Psbt};
diff --cc src/wallet/mod.rs
index 07690e3f,54d76f13..c400c5a4
--- a/src/wallet/mod.rs
+++ b/src/wallet/mod.rs
@@@ -64,15 -59,12 +59,13 @@@ use utils::{check_nsequence_rbf, After
  use crate::blockchain::{GetHeight, NoopProgress, Progress, WalletSync};
  use crate::database::memory::MemoryDatabase;
  use crate::database::{AnyDatabase, BatchDatabase, BatchOperations, DatabaseUtils, SyncTime};
 +use crate::descriptor::checksum::calc_checksum_bytes_internal;
- use crate::descriptor::derived::AsDerived;
  use crate::descriptor::policy::BuildSatisfaction;
  use crate::descriptor::{
-     calc_checksum, into_wallet_descriptor_checked, DerivedDescriptor, DerivedDescriptorMeta,
-     DescriptorMeta, DescriptorScripts, ExtendedDescriptor, ExtractPolicy, IntoWalletDescriptor,
-     Policy, XKeyUtils,
 -    get_checksum, into_wallet_descriptor_checked, DerivedDescriptor, DescriptorMeta,
++    calc_checksum, into_wallet_descriptor_checked, DerivedDescriptor, DescriptorMeta,
+     ExtendedDescriptor, ExtractPolicy, IntoWalletDescriptor, Policy, XKeyUtils,
  };
- use crate::error::Error;
+ use crate::error::{Error, MiniscriptPsbtError};
  use crate::psbt::PsbtUtils;
  use crate::signer::SignerError;
  use crate::testutils;