X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Futil%2Fevents.rs;h=b090fba40e499cf4250ff4b9a47a24edc3a9219d;hb=ac941e19c96b59c4da75227403816d8377ab5ef7;hp=db4769067e35ba95b5c0a1d5038c9de3b7d60378;hpb=4fbe0c90b8d535e407bd8a3021a80ab0bf0dc06e;p=rust-lightning

diff --git a/src/util/events.rs b/src/util/events.rs
index db476906..b090fba4 100644
--- a/src/util/events.rs
+++ b/src/util/events.rs
@@ -1,8 +1,7 @@
 use ln::msgs;
+use chain::transaction::OutPoint;
 
 use bitcoin::blockdata::script::Script;
-use bitcoin::util::uint::Uint256;
-use bitcoin::util::hash::Sha256dHash;
 
 use secp256k1::key::PublicKey;
 
@@ -14,7 +13,7 @@ pub enum Event {
 	/// parameters and then call ChannelManager::funding_transaction_generated.
 	/// Generated in ChannelManager message handling.
 	FundingGenerationReady {
-		temporary_channel_id: Uint256,
+		temporary_channel_id: [u8; 32],
 		channel_value_satoshis: u64,
 		output_script: Script,
 		/// The value passed in to ChannelManager::create_channel
@@ -24,7 +23,7 @@ pub enum Event {
 	/// channel. Broadcasting such a transaction prior to this event may lead to our counterparty
 	/// trivially stealing all funds in the funding transaction!
 	FundingBroadcastSafe {
-		funding_txo: (Sha256dHash, u16),
+		funding_txo: OutPoint,
 		/// The value passed in to ChannelManager::create_channel
 		user_channel_id: u64,
 	},
@@ -54,6 +53,12 @@ pub enum Event {
 	PendingHTLCsForwardable {
 		time_forwardable: Instant,
 	},
+	/// Used to indicate that we've initialted a channel open and should send the open_channel
+	/// message provided to the given peer
+	SendOpenChannel {
+		node_id: PublicKey,
+		msg: msgs::OpenChannel,
+	},
 	/// Used to indicate that a funding_created message should be sent to the peer with the given node_id.
 	SendFundingCreated {
 		node_id: PublicKey,
@@ -90,6 +95,10 @@ pub enum Event {
 		msg: msgs::ChannelAnnouncement,
 		update_msg: msgs::ChannelUpdate,
 	},
+	/// Used to indicate that a channel_update should be broadcast to all peers.
+	BroadcastChannelUpdate {
+		msg: msgs::ChannelUpdate,
+	},
 }
 
 pub trait EventsProvider {