const renames

Author: cowlicks

src/crypto/handshake.rs

@@ -3,7 +3,7 @@ use blake2::{
     digest::{typenum::U32, FixedOutput, Update},
     Blake2bMac,
 };
-use handshake_patterns::name_from_pattern;
+use handshake_constants::name_from_pattern;
 use snow::{
     params::HandshakePattern,
     resolvers::{DefaultResolver, FallbackResolver},
@@ -15,23 +15,23 @@ use tracing::instrument;
 const CIPHERKEYLEN: usize = 32;
 
 /// The [`HandshakePattern`]s we support for connections
-pub mod handshake_patterns {
+pub mod handshake_constants {
     use snow::params::HandshakePattern;
     use tracing::error;
     /// [`HandshakePattern`] used by the hyperdht crate.
-    pub const DHT: HandshakePattern = HandshakePattern::IK;
+    pub const DHT_PATTERN: HandshakePattern = HandshakePattern::IK;
     /// Noise protocol name used in hyperdht crate.
     pub const DHT_NAME: &str = "Noise_IK_Ed25519_ChaChaPoly_BLAKE2b";
     /// [`HandshakePattern`] used by the hypercore-protocol crate.
-    pub const PROTOCOL: HandshakePattern = HandshakePattern::XX;
+    pub const PROTOCOL_PATTERN: HandshakePattern = HandshakePattern::XX;
     /// Noise protocol name used in hypercore-protocol crate.
     pub const PROTOCOL_NAME: &str = "Noise_XX_Ed25519_ChaChaPoly_BLAKE2b";
 
     /// Get a Noise protocol name from a handshake pattern
     pub fn name_from_pattern(pattern: &HandshakePattern) -> Result<&'static str, snow::Error> {
         Ok(match *pattern {
-            DHT => DHT_NAME,
-            PROTOCOL => PROTOCOL_NAME,
+            DHT_PATTERN => DHT_NAME,
+            PROTOCOL_PATTERN => PROTOCOL_NAME,
             unsupported_pattern => {
                 error!("Got an unsupported handshake pattern {unsupported_pattern:?}");
                 return Err(snow::Error::Input);
@@ -292,7 +292,7 @@ fn build_handshake_state_with_config(
     }
 
     // Set remote public key for IK pattern initiator
-    if is_initiator && config.pattern == handshake_patterns::PROTOCOL {
+    if is_initiator && config.pattern == handshake_constants::PROTOCOL_PATTERN {
         if let Some(ref remote_key) = config.remote_public_key {
             builder = builder.remote_public_key(remote_key);
         } else {

src/crypto/mod.rs

@@ -3,4 +3,4 @@ mod curve;
 mod handshake;
 pub(crate) use cipher::{DecryptCipher, EncryptCipher};
 pub(crate) use handshake::HandshakeResult;
-pub use handshake::{handshake_patterns, Handshake, HandshakeConfig};
+pub use handshake::{handshake_constants, Handshake, HandshakeConfig};

src/lib.rs

@@ -145,4 +145,4 @@ pub use message::Message;
 pub use protocol::{Command, CommandTx, DiscoveryKey, Event, Key, Protocol};
 pub use util::discovery_key;
 // Export DHT-related crypto functionality
-pub use crypto::{handshake_patterns, Handshake, HandshakeConfig};
+pub use crypto::{handshake_constants, Handshake, HandshakeConfig};