projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pipe the new `RecipientOnionFields` through send pipeline
[rust-lightning]
/
lightning-invoice
/
src
/
de.rs
diff --git
a/lightning-invoice/src/de.rs
b/lightning-invoice/src/de.rs
index 92c1cb5c28f5385b5eb2f37c2cbbac62b58ac398..ab9fd9cb2bc21446920360759feefec87291f774 100644
(file)
--- a/
lightning-invoice/src/de.rs
+++ b/
lightning-invoice/src/de.rs
@@
-6,7
+6,6
@@
use core::num::ParseIntError;
use core::str;
use core::str::FromStr;
use core::str;
use core::str::FromStr;
-use bech32;
use bech32::{u5, FromBase32};
use bitcoin_hashes::Hash;
use bech32::{u5, FromBase32};
use bitcoin_hashes::Hash;
@@
-18,7
+17,6
@@
use lightning::routing::router::{RouteHint, RouteHintHop};
use num_traits::{CheckedAdd, CheckedMul};
use num_traits::{CheckedAdd, CheckedMul};
-use secp256k1;
use secp256k1::ecdsa::{RecoveryId, RecoverableSignature};
use secp256k1::PublicKey;
use secp256k1::ecdsa::{RecoveryId, RecoverableSignature};
use secp256k1::PublicKey;
@@
-323,9
+321,9
@@
impl FromStr for RawHrp {
};
Ok(RawHrp {
};
Ok(RawHrp {
- currency
: currency
,
+ currency,
raw_amount: amount,
raw_amount: amount,
- si_prefix
: si_prefix
,
+ si_prefix,
})
}
}
})
}
}
@@
-342,7
+340,7
@@
impl FromBase32 for RawDataPart {
let tagged = parse_tagged_parts(&data[7..])?;
Ok(RawDataPart {
let tagged = parse_tagged_parts(&data[7..])?;
Ok(RawDataPart {
- timestamp
: timestamp
,
+ timestamp,
tagged_fields: tagged,
})
}
tagged_fields: tagged,
})
}
@@
-515,7
+513,7
@@
impl FromBase32 for ExpiryTime {
fn from_base32(field_data: &[u5]) -> Result<ExpiryTime, ParseError> {
match parse_int_be::<u64, u5>(field_data, 32)
fn from_base32(field_data: &[u5]) -> Result<ExpiryTime, ParseError> {
match parse_int_be::<u64, u5>(field_data, 32)
- .map(
|t| ExpiryTime::from_seconds(t)
)
+ .map(
ExpiryTime::from_seconds
)
{
Some(t) => Ok(t),
None => Err(ParseError::IntegerOverflowError),
{
Some(t) => Ok(t),
None => Err(ParseError::IntegerOverflowError),
@@
-540,7
+538,7
@@
impl FromBase32 for Fallback {
type Err = ParseError;
fn from_base32(field_data: &[u5]) -> Result<Fallback, ParseError> {
type Err = ParseError;
fn from_base32(field_data: &[u5]) -> Result<Fallback, ParseError> {
- if field_data.
len() < 1
{
+ if field_data.
is_empty()
{
return Err(ParseError::UnexpectedEndOfTaggedFields);
}
return Err(ParseError::UnexpectedEndOfTaggedFields);
}
@@
-554,7
+552,7
@@
impl FromBase32 for Fallback {
}
Ok(Fallback::SegWitProgram {
}
Ok(Fallback::SegWitProgram {
- version
: version
,
+ version,
program: bytes
})
},
program: bytes
})
},