Skip to content

Commit 75eef02

Browse files
devrandomdevrandom
committed
bitcoin 0.28.0 - keys
1 parent 6176e2f commit 75eef02

33 files changed

+78
-80
lines changed

‎fuzz/src/chanmon_consistency.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use lightning::routing::router::{Route, RouteHop};
5353
use utils::test_logger::{self, Output};
5454
use utils::test_persister::TestPersister;
5555

56-
use bitcoin::secp256k1::key::{PublicKey,SecretKey};
56+
use bitcoin::secp256k1::{PublicKey,SecretKey};
5757
use bitcoin::secp256k1::recovery::RecoverableSignature;
5858
use bitcoin::secp256k1::Secp256k1;
5959

‎fuzz/src/full_stack.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use lightning::util::ser::ReadableArgs;
5050
use utils::test_logger;
5151
use utils::test_persister::TestPersister;
5252

53-
use bitcoin::secp256k1::key::{PublicKey,SecretKey};
53+
use bitcoin::secp256k1::{PublicKey,SecretKey};
5454
use bitcoin::secp256k1::recovery::RecoverableSignature;
5555
use bitcoin::secp256k1::Secp256k1;
5656

‎fuzz/src/peer_crypt.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
use lightning::ln::peer_channel_encryptor::PeerChannelEncryptor;
1111

12-
use bitcoin::secp256k1::key::{PublicKey,SecretKey};
12+
use bitcoin::secp256k1::{PublicKey,SecretKey};
1313

1414
use utils::test_logger;
1515

‎fuzz/src/router.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use lightning::util::ser::Readable;
2323
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
2424

2525
use bitcoin::hashes::Hash;
26-
use bitcoin::secp256k1::key::PublicKey;
26+
use bitcoin::secp256k1::PublicKey;
2727
use bitcoin::network::constants::Network;
2828
use bitcoin::blockdata::constants::genesis_block;
2929

‎lightning-invoice/src/de.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use num_traits::{CheckedAdd, CheckedMul};
2020

2121
use secp256k1;
2222
use secp256k1::recovery::{RecoveryId, RecoverableSignature};
23-
use secp256k1::key::PublicKey;
23+
use secp256k1::PublicKey;
2424

