Add PaymentSuccessful / PaymentFailed events

Author: tnull

src/event.rs

@@ -11,10 +11,11 @@ use crate::logger::{
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
 use lightning::chain::keysinterface::KeysManager;
+use lightning::ln::PaymentHash;
 use lightning::routing::gossip::NodeId;
 use lightning::util::events as ldk_events;
 use lightning::util::persist::KVStorePersister;
-use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
+use lightning::util::ser::{MaybeReadable, Readable, ReadableArgs, Writeable, Writer};
 
 use bitcoin::secp256k1::Secp256k1;
 use rand::{thread_rng, Rng};
@@ -29,28 +30,65 @@ pub(crate) const EVENTS_PERSISTENCE_KEY: &str = "events";
 /// An LdkLiteEvent that should be handled by the user.
 #[derive(Debug, Clone)]
 pub enum LdkLiteEvent {
-	/// asdf
-	Test,
+	/// A payment we sent was successful.
+	PaymentSuccessful {
+		/// The hash of the payment.
+		payment_hash: PaymentHash,
+		/// The wrapped LDK event.
+		inner: ldk_events::Event,
+	},
+	/// A payment we sent has failed.
+	PaymentFailed {
+		/// The hash of the payment.
+		payment_hash: PaymentHash,
+		/// The wrapped LDK event.
+		inner: ldk_events::Event,
+	},
+	//PaymentReceived {
+	//},
+	//ChannelOpened {
+	//},
+	//ChannelClosed {
+	//},
+	//OnChainPaymentReceived {
+	//},
+	//OnChainPaymentReceived {
+	//},
 }
 
 impl Readable for LdkLiteEvent {
 	fn read<R: lightning::io::Read>(
 		reader: &mut R,
 	) -> Result<Self, lightning::ln::msgs::DecodeError> {
 		match Readable::read(reader)? {
-			// TODO
-			0u8 => Ok(LdkLiteEvent::Test),
-			_ => Ok(LdkLiteEvent::Test),
+			0u8 => {
+				let payment_hash: PaymentHash = Readable::read(reader)?;
+				let inner: ldk_events::Event = MaybeReadable::read(reader)?.unwrap();
+				Ok(Self::PaymentSuccessful { payment_hash, inner })
+			}
+			1u8 => {
+				let payment_hash: PaymentHash = Readable::read(reader)?;
+				let inner: ldk_events::Event = MaybeReadable::read(reader)?.unwrap();
+				Ok(Self::PaymentFailed { payment_hash, inner })
+			}
+			_ => Err(lightning::ln::msgs::DecodeError::InvalidValue),
 		}
 	}
 }
 
 impl Writeable for LdkLiteEvent {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), lightning::io::Error> {
 		match self {
-			Test => {
-				// TODO
+			Self::PaymentSuccessful { payment_hash, inner } => {
 				0u8.write(writer)?;
+				payment_hash.write(writer)?;
+				inner.write(writer)?;
+				Ok(())
+			}
+			Self::PaymentFailed { payment_hash, inner } => {
+				1u8.write(writer)?;
+				payment_hash.write(writer)?;
+				inner.write(writer)?;
 				Ok(())
 			}
 		}
@@ -285,6 +323,10 @@ impl ldk_events::EventHandler for LdkLiteEventHandler {
 						);
 					}
 				}
+				self.event_queue.add_event(LdkLiteEvent::PaymentSuccessful {
+					payment_hash: *payment_hash,
+					inner: event.clone(),
+				}).unwrap();
 			}
 			ldk_events::Event::PaymentFailed { payment_hash, .. } => {
 				log_info!(