f - clean up payment examples

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -1230,8 +1230,8 @@ where
 /// # use bitcoin::{ScriptBuf, Transaction};
 /// # use bitcoin::secp256k1::PublicKey;
 /// # use lightning::ln::channelmanager::AChannelManager;
-/// use lightning::events::{Event, EventsProvider};
-///
+/// # use lightning::events::{Event, EventsProvider};
+/// #
 /// # struct Wallet {}
 /// # impl Wallet {
 /// #     fn create_funding_transaction(
@@ -1245,15 +1245,9 @@ where
 /// # let channel_manager = channel_manager.get_cm();
 /// let value_sats = 1_000_000;
 /// let push_msats = 10_000_000;
-/// let user_channel_id = 42;
-///
-/// match channel_manager.create_channel(peer_id, value_sats, push_msats, user_channel_id, None, None) {
-///     Ok(channel_id) => println!(
-///         "Opening channel {} (user_channel_id: {})", channel_id, user_channel_id
-///     ),
-///     Err(e) => println!(
-///         "Error opening channel (user_channel_id: {}): {:?}", user_channel_id, e
-///     ),
+/// match channel_manager.create_channel(peer_id, value_sats, push_msats, 42, None, None) {
+///     Ok(channel_id) => println!("Opening channel {}", channel_id),
+///     Err(e) => println!("Error opening channel: {:?}", e),
 /// }
 ///
 /// // On the event processing thread
@@ -1262,30 +1256,24 @@ where
 ///         temporary_channel_id, counterparty_node_id, channel_value_satoshis, output_script,
 ///         user_channel_id, ..
 ///     } => {
+///         assert_eq!(user_channel_id, 42);
 ///         let funding_transaction = wallet.create_funding_transaction(
 ///             channel_value_satoshis, output_script
 ///         );
 ///         match channel_manager.funding_transaction_generated(
 ///             &temporary_channel_id, &counterparty_node_id, funding_transaction
 ///         ) {
-///             Ok(()) => println!(
-///                 "Funding channel {} (user_channel_id: {})", temporary_channel_id,
-///                 user_channel_id
-///             ),
-///             Err(e) => println!(
-///                 "Error funding channel {} (user_channel_id: {}): {:?}", temporary_channel_id,
-///                 user_channel_id, e
-///             ),
+///             Ok(()) => println!("Funding channel {}", temporary_channel_id),
+///             Err(e) => println!("Error funding channel {}: {:?}", temporary_channel_id, e),
 ///         }
 ///     },
 ///     Event::ChannelPending { channel_id, user_channel_id, former_temporary_channel_id, .. } => {
-///         println!(
-///             "Channel {} (user_channel_id: {}) pending confirmations; old channel id: {}",
-///             channel_id, user_channel_id, former_temporary_channel_id.unwrap()
-///         );
+///         assert_eq!(user_channel_id, 42);
+///         println!("Channel {} now {} pending", channel_id, former_temporary_channel_id.unwrap())
 ///     },
 ///     Event::ChannelReady { channel_id, user_channel_id, .. } => {
-///         println!("Channel {} (user_channel_id: {}) ready", channel_id, user_channel_id);
+///         assert_eq!(user_channel_id, 42);
+///         println!("Channel {} ready", channel_id);
 ///     },
 ///     // ...
 /// #     _ => {},
@@ -1302,8 +1290,8 @@ where
 /// ```
 /// # use bitcoin::secp256k1::PublicKey;
 /// # use lightning::ln::channelmanager::AChannelManager;
-/// use lightning::events::{Event, EventsProvider};
-///
+/// # use lightning::events::{Event, EventsProvider};
+/// #
 /// # fn is_trusted(counterparty_node_id: PublicKey) -> bool {
 /// #     // ...
 /// #     unimplemented!()
@@ -1327,14 +1315,8 @@ where
 ///         match channel_manager.accept_inbound_channel(
 ///             &temporary_channel_id, &counterparty_node_id, user_channel_id
 ///         ) {
-///             Ok(()) => println!(
-///                 "Accepting channel {} (user_channel_id: {})", temporary_channel_id,
-///                 user_channel_id
-///             ),
-///             Err(e) => println!(
-///                 "Error accepting channel {} (user_channel_id: {}): {:?}", temporary_channel_id,
-///                 user_channel_id, e
-///             ),
+///             Ok(()) => println!("Accepting channel {}", temporary_channel_id),
+///             Err(e) => println!("Error accepting channel {}: {:?}", temporary_channel_id, e),
 ///         }
 ///     },
 ///     // ...
@@ -1355,8 +1337,8 @@ where
 /// # use bitcoin::secp256k1::PublicKey;
 /// # use lightning::ln::ChannelId;
 /// # use lightning::ln::channelmanager::AChannelManager;
-/// use lightning::events::{Event, EventsProvider};
-///
+/// # use lightning::events::{Event, EventsProvider};
+/// #
 /// # fn example<T: AChannelManager>(
 /// #     channel_manager: T, channel_id: ChannelId, counterparty_node_id: PublicKey
 /// # ) {
@@ -1369,7 +1351,8 @@ where
 /// // On the event processing thread
 /// channel_manager.process_pending_events(&|event| match event {
 ///     Event::ChannelClosed { channel_id, user_channel_id, ..  } => {
-///         println!("Channel {} (user_channel_id: {}) closed", channel_id, user_channel_id);
+///         assert_eq!(user_channel_id, 42);
+///         println!("Channel {} closed", channel_id);
 ///     },
 ///     // ...
 /// #     _ => {},