2525
use super::{Invoice, Sha256, TaggedField, ExpiryTime, MinFinalCltvExpiry, Fallback, PayeePubKey, InvoiceSignature, PositiveTimestamp,
2626
SemanticError, PrivateRoute, Description, RawTaggedField, Currency, RawHrp, SiPrefix, RawInvoice, constants, SignedRawInvoice,

‎lightning-invoice/src/lib.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use lightning::routing::network_graph::RoutingFees;
4747
use lightning::routing::router::RouteHint;
4848
use lightning::util::invoice::construct_invoice_preimage;
4949

50-
use secp256k1::key::PublicKey;
50+
use secp256k1::PublicKey;
5151
use secp256k1::{Message, Secp256k1};
5252
use secp256k1::recovery::RecoverableSignature;
5353

@@ -123,7 +123,7 @@ pub const DEFAULT_MIN_FINAL_CLTV_EXPIRY: u64 = 18;
123123
/// use bitcoin_hashes::sha256;
124124
///
125125
/// use secp256k1::Secp256k1;
126-
/// use secp256k1::key::SecretKey;
126+
/// use secp256k1::SecretKey;
127127
///
128128
/// use lightning::ln::PaymentSecret;
129129
///
@@ -1537,7 +1537,7 @@ mod test {
15371537
use TaggedField::*;
15381538
use secp256k1::Secp256k1;
15391539
use secp256k1::recovery::{RecoveryId, RecoverableSignature};
1540-
use secp256k1::key::{SecretKey, PublicKey};
1540+
use secp256k1::{SecretKey, PublicKey};
15411541
use {SignedRawInvoice, InvoiceSignature, RawInvoice, RawHrp, RawDataPart, Currency, Sha256,
15421542
PositiveTimestamp};
15431543

@@ -1606,7 +1606,7 @@ mod test {
16061606
use TaggedField::*;
16071607
use lightning::ln::features::InvoiceFeatures;
16081608
use secp256k1::Secp256k1;
1609-
use secp256k1::key::SecretKey;
1609+
use secp256k1::SecretKey;
16101610
use {RawInvoice, RawHrp, RawDataPart, Currency, Sha256, PositiveTimestamp, Invoice,
16111611
SemanticError};
16121612

@@ -1724,7 +1724,7 @@ mod test {
17241724
use ::*;
17251725
use lightning::routing::router::RouteHintHop;
17261726
use std::iter::FromIterator;
1727-
use secp256k1::key::PublicKey;
1727+
use secp256k1::PublicKey;
17281728

17291729
let builder = InvoiceBuilder::new(Currency::Bitcoin)
17301730
.payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
@@ -1778,7 +1778,7 @@ mod test {
17781778
use ::*;
17791779
use lightning::routing::router::RouteHintHop;
17801780
use secp256k1::Secp256k1;
1781-
use secp256k1::key::{SecretKey, PublicKey};
1781+
use secp256k1::{SecretKey, PublicKey};
17821782
use std::time::{UNIX_EPOCH, Duration};
17831783

17841784
let secp_ctx = Secp256k1::new();
@@ -1892,7 +1892,7 @@ mod test {
18921892
fn test_default_values() {
18931893
use ::*;
18941894
use secp256k1::Secp256k1;
1895-
use secp256k1::key::SecretKey;
1895+
use secp256k1::SecretKey;
18961896

18971897
let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
18981898
.description("Test".into())
@@ -1918,7 +1918,7 @@ mod test {
19181918
fn test_expiration() {
19191919
use ::*;
19201920
use secp256k1::Secp256k1;
1921-
use secp256k1::key::SecretKey;
1921+
use secp256k1::SecretKey;
19221922

19231923
let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
19241924
.description("Test".into())

‎lightning-invoice/src/payment.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
//! # use lightning::util::ser::{Writeable, Writer};
4747
//! # use lightning_invoice::Invoice;
4848
//! # use lightning_invoice::payment::{InvoicePayer, Payer, RetryAttempts, Router};
49-
//! # use secp256k1::key::PublicKey;
49+
//! # use secp256k1::PublicKey;
5050
//! # use std::cell::RefCell;
5151
//! # use std::ops::Deref;
5252
//! #
@@ -148,7 +148,7 @@ use lightning::util::events::{Event, EventHandler};
148148
use lightning::util::logger::Logger;
149149
use crate::sync::Mutex;
150150

151-
use secp256k1::key::PublicKey;
151+
use secp256k1::PublicKey;
152152

153153
use core::ops::Deref;
154154
use core::time::Duration;

‎lightning-invoice/src/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use lightning::routing::scoring::Score;
1818
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
1919
use lightning::routing::router::{Route, RouteHint, RouteHintHop, RouteParameters, find_route};
2020
use lightning::util::logger::Logger;
21-
use secp256k1::key::PublicKey;
21+
use secp256k1::PublicKey;
2222
use core::convert::TryInto;
2323
use core::ops::Deref;
2424
use core::time::Duration;

‎lightning-net-tokio/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//! # Example
2424
//! ```
2525
//! use std::net::TcpStream;
26-
//! use bitcoin::secp256k1::key::PublicKey;
26+
//! use bitcoin::secp256k1::PublicKey;
2727
//! use lightning::util::events::{Event, EventHandler, EventsProvider};
2828
//! use std::net::SocketAddr;
2929
//! use std::sync::Arc;
@@ -71,7 +71,7 @@
7171

7272
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
7373

74-
use bitcoin::secp256k1::key::PublicKey;
74+
use bitcoin::secp256k1::PublicKey;
7575

7676
use tokio::net::TcpStream;
7777
use tokio::{io, time};

‎lightning/Cargo.toml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ grind_signatures = []
3838
default = ["std", "grind_signatures"]
3939

4040
[dependencies]
41-
bitcoin = { version = "0.27", default-features = false, features = ["secp-recovery"] }
42-
# TODO remove this once rust-bitcoin PR #637 is released
43-
secp256k1 = { version = "0.20.2", default-features = false, features = ["alloc"] }
41+
bitcoin = { version = "0.28.0-rc.1", default-features = false, features = ["secp-recovery"] }
4442

4543
hashbrown = { version = "0.11", optional = true }
4644
hex = { version = "0.4", optional = true }
@@ -52,10 +50,8 @@ core2 = { version = "0.3.0", optional = true, default-features = false }
5250
[dev-dependencies]
5351
hex = "0.4"
5452
regex = "0.2.11"
55-
# TODO remove this once rust-bitcoin PR #637 is released
56-
secp256k1 = { version = "0.20.2", default-features = false, features = ["alloc"] }
5753

5854
[dev-dependencies.bitcoin]
59-
version = "0.27"
55+
version = "0.28.0-rc.1"
6056
default-features = false
6157
features = ["bitcoinconsensus", "secp-recovery"]

0 commit comments

Comments
 (0)