X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Foffers%2Fparse.rs;h=472e44f6220f1aed6b2c77c71252a49a1b7aff3b;hb=a8bd4c097f7ae6620eee66c1cb49144e38568439;hp=400cf51a2944d47cc0afd19e227acb3216242959;hpb=281a0aead744351c43fce660cf78f955fc969bfb;p=rust-lightning diff --git a/lightning/src/offers/parse.rs b/lightning/src/offers/parse.rs index 400cf51a..472e44f6 100644 --- a/lightning/src/offers/parse.rs +++ b/lightning/src/offers/parse.rs @@ -9,13 +9,12 @@ //! Parsing and formatting for bech32 message encoding. -use bitcoin::bech32; use bitcoin::secp256k1; -use core::convert::TryFrom; use crate::io; use crate::ln::msgs::DecodeError; use crate::util::ser::SeekReadable; +#[allow(unused_imports)] use crate::prelude::*; #[cfg(not(fuzzing))] @@ -25,12 +24,11 @@ pub(super) use sealed::Bech32Encode; pub use sealed::Bech32Encode; mod sealed { - use bitcoin::bech32; - use bitcoin::bech32::{FromBase32, ToBase32}; - use core::convert::TryFrom; + use bech32::{FromBase32, ToBase32}; use core::fmt; use super::Bolt12ParseError; + #[allow(unused_imports)] use crate::prelude::*; /// Indicates a message can be encoded using bech32. @@ -183,6 +181,8 @@ pub enum Bolt12SemanticError { DuplicatePaymentId, /// Blinded paths were expected but were missing. MissingPaths, + /// Blinded paths were provided but were not expected. + UnexpectedPaths, /// The blinded payinfo given does not match the number of blinded path hops. InvalidPayInfo, /// An invoice creation time was expected but was missing. @@ -275,7 +275,6 @@ mod bolt12_tests { #[cfg(test)] mod tests { use super::Bolt12ParseError; - use bitcoin::bech32; use crate::ln::msgs::DecodeError; use crate::offers::offer::Offer;