revert change to replica-port

dfinity · Jan 7, 2025 · 6acd8b4 · 6acd8b4
1 parent f4d2ca4
commit 6acd8b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/e2e/tests-dfx/info.bash b/e2e/tests-dfx/info.bash
@@ -20,17 +20,17 @@ teardown() {
     assert_command_fail dfx info pocketic-config-port
     assert_contains "No PocketIC port found"
     dfx_start
-    assert_command_fail dfx info native-replica-port
+    assert_command_fail dfx info replica-port
     assert_contains "The running server is PocketIC"
     assert_command dfx info pocketic-config-port
     assert_eq "$(get_pocketic_port)"
   else
-    assert_command_fail dfx info native-replica-port
+    assert_command_fail dfx info replica-port
     assert_contains "No replica port found"
     dfx_start
     assert_command_fail dfx info pocketic-config-port
     assert_contains "The running server is a native replica"
-    assert_command dfx info native-replica-port
+    assert_command dfx info replica-port
     assert_eq "$(get_replica_port)"
   fi
 }

diff --git a/e2e/tests-dfx/start.bash b/e2e/tests-dfx/start.bash
@@ -274,7 +274,7 @@ teardown() {
   if [[ "$USE_POCKETIC" ]]; then
     assert_command dfx info pocketic-config-port
   else
-    assert_command dfx info native-replica-port
+    assert_command dfx info replica-port
   fi
   assert_eq "$replica_port"
 }

diff --git a/src/dfx/src/commands/info/mod.rs b/src/dfx/src/commands/info/mod.rs
@@ -19,15 +19,14 @@ enum InfoType {
     CandidUiUrl,
     /// Show the headers that gets applied to assets in .ic-assets.json5 if "security_policy" is "standard" or "hardened".
     SecurityPolicy,
-    /// Show the port of the local IC API/webserver
-    #[command(alias = "webserver-port")]
-    ReplicaPort,
+    /// Show the port of the local IC API/HTTP gateway
+    WebserverPort,
     /// Show the revision of the replica shipped with this dfx binary
     ReplicaRev,
     /// Show the path to network configuration file
     NetworksJsonPath,
-    /// Show the port the native replica is using, if it is running
-    NativeReplicaPort,
+    /// Show the port the replica is using, if it is running
+    ReplicaPort,
     /// Show the port that PocketIC is using, if it is running
     PocketicConfigPort,
 }
@@ -58,10 +57,10 @@ pub fn exec(env: &dyn Environment, opts: InfoOpts) -> DfxResult {
         InfoType::SecurityPolicy => {
             ic_asset::security_policy::SecurityPolicy::Standard.to_json5_str()
         }
-        InfoType::NativeReplicaPort => get_replica_port(env)?,
+        InfoType::ReplicaPort => get_replica_port(env)?,
         InfoType::PocketicConfigPort => get_pocketic_config_port(env)?,
         InfoType::ReplicaRev => info::replica_rev().to_string(),
-        InfoType::ReplicaPort => get_webserver_port(env)?,
+        InfoType::WebserverPort => get_webserver_port(env)?,
         InfoType::NetworksJsonPath => NetworksConfig::new()?
             .get_path()
             .to_str()