From: Antoine Poinsot Date: Thu, 25 Jul 2024 14:36:55 +0000 (+0200) Subject: bdk_wallet: descriptor: remove unnecessary call to calc_checksum_bytes X-Git-Tag: v1.0.0-beta.2~18^2~2 X-Git-Url: http://internal-gitweb-vhost/script/%22https:/struct.EncoderStringWriter.html?a=commitdiff_plain;h=a11ace20ce38c9753d7f58cd410da747f4e4fd00;p=bdk bdk_wallet: descriptor: remove unnecessary call to calc_checksum_bytes It can just be a String. --- diff --git a/crates/wallet/src/descriptor/checksum.rs b/crates/wallet/src/descriptor/checksum.rs index 243376bc..3a16c3e8 100644 --- a/crates/wallet/src/descriptor/checksum.rs +++ b/crates/wallet/src/descriptor/checksum.rs @@ -43,7 +43,7 @@ fn poly_mod(mut c: u64, val: u64) -> u64 { } /// Compute the checksum bytes of a descriptor, excludes any existing checksum in the descriptor string from the calculation -pub fn calc_checksum_bytes(mut desc: &str) -> Result<[u8; 8], DescriptorError> { +fn calc_checksum_bytes(mut desc: &str) -> Result<[u8; 8], DescriptorError> { let mut c = 1; let mut cls = 0; let mut clscount = 0; diff --git a/crates/wallet/src/descriptor/mod.rs b/crates/wallet/src/descriptor/mod.rs index 477b265e..c3dd95da 100644 --- a/crates/wallet/src/descriptor/mod.rs +++ b/crates/wallet/src/descriptor/mod.rs @@ -42,7 +42,6 @@ pub mod policy; pub mod template; pub use self::checksum::calc_checksum; -use self::checksum::calc_checksum_bytes; pub use self::error::Error as DescriptorError; pub use self::policy::Policy; use self::template::DescriptorTemplateOut; @@ -88,8 +87,8 @@ impl IntoWalletDescriptor for &str { ) -> Result<(ExtendedDescriptor, KeyMap), DescriptorError> { let descriptor = match self.split_once('#') { Some((desc, original_checksum)) => { - let checksum = calc_checksum_bytes(desc)?; - if original_checksum.as_bytes() != checksum { + let checksum = calc_checksum(desc)?; + if original_checksum != checksum { return Err(DescriptorError::InvalidDescriptorChecksum); } desc