Move get_destination_script and get_shutdown_scriptpubkey from KeysInterface to SignerProvider

Author: arik-so

fuzz/src/chanmon_consistency.rs

@@ -219,9 +219,7 @@ impl SignerProvider for KeyProvider {
 			disable_revocation_policy_check: false,
 		})
 	}
-}
 
-impl KeysInterface for KeyProvider {
 	fn get_destination_script(&self) -> Script {
 		let secp_ctx = Secp256k1::signing_only();
 		let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
@@ -237,6 +235,8 @@ impl KeysInterface for KeyProvider {
 	}
 }
 
+impl KeysInterface for KeyProvider {}
+
 impl KeyProvider {
 	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 		let mut revoked_commitments = self.enforcement_states.lock().unwrap();

fuzz/src/full_stack.rs

@@ -336,9 +336,7 @@ impl SignerProvider for KeyProvider {
 			false
 		))
 	}
-}
 
-impl KeysInterface for KeyProvider {
 	fn get_destination_script(&self) -> Script {
 		let secp_ctx = Secp256k1::signing_only();
 		let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
@@ -354,6 +352,8 @@ impl KeysInterface for KeyProvider {
 	}
 }
 
+impl KeysInterface for KeyProvider {}
+
 #[inline]
 pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 	let input = Arc::new(InputData {

fuzz/src/onion_message.rs

@@ -117,14 +117,14 @@ impl SignerProvider for KeyProvider {
 	}
 
 	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }
-}
 
-impl KeysInterface for KeyProvider {
 	fn get_destination_script(&self) -> Script { unreachable!() }
 
 	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
 }
 
+impl KeysInterface for KeyProvider {}
+
 #[cfg(test)]
 mod tests {
 	use lightning::util::logger::{Logger, Record};

lightning/src/chain/keysinterface.rs

@@ -543,10 +543,7 @@ pub trait SignerProvider {
 	/// [`ChannelMonitor`]: crate::chain::channelmonitor::ChannelMonitor
 	/// [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
 	fn read_chan_signer(&self, reader: &[u8]) -> Result<Self::Signer, DecodeError>;
-}
 
-/// A trait to describe an object which can get user secrets and key material.
-pub trait KeysInterface: EntropySource + NodeSigner + SignerProvider {
 	/// Get a script pubkey which we send funds to when claiming on-chain contestable outputs.
 	///
 	/// This method should return a different value each time it is called, to avoid linking
@@ -560,6 +557,9 @@ pub trait KeysInterface: EntropySource + NodeSigner + SignerProvider {
 	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript;
 }
 
+/// A trait to describe an object which can get user secrets and key material.
+pub trait KeysInterface: EntropySource + NodeSigner + SignerProvider {}
+
 #[derive(Clone)]
 /// A simple implementation of [`Sign`] that just keeps the private keys in memory.
 ///
@@ -1300,9 +1300,7 @@ impl SignerProvider for KeysManager {
 	fn read_chan_signer(&self, reader: &[u8]) -> Result<Self::Signer, DecodeError> {
 		InMemorySigner::read(&mut io::Cursor::new(reader), self.node_secret.clone())
 	}
-}
 
-impl KeysInterface for KeysManager {
 	fn get_destination_script(&self) -> Script {
 		self.destination_script.clone()
 	}
@@ -1312,6 +1310,8 @@ impl KeysInterface for KeysManager {
 	}
 }
 
+impl KeysInterface for KeysManager {}
+
 /// Similar to [`KeysManager`], but allows the node using this struct to receive phantom node
 /// payments.
 ///
@@ -1379,9 +1379,7 @@ impl SignerProvider for PhantomKeysManager {
 	fn read_chan_signer(&self, reader: &[u8]) -> Result<Self::Signer, DecodeError> {
 		self.inner.read_chan_signer(reader)
 	}
-}
 
-impl KeysInterface for PhantomKeysManager {
 	fn get_destination_script(&self) -> Script {
 		self.inner.get_destination_script()
 	}
@@ -1391,6 +1389,9 @@ impl KeysInterface for PhantomKeysManager {
 	}
 }
 
+impl KeysInterface for PhantomKeysManager {
+}
+
 impl PhantomKeysManager {
 	/// Constructs a [`PhantomKeysManager`] given a 32-byte seed and an additional `cross_node_seed`
 	/// that is shared across all nodes that intend to participate in [phantom node payments]

lightning/src/ln/channel.rs

@@ -6874,9 +6874,7 @@ mod tests {
 		}
 
 		fn read_chan_signer(&self, _data: &[u8]) -> Result<Self::Signer, DecodeError> { panic!(); }
-	}
 
-	impl KeysInterface for Keys {
 		fn get_destination_script(&self) -> Script {
 			let secp_ctx = Secp256k1::signing_only();
 			let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
@@ -6891,6 +6889,8 @@ mod tests {
 		}
 	}
 
+	impl KeysInterface for Keys {}
+
 	#[cfg(not(feature = "grind_signatures"))]
 	fn public_from_secret_hex(secp_ctx: &Secp256k1<bitcoin::secp256k1::All>, hex: &str) -> PublicKey {
 		PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&hex::decode(hex).unwrap()[..]).unwrap())

lightning/src/ln/shutdown_tests.rs

@@ -9,7 +9,7 @@
 
 //! Tests of our shutdown and closing_signed negotiation logic.
 
-use crate::chain::keysinterface::{EntropySource, KeysInterface};
+use crate::chain::keysinterface::{EntropySource, KeysInterface, SignerProvider};
 use crate::chain::transaction::OutPoint;
 use crate::ln::channelmanager::{self, PaymentSendFailure, PaymentId};
 use crate::routing::router::{PaymentParameters, get_route};

lightning/src/util/test_utils.rs

@@ -99,13 +99,14 @@ impl SignerProvider for OnlyReadsKeysInterface {
 			false
 		))
 	}
-}
 
-impl keysinterface::KeysInterface for OnlyReadsKeysInterface {
 	fn get_destination_script(&self) -> Script { unreachable!(); }
 	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!(); }
 }
 
+impl keysinterface::KeysInterface for OnlyReadsKeysInterface {
+}
+
 pub struct TestChainMonitor<'a> {
 	pub added_monitors: Mutex<Vec<(OutPoint, channelmonitor::ChannelMonitor<EnforcingSigner>)>>,
 	pub monitor_updates: Mutex<HashMap<[u8; 32], Vec<channelmonitor::ChannelMonitorUpdate>>>,
@@ -660,9 +661,7 @@ impl SignerProvider for TestKeysInterface {
 			self.disable_revocation_policy_check
 		))
 	}
-}
 
-impl keysinterface::KeysInterface for TestKeysInterface {
 	fn get_destination_script(&self) -> Script { self.backing.get_destination_script() }
 
 	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
@@ -676,6 +675,8 @@ impl keysinterface::KeysInterface for TestKeysInterface {
 	}
 }
 
+impl keysinterface::KeysInterface for TestKeysInterface {}
+
 impl TestKeysInterface {
 	pub fn new(seed: &[u8; 32], network: Network) -> Self {
 		let now = Duration::from_secs(genesis_block(network).header.time as u64);