gateway probe fixes

Author: jstuczyn

common/credential-verification/src/upgrade_mode.rs

@@ -292,29 +292,39 @@ struct UpgradeModeStateInner {
     status: UpgradeModeStatus,
 }
 
-#[cfg(test)]
-pub fn mock_dummy_upgrade_mode_details() -> (UpgradeModeDetails, UnboundedReceiver<CheckRequest>) {
-    let (um_recheck_tx, um_recheck_rx) = futures::channel::mpsc::unbounded();
-
-    const DUMMY_ATTESTER_ED25519_PRIVATE_KEY: [u8; 32] = [
-        108, 49, 193, 21, 126, 161, 249, 85, 242, 207, 74, 195, 238, 6, 64, 149, 201, 140, 248,
-        163, 122, 170, 79, 198, 87, 85, 36, 29, 243, 92, 64, 161,
-    ];
-
-    pub(crate) fn dummy_attester_public_key() -> ed25519::PublicKey {
-        let private_key =
-            ed25519::PrivateKey::from_bytes(&DUMMY_ATTESTER_ED25519_PRIVATE_KEY).unwrap();
-        private_key.public_key()
-    }
+pub mod testing {
+    use crate::UpgradeModeState;
+    use crate::upgrade_mode::{
+        CheckRequest, UpgradeModeCheckConfig, UpgradeModeCheckRequestSender, UpgradeModeDetails,
+    };
+    use futures::channel::mpsc::UnboundedReceiver;
+    use nym_crypto::asymmetric::ed25519;
+    use std::time::Duration;
+
+    pub fn mock_dummy_upgrade_mode_details() -> (UpgradeModeDetails, UnboundedReceiver<CheckRequest>)
+    {
+        let (um_recheck_tx, um_recheck_rx) = futures::channel::mpsc::unbounded();
+
+        const DUMMY_ATTESTER_ED25519_PRIVATE_KEY: [u8; 32] = [
+            108, 49, 193, 21, 126, 161, 249, 85, 242, 207, 74, 195, 238, 6, 64, 149, 201, 140, 248,
+            163, 122, 170, 79, 198, 87, 85, 36, 29, 243, 92, 64, 161,
+        ];
+
+        pub(crate) fn dummy_attester_public_key() -> ed25519::PublicKey {
+            let private_key =
+                ed25519::PrivateKey::from_bytes(&DUMMY_ATTESTER_ED25519_PRIVATE_KEY).unwrap();
+            private_key.public_key()
+        }
 
-    let upgrade_mode_state = UpgradeModeState::new(dummy_attester_public_key());
-    let upgrade_mode_details = UpgradeModeDetails::new(
-        UpgradeModeCheckConfig {
-            // essentially we never want to trigger this in our tests
-            min_staleness_recheck: Duration::from_nanos(1),
-        },
-        UpgradeModeCheckRequestSender::new(um_recheck_tx),
-        upgrade_mode_state.clone(),
-    );
-    (upgrade_mode_details, um_recheck_rx)
+        let upgrade_mode_state = UpgradeModeState::new(dummy_attester_public_key());
+        let upgrade_mode_details = UpgradeModeDetails::new(
+            UpgradeModeCheckConfig {
+                // essentially we never want to trigger this in our tests
+                min_staleness_recheck: Duration::from_nanos(1),
+            },
+            UpgradeModeCheckRequestSender::new(um_recheck_tx),
+            upgrade_mode_state.clone(),
+        );
+        (upgrade_mode_details, um_recheck_rx)
+    }
 }

gateway/src/node/wireguard/peer_manager.rs

@@ -309,7 +309,7 @@ mod tests {
 
     use crate::node::wireguard::PeerRegistrator;
     use crate::nym_authenticator::config::Authenticator;
-    use nym_credential_verification::upgrade_mode::mock_dummy_upgrade_mode_details;
+    use nym_credential_verification::upgrade_mode::testing::mock_dummy_upgrade_mode_details;
     use nym_credential_verification::{
         bandwidth_storage_manager::BandwidthStorageManager, ecash::MockEcashManager,
     };
@@ -403,8 +403,11 @@ mod tests {
 
         let peer = Peer::default();
         let ecash_manager = Arc::new(MockEcashManager::new(Box::new(storage.clone())));
-        let peer_registrator =
-            PeerRegistrator::new(ecash_manager.clone(), peer_manager, upgrade_mode_details);
+        let peer_registrator = PeerRegistrator::new(
+            ecash_manager.clone(),
+            peer_manager.clone(),
+            upgrade_mode_details,
+        );
 
         assert!(peer_manager.add_peer(peer.clone()).await.is_err());
 
@@ -432,8 +435,11 @@ mod tests {
         let peer = Peer::default();
         let ecash_manager = Arc::new(MockEcashManager::new(Box::new(storage.clone())));
 
-        let peer_registrator =
-            PeerRegistrator::new(ecash_manager.clone(), peer_manager, upgrade_mode_details);
+        let peer_registrator = PeerRegistrator::new(
+            ecash_manager.clone(),
+            peer_manager.clone(),
+            upgrade_mode_details,
+        );
 
         let client_id = storage
             .insert_wireguard_peer(&peer, FromStr::from_str("entry_wireguard").unwrap())

integration-tests/src/lp_registration.rs

@@ -7,9 +7,9 @@ mod tests {
     use nym_bandwidth_controller::mock::MockBandwidthController;
     use nym_credential_verification::UpgradeModeState;
     use nym_credential_verification::ecash::MockEcashManager;
+    use nym_credential_verification::upgrade_mode::testing::mock_dummy_upgrade_mode_details;
     use nym_credential_verification::upgrade_mode::{
         UpgradeModeCheckConfig, UpgradeModeCheckRequestSender, UpgradeModeDetails,
-        mock_dummy_upgrade_mode_details,
     };
     use nym_credentials_interface::TicketType;
     use nym_crypto::asymmetric::{ed25519, x25519};

nym-gateway-probe/src/common/probe_tests.rs

@@ -246,7 +246,6 @@ pub async fn lp_registration_probe(
     info!("  - Gateway public key: {:?}", gateway_data.public_key);
     info!("  - Private IPv4: {}", gateway_data.private_ipv4);
     info!("  - Private IPv6: {}", gateway_data.private_ipv6);
-    info!("  - Endpoint: {}", gateway_data.endpoint);
     lp_outcome.can_register = true;
 
     Ok(lp_outcome)
@@ -403,9 +402,9 @@ pub async fn wg_probe_lp(
 
     // Build WireGuard endpoint addresses
     // Entry endpoint uses entry_ip (host-reachable) + port from registration
-    let entry_wg_endpoint = format!("{}:{}", entry_ip, entry_gateway_data.endpoint.port());
+    let entry_wg_endpoint = format!("{}:{}", entry_ip, entry_gateway_data.port);
     // Exit endpoint uses exit_ip + port from registration (forwarded via entry)
-    let exit_wg_endpoint = format!("{}:{}", exit_ip, exit_gateway_data.endpoint.port());
+    let exit_wg_endpoint = format!("{}:{}", exit_ip, exit_gateway_data.port);
 
     info!("Two-hop WireGuard configuration:");
     info!("  Entry gateway:");