f LDK: Account for types being moved to lightning-types

Author: tnull

Cargo.toml

@@ -29,6 +29,7 @@ default = []
 
 [dependencies]
 lightning = { version = "0.1.0-beta1", features = ["std"] }
+lightning-types = { version = "0.2.0-beta1" }
 lightning-invoice = { version = "0.33.0-beta1" }
 lightning-net-tokio = { version = "0.1.0-beta1" }
 lightning-persister = { version = "0.1.0-beta1" }
@@ -39,6 +40,7 @@ lightning-transaction-sync = { version = "0.1.0-beta1", features = ["esplora-asy
 lightning-liquidity = { version = "0.1.0-beta1", features = ["std"] }
 
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std"] }
+#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
@@ -48,6 +50,7 @@ lightning-liquidity = { version = "0.1.0-beta1", features = ["std"] }
 #lightning-liquidity = { git = "https://github.com/lightningdevkit/lightning-liquidity", branch="main", features = ["std"] }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["std"] }
+#lightning-types = { path = "../rust-lightning/lightning-types" }
 #lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
 #lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
 #lightning-persister = { path = "../rust-lightning/lightning-persister" }

src/balance.rs

@@ -10,9 +10,10 @@ use crate::sweep::value_from_descriptor;
 use lightning::chain::channelmonitor::Balance as LdkBalance;
 use lightning::chain::channelmonitor::BalanceSource;
 use lightning::ln::types::ChannelId;
-use lightning::ln::{PaymentHash, PaymentPreimage};
 use lightning::util::sweep::{OutputSpendStatus, TrackedSpendableOutput};
 
+use lightning_types::payment::{PaymentHash, PaymentPreimage};
+
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::{BlockHash, Txid};
 

src/event.rs

@@ -32,11 +32,12 @@ use lightning::events::{Event as LdkEvent, PaymentFailureReason};
 use lightning::impl_writeable_tlv_based_enum;
 use lightning::ln::channelmanager::PaymentId;
 use lightning::ln::types::ChannelId;
-use lightning::ln::{PaymentHash, PaymentPreimage};
 use lightning::routing::gossip::NodeId;
 use lightning::util::errors::APIError;
 use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 
+use lightning_types::payment::{PaymentHash, PaymentPreimage};
+
 use lightning_liquidity::lsps2::utils::compute_opening_fee;
 
 use bitcoin::blockdata::locktime::absolute::LockTime;

src/lib.rs

@@ -100,6 +100,7 @@ pub use bip39;
 pub use bitcoin;
 pub use lightning;
 pub use lightning_invoice;
+pub use lightning_types;
 pub use vss_client;
 
 pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};

src/message_handler.rs

@@ -7,11 +7,12 @@
 
 use crate::liquidity::LiquiditySource;
 
-use lightning::ln::features::{InitFeatures, NodeFeatures};
 use lightning::ln::peer_handler::CustomMessageHandler;
 use lightning::ln::wire::CustomMessageReader;
 use lightning::util::logger::Logger;
 
+use lightning_types::features::{InitFeatures, NodeFeatures};
+
 use lightning_liquidity::lsps0::ser::RawLSPSMessage;
 
 use bitcoin::secp256k1::PublicKey;

src/payment/bolt11.rs

@@ -22,15 +22,16 @@ use crate::payment::SendingParameters;
 use crate::peer_store::{PeerInfo, PeerStore};
 use crate::types::{ChannelManager, KeysManager};
 
+use lightning::ln::bolt11_payment;
 use lightning::ln::channelmanager::{PaymentId, RecipientOnionFields, Retry, RetryableSendFailure};
 use lightning::ln::invoice_utils::{
 	create_invoice_from_channelmanager_and_duration_since_epoch,
 	create_invoice_from_channelmanager_and_duration_since_epoch_with_payment_hash,
 };
-use lightning::ln::{PaymentHash, PaymentPreimage};
 use lightning::routing::router::{PaymentParameters, RouteParameters};
 
-use lightning::ln::bolt11_payment;
+use lightning_types::payment::{PaymentHash, PaymentPreimage};
+
 use lightning_invoice::{Bolt11Invoice, Currency};
 
 use bitcoin::hashes::sha256::Hash as Sha256;

src/payment/spontaneous.rs

@@ -17,10 +17,11 @@ use crate::payment::SendingParameters;
 use crate::types::{ChannelManager, CustomTlvRecord, KeysManager};
 
 use lightning::ln::channelmanager::{PaymentId, RecipientOnionFields, Retry, RetryableSendFailure};
-use lightning::ln::{PaymentHash, PaymentPreimage};
 use lightning::routing::router::{PaymentParameters, RouteParameters};
 use lightning::sign::EntropySource;
 
+use lightning_types::payment::{PaymentHash, PaymentPreimage};
+
 use bitcoin::secp256k1::PublicKey;
 
 use std::sync::{Arc, RwLock};

src/payment/store.rs

@@ -15,7 +15,6 @@ use crate::Error;
 
 use lightning::ln::channelmanager::PaymentId;
 use lightning::ln::msgs::DecodeError;
-use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning::offers::offer::OfferId;
 use lightning::util::ser::{Readable, Writeable};
 use lightning::util::string::UntrustedString;
@@ -24,6 +23,8 @@ use lightning::{
 	impl_writeable_tlv_based_enum, write_tlv_fields,
 };
 
+use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
+
 use std::collections::HashMap;
 use std::iter::FromIterator;
 use std::ops::Deref;

src/uniffi_types.rs

@@ -20,13 +20,15 @@ pub use crate::types::CustomTlvRecord;
 
 pub use lightning::chain::channelmonitor::BalanceSource;
 pub use lightning::events::{ClosureReason, PaymentFailureReason};
-pub use lightning::ln::types::{ChannelId, PaymentHash, PaymentPreimage, PaymentSecret};
+pub use lightning::ln::types::ChannelId;
 pub use lightning::offers::invoice::Bolt12Invoice;
 pub use lightning::offers::offer::{Offer, OfferId};
 pub use lightning::offers::refund::Refund;
 pub use lightning::routing::gossip::{NodeAlias, NodeId, RoutingFees};
 pub use lightning::util::string::UntrustedString;
 
+pub use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
+
 pub use lightning_invoice::Bolt11Invoice;
 
 pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

tests/common/mod.rs

@@ -17,10 +17,12 @@ use ldk_node::{
 };
 
 use lightning::ln::msgs::SocketAddress;
-use lightning::ln::{PaymentHash, PaymentPreimage};
 use lightning::routing::gossip::NodeAlias;
 use lightning::util::persist::KVStore;
 use lightning::util::test_utils::TestStore;
+
+use lightning_types::payment::{PaymentHash, PaymentPreimage};
+
 use lightning_persister::fs_store::FilesystemStore;
 
 use bitcoin::hashes::sha256::Hash as Sha256;