refactor: Rename conduit.rs and clean up remaining references

Clean up the loose comments, test names, and variables names that still
referred to conduit now that it has been destructured.

Author: julianknutsen

fuzz/src/peer_crypt.rs

@@ -121,8 +121,8 @@ impl TestCtx {
 	}
 }
 
-// Common test function that sends encrypted messages between an encryptor/decryptor until the source
-// data runs out.
+// Common test function that sends encrypted messages between an encryptor/decryptor until the
+// source data runs out.
 #[inline]
 fn do_encrypted_communication_tests(generator: &mut FuzzGen,
                                     initiator_completed_handshake_info: &mut CompletedHandshakeInfo,

lightning/src/ln/peers/conduit.rs renamed to lightning/src/ln/peers/encryption.rs

@@ -183,8 +183,8 @@ impl Decryptor {
 		increment_nonce_helper(&mut self.receiving_nonce, &mut self.receiving_chaining_key, &mut self.receiving_key);
 	}
 
-	// Used in tests to determine whether or not excess bytes entered the conduit without needing to bring up
-	// infrastructure to properly encode it
+	// Used in tests to determine whether or not excess bytes entered the Decryptor without needing
+	// to bring up infrastructure to properly encode it
 	#[cfg(test)]
 	pub fn read_buffer_length(&self) -> usize {
 		match &self.read_buffer {

lightning/src/ln/peers/handshake/mod.rs

@@ -4,7 +4,7 @@
 
 use bitcoin::secp256k1::{PublicKey, SecretKey};
 
-use ln::peers::conduit::{Decryptor, Encryptor};
+use ln::peers::encryption::{Decryptor, Encryptor};
 use ln::peers::handshake::acts::Act;
 use ln::peers::handshake::states::HandshakeState;
 use ln::peers::transport::IPeerHandshake;
@@ -52,8 +52,8 @@ impl IPeerHandshake for PeerHandshake {
 		self.ready_to_process = true;
 
 		// This transition does not have a failure path
-		let (response_vec_option, conduit_and_remote_static_public_key_option) = self.process_act(&[]).unwrap();
-		assert!(conduit_and_remote_static_public_key_option.is_none());
+		let (response_vec_option, completed_handshake_info) = self.process_act(&[]).unwrap();
+		assert!(completed_handshake_info.is_none());
 
 		response_vec_option.unwrap()
 	}

lightning/src/ln/peers/handshake/states.rs

@@ -5,7 +5,7 @@ use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::secp256k1::{SecretKey, PublicKey};
 
 use ln::peers::{chacha, hkdf5869rfc};
-use ln::peers::conduit::{SymmetricKey, create_encryptor_decryptor};
+use ln::peers::encryption::{SymmetricKey, create_encryptor_decryptor};
 use ln::peers::handshake::acts::{Act, ActBuilder, ACT_ONE_LENGTH, ACT_TWO_LENGTH, ACT_THREE_LENGTH, EMPTY_ACT_ONE, EMPTY_ACT_TWO, EMPTY_ACT_THREE};
 use ln::peers::handshake::{CompletedHandshakeInfo, IHandshakeState};
 
@@ -774,10 +774,10 @@ mod test {
 	}
 
 	// Responder::AwaitingActThree -> None (with extra bytes)
-	// Ensures that any remaining data in the read buffer is transferred to the conduit once
+	// Ensures that any remaining data in the read buffer is transferred to the Decryptor once
 	// the handshake is complete
 	#[test]
-	fn awaiting_act_three_excess_bytes_after_complete_are_in_conduit() {
+	fn awaiting_act_three_excess_bytes_after_complete_are_in_decryptor() {
 		let test_ctx = TestCtx::new();
 		let (_act2, awaiting_act_three_state) = do_next_or_panic!(test_ctx.responder, &test_ctx.valid_act1);
 		let mut act3 = test_ctx.valid_act3;

lightning/src/ln/peers/mod.rs

@@ -1,7 +1,8 @@
 //! Everything that has to do with over-the-wire peer communication.
 //! The handshake module exposes mechanisms to conduct inbound and outbound handshakes.
-//! When a handshake completes, it returns an instance of Conduit.
-//! Conduit enables message encryption and decryption, and automatically handles key rotation.
+//! When a handshake completes, it returns an instance of CompletedPeerHandshake containing an
+//! Encryptor/Decryptor used for encrypted communication and the remote static public key used for
+//! identification.
 
 #[cfg(test)]
 #[macro_use]
@@ -17,9 +18,9 @@ mod hkdf5869rfc;
 mod outbound_queue;
 
 #[cfg(feature = "fuzztarget")]
-pub mod conduit;
+pub mod encryption;
 #[cfg(not(feature = "fuzztarget"))]
-mod conduit;
+mod encryption;
 
 #[cfg(feature = "fuzztarget")]
 pub mod handshake;

lightning/src/ln/peers/test_util.rs

@@ -3,7 +3,7 @@
 use bitcoin::secp256k1;
 use bitcoin::secp256k1::key::{PublicKey, SecretKey};
 
-use ln::peers::conduit;
+use ln::peers::encryption::{create_encryptor_decryptor};
 use ln::peers::handler::{SocketDescriptor, ITransport, PeerHandleError, MessageQueuer};
 use ln::peers::handshake::CompletedHandshakeInfo;
 use ln::peers::transport::{IPeerHandshake, PayloadQueuer};
@@ -74,7 +74,7 @@ impl IPeerHandshake for PeerHandshakeTestStubBytes {
 	}
 }
 
-/// Stub implementation of IPeerhandshake that returns Some(Conduit, PublicKey)
+/// Stub implementation of IPeerhandshake that returns Some(CompletedHandshakeInfo)
 pub(super) struct PeerHandshakeTestStubComplete { }
 
 impl IPeerHandshake for PeerHandshakeTestStubComplete {
@@ -94,7 +94,7 @@ impl IPeerHandshake for PeerHandshakeTestStubComplete {
 		let curve = secp256k1::Secp256k1::new();
 		let private_key = SecretKey::from_slice(&[0x_21_u8; 32]).unwrap();
 		let public_key = PublicKey::from_secret_key(&curve, &private_key);
-		let (encryptor, decryptor) = conduit::create_encryptor_decryptor([0;32], [0;32], [0;32]);
+		let (encryptor, decryptor) = create_encryptor_decryptor([0;32], [0;32], [0;32]);
 
 		Ok((None, Some(
 			CompletedHandshakeInfo {