f - Clean up imports

Author: jkczyz

lightning-invoice/Cargo.toml

@@ -13,7 +13,6 @@ bech32 = "0.8"
 lightning = { version = "0.0.100", path = "../lightning" }
 secp256k1 = { version = "0.20", features = ["recovery"] }
 num-traits = "0.2.8"
-bitcoin = "0.27"
 bitcoin_hashes = "0.10"
 
 [dev-dependencies]

lightning-invoice/src/lib.rs

@@ -19,7 +19,6 @@ pub mod payment;
 pub mod utils;
 
 extern crate bech32;
-extern crate bitcoin;
 extern crate bitcoin_hashes;
 #[macro_use] extern crate lightning;
 extern crate num_traits;

lightning-invoice/src/payment.rs

@@ -99,9 +99,8 @@
 
 use crate::Invoice;
 
-use bitcoin::hashes::Hash;
-use bitcoin::hashes::sha256::Hash as Sha256;
-use bitcoin::secp256k1::key::PublicKey;
+use bitcoin_hashes::Hash;
+use bitcoin_hashes::sha256::Hash as Sha256;
 
 use lightning::ln::{PaymentHash, PaymentSecret};
 use lightning::ln::channelmanager::{ChannelDetails, PaymentSendFailure};
@@ -111,6 +110,8 @@ use lightning::routing::router::{Route, RouteHint};
 use lightning::util::events::{Event, EventHandler};
 use lightning::util::logger::Logger;
 
+use secp256k1::key::PublicKey;
+
 use std::collections::hash_map::{self, HashMap};
 use std::ops::Deref;
 use std::sync::Mutex;
@@ -303,15 +304,14 @@ where
 
 #[cfg(test)]
 mod tests {
-
 	use super::*;
 	use crate::{InvoiceBuilder, Currency};
-	use bitcoin::secp256k1::{SecretKey, PublicKey, Secp256k1};
 	use lightning::ln::PaymentPreimage;
 	use lightning::ln::msgs::{ErrorAction, LightningError};
 	use lightning::util::test_utils::TestLogger;
-	use lightning::util::events::Event;
 	use lightning::util::errors::APIError;
+	use lightning::util::events::Event;
+	use secp256k1::{SecretKey, PublicKey, Secp256k1};
 
 	fn invoice(payment_preimage: PaymentPreimage) -> Invoice {
 		let payment_hash = Sha256::hash(&payment_preimage.0);