projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2939 from TheBlueMatt/2024-03-no-wake-on-shutdown-121
[rust-lightning]
/
lightning-invoice
/
src
/
de.rs
diff --git
a/lightning-invoice/src/de.rs
b/lightning-invoice/src/de.rs
index 5bfa9a042c364b749359f09a0ed96380a589cba6..c75373ea9dac3d127575b95d78954400164d1dc9 100644
(file)
--- a/
lightning-invoice/src/de.rs
+++ b/
lightning-invoice/src/de.rs
@@
-10,9
+10,9
@@
use core::str::FromStr;
use bech32::{u5, FromBase32};
use bitcoin::{PubkeyHash, ScriptHash};
use bech32::{u5, FromBase32};
use bitcoin::{PubkeyHash, ScriptHash};
-use bitcoin::
util::
address::WitnessVersion;
-use bitcoin
_
hashes::Hash;
-use bitcoin
_
hashes::sha256;
+use bitcoin::address::WitnessVersion;
+use bitcoin
::
hashes::Hash;
+use bitcoin
::
hashes::sha256;
use crate::prelude::*;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use crate::prelude::*;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
@@
-564,14
+564,14
@@
impl FromBase32 for Fallback {
17 => {
let pkh = match PubkeyHash::from_slice(&bytes) {
Ok(pkh) => pkh,
17 => {
let pkh = match PubkeyHash::from_slice(&bytes) {
Ok(pkh) => pkh,
- Err(bitcoin
_
hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidPubKeyHashLength),
+ Err(bitcoin
::
hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidPubKeyHashLength),
};
Ok(Fallback::PubKeyHash(pkh))
}
18 => {
let sh = match ScriptHash::from_slice(&bytes) {
Ok(sh) => sh,
};
Ok(Fallback::PubKeyHash(pkh))
}
18 => {
let sh = match ScriptHash::from_slice(&bytes) {
Ok(sh) => sh,
- Err(bitcoin
_
hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidScriptHashLength),
+ Err(bitcoin
::
hashes::Error::InvalidLength(_, _)) => return Err(Bolt11ParseError::InvalidScriptHashLength),
};
Ok(Fallback::ScriptHash(sh))
}
};
Ok(Fallback::ScriptHash(sh))
}
@@
-726,8
+726,8
@@
mod test {
use crate::de::Bolt11ParseError;
use secp256k1::PublicKey;
use bech32::u5;
use crate::de::Bolt11ParseError;
use secp256k1::PublicKey;
use bech32::u5;
- use bitcoin
_hashes::hex::FromHex
;
- use
bitcoin_hashes::sha256
;
+ use bitcoin
::hashes::sha256
;
+ use
std::str::FromStr
;
const CHARSET_REV: [i8; 128] = [
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
const CHARSET_REV: [i8; 128] = [
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@
-778,7
+778,7
@@
mod test {
"qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypq".as_bytes()
);
"qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypq".as_bytes()
);
- let hash = sha256::Hash::from_
hex
(
+ let hash = sha256::Hash::from_
str
(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap();
let expected = Ok(Sha256(hash));
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap();
let expected = Ok(Sha256(hash));
@@
-855,8
+855,8
@@
mod test {
use crate::Fallback;
use bech32::FromBase32;
use bitcoin::{PubkeyHash, ScriptHash};
use crate::Fallback;
use bech32::FromBase32;
use bitcoin::{PubkeyHash, ScriptHash};
- use bitcoin::
util::
address::WitnessVersion;
- use bitcoin
_
hashes::Hash;
+ use bitcoin::address::WitnessVersion;
+ use bitcoin
::
hashes::Hash;
let cases = vec![
(
let cases = vec![
(
@@
-988,7
+988,7
@@
mod test {
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec ! [
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec ! [
- PaymentHash(Sha256(sha256::Hash::from_
hex
(
+ PaymentHash(Sha256(sha256::Hash::from_
str
(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())).into(),
Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())).into(),
Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
@@
-1035,7
+1035,7
@@
mod test {
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec ! [
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec ! [
- PaymentHash(Sha256(sha256::Hash::from_
hex
(
+ PaymentHash(Sha256(sha256::Hash::from_
str
(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())).into(),
Description(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())).into(),
Description(