Skip to content

Commit 176d2ad

Browse files
arik-soarik-so
committed
Upgrade rust-bitcoin to 0.32.2.
1 parent 40b0400 commit 176d2ad

File tree

39 files changed

+184
-181
lines changed

39 files changed

+184
-181
lines changed

‎fuzz/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
2222
lightning-invoice = { path = "../lightning-invoice" }
2323
lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
2424
bech32 = "0.9.1"
25-
bitcoin = { version = "0.31.2", features = ["secp-lowmemory"] }
25+
bitcoin = { version = "0.32.2", features = ["secp-lowmemory"] }
2626

2727
afl = { version = "0.12", optional = true }
2828
honggfuzz = { version = "0.5", optional = true, default-features = false }

‎fuzz/src/chanmon_consistency.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
8181
use bitcoin::secp256k1::schnorr;
8282
use bitcoin::secp256k1::{self, Message, PublicKey, Scalar, Secp256k1, SecretKey};
8383

84+
use lightning::io::Cursor;
8485
use std::cmp::{self, Ordering};
85-
use std::io::Cursor;
8686
use std::mem;
8787
use std::sync::atomic;
8888
use std::sync::{Arc, Mutex};
@@ -154,7 +154,7 @@ impl BroadcasterInterface for TestBroadcaster {
154154

155155
pub struct VecWriter(pub Vec<u8>);
156156
impl Writer for VecWriter {
157-
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
157+
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::lightning::io::Error> {
158158
self.0.extend_from_slice(buf);
159159
Ok(())
160160
}
@@ -394,7 +394,7 @@ impl SignerProvider for KeyProvider {
394394
}
395395

396396
fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::EcdsaSigner, DecodeError> {
397-
let mut reader = std::io::Cursor::new(buffer);
397+
let mut reader = lightning::io::Cursor::new(buffer);
398398

399399
let inner: InMemorySigner = ReadableArgs::read(&mut reader, self)?;
400400
let state = self.make_enforcement_state_cell(inner.commitment_seed);

‎fuzz/src/chanmon_deser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ use lightning::util::test_utils::OnlyReadsKeysInterface;
1010

1111
use crate::utils::test_logger;
1212

13-
use std::io::Cursor;
13+
use lightning::io::Cursor;
1414

1515
struct VecWriter(Vec<u8>);
1616
impl Writer for VecWriter {
17-
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
17+
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::lightning::io::Error> {
1818
self.0.extend_from_slice(buf);
1919
Ok(())
2020
}

‎fuzz/src/full_stack.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ impl InputData {
121121
Some(&self.data[old_pos..old_pos + len])
122122
}
123123
}
124-
impl std::io::Read for &InputData {
125-
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
124+
impl lightning::io::Read for &InputData {
125+
fn read(&mut self, buf: &mut [u8]) -> lightning::io::Result<usize> {
126126
if let Some(sl) = self.get_slice(buf.len()) {
127127
buf.copy_from_slice(sl);
128128
Ok(buf.len())

‎fuzz/src/msg_targets/utils.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use lightning::util::ser::Writer;
1313
pub struct VecWriter(pub Vec<u8>);
1414
impl Writer for VecWriter {
15-
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
15+
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::lightning::io::Error> {
1616
self.0.extend_from_slice(buf);
1717
Ok(())
1818
}
@@ -31,7 +31,7 @@ impl Writer for VecWriter {
3131
macro_rules! test_msg {
3232
($MsgType: path, $data: ident) => {{
3333
use lightning::util::ser::{Readable, Writeable};
34-
let mut r = ::std::io::Cursor::new($data);
34+
let mut r = ::lightning::io::Cursor::new($data);
3535
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
3636
let p = r.position() as usize;
3737
let mut w = VecWriter(Vec::new());
@@ -50,13 +50,14 @@ macro_rules! test_msg {
5050
macro_rules! test_msg_simple {
5151
($MsgType: path, $data: ident) => {{
5252
use lightning::util::ser::{Readable, Writeable};
53-
let mut r = ::std::io::Cursor::new($data);
53+
let mut r = ::lightning::io::Cursor::new($data);
5454
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
5555
let mut w = VecWriter(Vec::new());
5656
msg.write(&mut w).unwrap();
5757
assert_eq!(msg.serialized_length(), w.0.len());
5858

59-
let msg = <$MsgType as Readable>::read(&mut ::std::io::Cursor::new(&w.0)).unwrap();
59+
let msg =
60+
<$MsgType as Readable>::read(&mut ::lightning::io::Cursor::new(&w.0)).unwrap();
6061
let mut w_two = VecWriter(Vec::new());
6162
msg.write(&mut w_two).unwrap();
6263
assert_eq!(&w.0[..], &w_two.0[..]);
@@ -70,7 +71,7 @@ macro_rules! test_msg_simple {
7071
macro_rules! test_msg_exact {
7172
($MsgType: path, $data: ident) => {{
7273
use lightning::util::ser::{Readable, Writeable};
73-
let mut r = ::std::io::Cursor::new($data);
74+
let mut r = ::lightning::io::Cursor::new($data);
7475
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
7576
let mut w = VecWriter(Vec::new());
7677
msg.write(&mut w).unwrap();
@@ -86,7 +87,7 @@ macro_rules! test_msg_exact {
8687
macro_rules! test_msg_hole {
8788
($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {{
8889
use lightning::util::ser::{Readable, Writeable};
89-
let mut r = ::std::io::Cursor::new($data);
90+
let mut r = ::lightning::io::Cursor::new($data);
9091
if let Ok(msg) = <$MsgType as Readable>::read(&mut r) {
9192
let mut w = VecWriter(Vec::new());
9293
msg.write(&mut w).unwrap();

‎fuzz/src/onion_hop_data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use lightning::util::test_utils;
1717
pub fn onion_hop_data_test<Out: test_logger::Output>(data: &[u8], _out: Out) {
1818
use bitcoin::secp256k1::PublicKey;
1919
use lightning::util::ser::ReadableArgs;
20-
let mut r = ::std::io::Cursor::new(data);
20+
let mut r = ::lightning::io::Cursor::new(data);
2121
let node_signer = test_utils::TestNodeSigner::new(test_utils::privkey(42));
2222
let _ = <lightning::ln::msgs::InboundOnionPayload as ReadableArgs<(
2323
Option<PublicKey>,
@@ -30,7 +30,7 @@ pub extern "C" fn onion_hop_data_run(data: *const u8, datalen: usize) {
3030
use bitcoin::secp256k1::PublicKey;
3131
use lightning::util::ser::ReadableArgs;
3232
let data = unsafe { std::slice::from_raw_parts(data, datalen) };
33-
let mut r = ::std::io::Cursor::new(data);
33+
let mut r = ::lightning::io::Cursor::new(data);
3434
let node_signer = test_utils::TestNodeSigner::new(test_utils::privkey(42));
3535
let _ = <lightning::ln::msgs::InboundOnionPayload as ReadableArgs<(
3636
Option<PublicKey>,

‎fuzz/src/onion_message.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use lightning_invoice::RawBolt11Invoice;
3030

3131
use crate::utils::test_logger;
3232

33-
use std::io::{self, Cursor};
33+
use lightning::io::{self, Cursor};
3434
use std::sync::atomic::{AtomicU64, Ordering};
3535

3636
#[inline]
@@ -168,7 +168,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
168168
&self, _message_type: u64, buffer: &mut R,
169169
) -> Result<Option<Self::CustomMessage>, msgs::DecodeError> {
170170
let mut buf = Vec::new();
171-
buffer.read_to_end(&mut buf)?;
171+
buffer.read_to_limit(&mut buf, u64::MAX)?;
172172
return Ok(Some(TestCustomMessage {}));
173173
}
174174
fn release_pending_custom_messages(&self) -> Vec<PendingOnionMessage<Self::CustomMessage>> {
@@ -178,7 +178,7 @@ impl CustomOnionMessageHandler for TestCustomMessageHandler {
178178

179179
pub struct VecWriter(pub Vec<u8>);
180180
impl Writer for VecWriter {
181-
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::std::io::Error> {
181+
fn write_all(&mut self, buf: &[u8]) -> Result<(), ::lightning::io::Error> {
182182
self.0.extend_from_slice(buf);
183183
Ok(())
184184
}

‎fuzz/src/router.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
146146

147147
macro_rules! decode_msg {
148148
($MsgType: path, $len: expr) => {{
149-
let mut reader = ::std::io::Cursor::new(get_slice!($len));
149+
let mut reader = ::lightning::io::Cursor::new(get_slice!($len));
150150
match <$MsgType>::read(&mut reader) {
151151
Ok(msg) => {
152152
assert_eq!(reader.position(), $len as u64);

‎lightning-background-processor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ rustdoc-args = ["--cfg", "docsrs"]
1616
[features]
1717
futures = [ ]
1818
std = ["bitcoin/std", "lightning/std", "lightning-rapid-gossip-sync/std"]
19-
no-std = ["bitcoin/no-std", "lightning/no-std", "lightning-rapid-gossip-sync/no-std"]
19+
no-std = ["lightning/no-std", "lightning-rapid-gossip-sync/no-std"]
2020

2121
default = ["std"]
2222

2323
[dependencies]
24-
bitcoin = { version = "0.31.2", default-features = false }
24+
bitcoin = { version = "0.32.2", default-features = false }
2525
lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false }
2626
lightning-rapid-gossip-sync = { version = "0.0.123-beta", path = "../lightning-rapid-gossip-sync", default-features = false }
2727

‎lightning-background-processor/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,7 +1326,7 @@ mod tests {
13261326
&& key == CHANNEL_MANAGER_PERSISTENCE_KEY
13271327
{
13281328
if let Some((error, message)) = self.manager_error {
1329-
return Err(std::io::Error::new(error, message));
1329+
return Err(std::io::Error::new(error, message).into());
13301330
}
13311331
}
13321332

@@ -1344,7 +1344,7 @@ mod tests {
13441344
};
13451345

13461346
if let Some((error, message)) = self.graph_error {
1347-
return Err(std::io::Error::new(error, message));
1347+
return Err(std::io::Error::new(error, message).into());
13481348
}
13491349
}
13501350

@@ -1353,7 +1353,7 @@ mod tests {
13531353
&& key == SCORER_PERSISTENCE_KEY
13541354
{
13551355
if let Some((error, message)) = self.scorer_error {
1356-
return Err(std::io::Error::new(error, message));
1356+
return Err(std::io::Error::new(error, message).into());
13571357
}
13581358
}
13591359

@@ -2002,7 +2002,7 @@ mod tests {
20022002
match bp_future.await {
20032003
Ok(_) => panic!("Expected error persisting manager"),
20042004
Err(e) => {
2005-
assert_eq!(e.kind(), std::io::ErrorKind::Other);
2005+
assert_eq!(e.kind(), lightning::io::ErrorKind::Other);
20062006
assert_eq!(e.get_ref().unwrap().to_string(), "test");
20072007
},
20082008
}

‎lightning-block-sync/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rest-client = [ "serde_json", "chunked_transfer" ]
1818
rpc-client = [ "serde_json", "chunked_transfer" ]
1919

2020
[dependencies]
21-
bitcoin = "0.31.2"
21+
bitcoin = "0.32.2"
2222
lightning = { version = "0.0.123-beta", path = "../lightning" }
2323
tokio = { version = "1.35", features = [ "io-util", "net", "time", "rt" ], optional = true }
2424
serde_json = { version = "1.0", optional = true }

‎lightning-block-sync/src/convert.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,7 @@ pub(crate) mod tests {
622622
match TryInto::<Txid>::try_into(response) {
623623
Err(e) => {
624624
assert_eq!(e.kind(), io::ErrorKind::InvalidData);
625-
assert_eq!(
626-
e.get_ref().unwrap().to_string(),
627-
"bad hex string length 6 (expected 64)"
628-
);
625+
assert_eq!(e.get_ref().unwrap().to_string(), "failed to parse hex");
629626
},
630627
Ok(_) => panic!("Expected error"),
631628
}
@@ -637,10 +634,7 @@ pub(crate) mod tests {
637634
match TryInto::<Txid>::try_into(response) {
638635
Err(e) => {
639636
assert_eq!(e.kind(), io::ErrorKind::InvalidData);
640-
assert_eq!(
641-
e.get_ref().unwrap().to_string(),
642-
"bad hex string length 4 (expected 64)"
643-
);
637+
assert_eq!(e.get_ref().unwrap().to_string(), "failed to parse hex");
644638
},
645639
Ok(_) => panic!("Expected error"),
646640
}

‎lightning-block-sync/src/init.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ where
5959
///
6060
/// use lightning_block_sync::*;
6161
///
62-
/// use std::io::Cursor;
62+
/// use lightning::io::Cursor;
6363
///
6464
/// async fn init_sync<
6565
/// B: BlockSource,

‎lightning-block-sync/src/utils.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ pub fn hex_to_work(hex: &str) -> Result<Work, HexToArrayError> {
99
#[cfg(test)]
1010
mod tests {
1111
use super::*;
12-
use bitcoin::hex::HexToBytesError;
1312
use bitcoin::pow::Work;
1413

1514
#[test]
@@ -20,31 +19,25 @@ mod tests {
2019
#[test]
2120
fn hex_to_work_too_short_str() {
2221
let hex = String::from_utf8(vec![b'0'; 32]).unwrap();
23-
assert_eq!(hex_to_work(&hex), Err(HexToArrayError::InvalidLength(32, 64)));
22+
assert!(hex_to_work(&hex).is_err());
2423
}
2524

2625
#[test]
2726
fn hex_to_work_too_long_str() {
2827
let hex = String::from_utf8(vec![b'0'; 128]).unwrap();
29-
assert_eq!(hex_to_work(&hex), Err(HexToArrayError::InvalidLength(128, 64)));
28+
assert!(hex_to_work(&hex).is_err());
3029
}
3130

3231
#[test]
3332
fn hex_to_work_odd_length_str() {
3433
let hex = String::from_utf8(vec![b'0'; 65]).unwrap();
35-
assert_eq!(
36-
hex_to_work(&hex),
37-
Err(HexToArrayError::Conversion(HexToBytesError::OddLengthString(65)))
38-
);
34+
assert!(hex_to_work(&hex).is_err());
3935
}
4036

4137
#[test]
4238
fn hex_to_work_invalid_char() {
4339
let hex = String::from_utf8(vec![b'G'; 64]).unwrap();
44-
assert_eq!(
45-
hex_to_work(&hex),
46-
Err(HexToArrayError::Conversion(HexToBytesError::InvalidChar(b'G')))
47-
);
40+
assert!(hex_to_work(&hex).is_err());
4841
}
4942

5043
#[test]

‎lightning-custom-message/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ all-features = true
1414
rustdoc-args = ["--cfg", "docsrs"]
1515

1616
[dependencies]
17-
bitcoin = "0.31.2"
17+
bitcoin = "0.32.2"
1818
lightning = { version = "0.0.123-beta", path = "../lightning" }
1919

2020
[lints]

‎lightning-invoice/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ rustdoc-args = ["--cfg", "docsrs"]
1616

1717
[features]
1818
default = ["std"]
19-
no-std = ["bitcoin/no-std"]
20-
std = ["bitcoin/std", "bech32/std"]
19+
no-std = []
20+
std = ["bech32/std"]
2121

2222
[dependencies]
2323
bech32 = { version = "0.9.1", default-features = false }
2424
lightning-types = { version = "0.1", path = "../lightning-types", default-features = false }
25-
secp256k1 = { version = "0.28.0", default-features = false, features = ["recovery", "alloc"] }
25+
secp256k1 = { version = "0.29.0", default-features = false, features = ["recovery", "alloc"] }
2626
serde = { version = "1.0.118", optional = true }
27-
bitcoin = { version = "0.31.2", default-features = false }
27+
bitcoin = { version = "0.32.2", default-features = false }
2828

2929
[dev-dependencies]
3030
serde_json = { version = "1"}

‎lightning-invoice/src/lib.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ use std::time::SystemTime;
3939

4040
use bech32::{FromBase32, u5};
4141
use bitcoin::{Address, Network, PubkeyHash, ScriptHash, WitnessProgram, WitnessVersion};
42-
use bitcoin::address::Payload;
4342
use bitcoin::hashes::{Hash, sha256};
4443
use lightning_types::features::Bolt11InvoiceFeatures;
4544

@@ -1434,22 +1433,22 @@ impl Bolt11Invoice {
14341433
/// Returns a list of all fallback addresses as [`Address`]es
14351434
pub fn fallback_addresses(&self) -> Vec<Address> {
14361435
self.fallbacks().iter().filter_map(|fallback| {
1437-
let payload = match fallback {
1436+
let address = match fallback {
14381437
Fallback::SegWitProgram { version, program } => {
1439-
match WitnessProgram::new(*version, program.clone()) {
1440-
Ok(witness_program) => Payload::WitnessProgram(witness_program),
1438+
match WitnessProgram::new(*version, &program) {
1439+
Ok(witness_program) => Address::from_witness_program(witness_program, self.network()),
14411440
Err(_) => return None,
14421441
}
14431442
}
14441443
Fallback::PubKeyHash(pkh) => {
1445-
Payload::PubkeyHash(*pkh)
1444+
Address::p2pkh(*pkh, self.network())
14461445
}
14471446
Fallback::ScriptHash(sh) => {
1448-
Payload::ScriptHash(*sh)
1447+
Address::p2sh_from_hash(*sh, self.network())
14491448
}
14501449
};
14511450

1452-
Some(Address::new(self.network(), payload))
1451+
Some(address)
14531452
}).collect()
14541453
}
14551454

‎lightning-net-tokio/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ all-features = true
1515
rustdoc-args = ["--cfg", "docsrs"]
1616

1717
[dependencies]
18-
bitcoin = "0.31.2"
18+
bitcoin = "0.32.2"
1919
lightning = { version = "0.0.123-beta", path = "../lightning" }
2020
tokio = { version = "1.35", features = [ "rt", "sync", "net", "time" ] }
2121

‎lightning-persister/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ all-features = true
1414
rustdoc-args = ["--cfg", "docsrs"]
1515

1616
[dependencies]
17-
bitcoin = "0.31.2"
17+
bitcoin = "0.32.2"
1818
lightning = { version = "0.0.123-beta", path = "../lightning" }
1919

2020
[target.'cfg(windows)'.dependencies]
@@ -25,7 +25,7 @@ criterion = { version = "0.4", optional = true, default-features = false }
2525

2626
[dev-dependencies]
2727
lightning = { version = "0.0.123-beta", path = "../lightning", features = ["_test_utils"] }
28-
bitcoin = { version = "0.31.2", default-features = false }
28+
bitcoin = { version = "0.32.2", default-features = false }
2929

3030
[lints]
3131
workspace = true

0 commit comments

Comments
 (0)