projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BDR: Linearizing secp256k1 deps
[rust-lightning]
/
lightning
/
src
/
ln
/
channelmonitor.rs
diff --git
a/lightning/src/ln/channelmonitor.rs
b/lightning/src/ln/channelmonitor.rs
index 86a8591ebbac518079e7209b1ad2bd2bfe4794a4..6bddd302ffc64163e2fb76944bc60df7b76f7764 100644
(file)
--- a/
lightning/src/ln/channelmonitor.rs
+++ b/
lightning/src/ln/channelmonitor.rs
@@
-24,9
+24,9
@@
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::hash160::Hash as Hash160;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
use bitcoin::hashes::hash160::Hash as Hash160;
use bitcoin::hashes::sha256d::Hash as Sha256dHash;
-use secp256k1::{Secp256k1,Signature};
-use secp256k1::key::{SecretKey,PublicKey};
-use secp256k1;
+use
bitcoin::
secp256k1::{Secp256k1,Signature};
+use
bitcoin::
secp256k1::key::{SecretKey,PublicKey};
+use
bitcoin::
secp256k1;
use ln::msgs::DecodeError;
use ln::chan_utils;
use ln::msgs::DecodeError;
use ln::chan_utils;
@@
-2530,8
+2530,8
@@
mod tests {
use ln::chan_utils;
use ln::chan_utils::{HTLCOutputInCommitment, LocalCommitmentTransaction};
use util::test_utils::TestLogger;
use ln::chan_utils;
use ln::chan_utils::{HTLCOutputInCommitment, LocalCommitmentTransaction};
use util::test_utils::TestLogger;
- use secp256k1::key::{SecretKey,PublicKey};
- use secp256k1::Secp256k1;
+ use
bitcoin::
secp256k1::key::{SecretKey,PublicKey};
+ use
bitcoin::
secp256k1::Secp256k1;
use rand::{thread_rng,Rng};
use std::sync::Arc;
use chain::keysinterface::InMemoryChannelKeys;
use rand::{thread_rng,Rng};
use std::sync::Arc;
use chain::keysinterface::InMemoryChannelKeys;