11extern crate bech32;
2+ extern crate hex;
23extern crate lightning;
34extern crate lightning_invoice;
45extern crate secp256k1;
5- extern crate hex;
66
7- use bitcoin:: { PubkeyHash , ScriptHash , WitnessVersion } ;
87use bitcoin:: hashes:: hex:: FromHex ;
98use bitcoin:: hashes:: { sha256, Hash } ;
9+ use bitcoin:: { PubkeyHash , ScriptHash , WitnessVersion } ;
1010use lightning_invoice:: * ;
11- use secp256k1:: PublicKey ;
1211use secp256k1:: ecdsa:: { RecoverableSignature , RecoveryId } ;
12+ use secp256k1:: PublicKey ;
1313use std:: collections:: HashSet ;
14- use std:: time:: Duration ;
1514use std:: str:: FromStr ;
15+ use std:: time:: Duration ;
1616
1717fn get_test_tuples ( ) -> Vec < ( String , SignedRawBolt11Invoice , bool , bool ) > {
1818 vec ! [
@@ -382,7 +382,8 @@ fn get_test_tuples() -> Vec<(String, SignedRawBolt11Invoice, bool, bool)> {
382382
383383#[ test]
384384fn invoice_deserialize ( ) {
385- for ( serialized, deserialized, ignore_feature_diff, ignore_unknown_fields) in get_test_tuples ( ) {
385+ for ( serialized, deserialized, ignore_feature_diff, ignore_unknown_fields) in get_test_tuples ( )
386+ {
386387 eprintln ! ( "Testing invoice {}..." , serialized) ;
387388 let parsed = serialized. parse :: < SignedRawBolt11Invoice > ( ) . unwrap ( ) ;
388389
@@ -393,17 +394,33 @@ fn invoice_deserialize() {
393394 assert_eq ! ( deserialized_invoice. hrp, parsed_invoice. hrp) ;
394395 assert_eq ! ( deserialized_invoice. data. timestamp, parsed_invoice. data. timestamp) ;
395396
396- let mut deserialized_hunks: HashSet < _ > = deserialized_invoice. data . tagged_fields . iter ( ) . collect ( ) ;
397+ let mut deserialized_hunks: HashSet < _ > =
398+ deserialized_invoice. data . tagged_fields . iter ( ) . collect ( ) ;
397399 let mut parsed_hunks: HashSet < _ > = parsed_invoice. data . tagged_fields . iter ( ) . collect ( ) ;
398400 if ignore_feature_diff {
399- deserialized_hunks. retain ( |h|
400- if let RawTaggedField :: KnownSemantics ( TaggedField :: Features ( _) ) = h { false } else { true } ) ;
401- parsed_hunks. retain ( |h|
402- if let RawTaggedField :: KnownSemantics ( TaggedField :: Features ( _) ) = h { false } else { true } ) ;
401+ deserialized_hunks. retain ( |h| {
402+ if let RawTaggedField :: KnownSemantics ( TaggedField :: Features ( _) ) = h {
403+ false
404+ } else {
405+ true
406+ }
407+ } ) ;
408+ parsed_hunks. retain ( |h| {
409+ if let RawTaggedField :: KnownSemantics ( TaggedField :: Features ( _) ) = h {
410+ false
411+ } else {
412+ true
413+ }
414+ } ) ;
403415 }
404416 if ignore_unknown_fields {
405- parsed_hunks. retain ( |h|
406- if let RawTaggedField :: UnknownSemantics ( _) = h { false } else { true } ) ;
417+ parsed_hunks. retain ( |h| {
418+ if let RawTaggedField :: UnknownSemantics ( _) = h {
419+ false
420+ } else {
421+ true
422+ }
423+ } ) ;
407424 }
408425 assert_eq ! ( deserialized_hunks, parsed_hunks) ;
409426
0 commit comments