f Feedback Wilmer

Author: tnull

lightning/src/chain/keysinterface.rs

@@ -292,9 +292,6 @@ pub trait BaseSign {
 	///
 	/// An external signer implementation should check that the commitment has not been revoked.
 	///
-	/// May return an error if key derivation fails. Callers, such as [`ChannelMonitor`], will
-	/// panic in such a case.
-	///
 	/// [`ChannelMonitor`]: crate::chain::channelmonitor::ChannelMonitor
 	// TODO: Document the things someone using this interface should enforce before signing.
 	// TODO: Key derivation failure should panic rather than Err
@@ -537,7 +534,7 @@ pub trait KeysInterface {
 /// This implementation performs no policy checks and is insufficient by itself as
 /// a secure external signer.
 pub struct InMemorySigner {
-	/// Private key of an anchor transaction.
+	/// Private key of an anchor or 2-of-2 multisig transaction.
 	pub funding_key: SecretKey,
 	/// Holder secret key for blinded revocation pubkey.
 	pub revocation_base_key: SecretKey,
@@ -915,8 +912,7 @@ impl ReadableArgs<SecretKey> for InMemorySigner {
 		let secp_ctx = Secp256k1::signing_only();
 		let holder_channel_pubkeys =
 			InMemorySigner::make_holder_keys(&secp_ctx, &funding_key, &revocation_base_key,
-				 &payment_key, &delayed_payment_base_key,
-				 &htlc_base_key);
+				 &payment_key, &delayed_payment_base_key, &htlc_base_key);
 		let keys_id = Readable::read(reader)?;
 
 		read_tlv_fields!(reader, {});
@@ -941,7 +937,7 @@ impl ReadableArgs<SecretKey> for InMemorySigner {
 /// key and derives keys from that.
 ///
 /// Your `node_id` is seed/0'.
-/// [`ChannelMonitor`] closes may use seed/1'.
+/// Unilateral closes may use seed/1'.
 /// Cooperative closes may use seed/2'.
 /// The two close keys may be needed to claim on-chain funds!
 ///
@@ -950,8 +946,6 @@ impl ReadableArgs<SecretKey> for InMemorySigner {
 ///
 /// Note that switching between this struct and [`PhantomKeysManager`] will invalidate any
 /// previously issued invoices and attempts to pay previous invoices will fail.
-///
-/// [`ChannelMonitor`]: crate::chain::channelmonitor::ChannelMonitor
 pub struct KeysManager {
 	secp_ctx: Secp256k1<secp256k1::All>,
 	node_secret: SecretKey,