From c463e80ba067eb69d9f5309d401ea05f99c0cb01 Mon Sep 17 00:00:00 2001
From: Conor Schaefer <conor@penumbralabs.xyz>
Date: Fri, 28 Jun 2024 15:49:07 -0700
Subject: [PATCH] chore: remove testnet-specific cli defaults

---
 crates/bin/pcli/src/command/init.rs | 1 -
 crates/bin/pclientd/src/lib.rs      | 1 -
 crates/bin/pd/src/cli.rs            | 5 +----
 crates/bin/pd/src/main.rs           | 2 +-
 crates/misc/measure/src/main.rs     | 1 -
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/crates/bin/pcli/src/command/init.rs b/crates/bin/pcli/src/command/init.rs
index 70c3559ed9..1a79ccf923 100644
--- a/crates/bin/pcli/src/command/init.rs
+++ b/crates/bin/pcli/src/command/init.rs
@@ -23,7 +23,6 @@ pub struct InitCmd {
     /// The GRPC URL that will be used in the generated config.
     #[clap(
         long,
-        default_value = "https://grpc.testnet.penumbra.zone",
         // Note: reading from the environment here means that running
         // pcli init inside of the test harness (where we override that)
         // will correctly set the URL, even though we don't subsequently
diff --git a/crates/bin/pclientd/src/lib.rs b/crates/bin/pclientd/src/lib.rs
index 31e69df0d6..afab0a80d2 100644
--- a/crates/bin/pclientd/src/lib.rs
+++ b/crates/bin/pclientd/src/lib.rs
@@ -101,7 +101,6 @@ pub enum Command {
         #[clap(
             long,
             display_order = 900,
-            default_value = "https://grpc.testnet.penumbra.zone",
             parse(try_from_str = Url::parse)
         )]
         grpc_url: Url,
diff --git a/crates/bin/pd/src/cli.rs b/crates/bin/pd/src/cli.rs
index ec097cab41..6cb28db31f 100644
--- a/crates/bin/pd/src/cli.rs
+++ b/crates/bin/pd/src/cli.rs
@@ -213,10 +213,7 @@ pub enum NetworkCommand {
     /// Requires a URL for the CometBFT RPC for the bootstrap node.
     Join {
         /// URL of the remote CometBFT RPC endpoint for bootstrapping connection.
-        #[clap(
-            env = "PENUMBRA_PD_JOIN_URL",
-            default_value = "https://rpc.testnet.penumbra.zone"
-        )]
+        #[clap(env = "PENUMBRA_PD_JOIN_URL")]
         node: Url,
         /// Optional URL of archived node state in .tar.gz format. The archive will be
         /// downloaded and extracted locally, allowing the node to join a network at a block height
diff --git a/crates/bin/pd/src/main.rs b/crates/bin/pd/src/main.rs
index 93daa14d01..223c17d41c 100644
--- a/crates/bin/pd/src/main.rs
+++ b/crates/bin/pd/src/main.rs
@@ -11,7 +11,7 @@ use anyhow::{anyhow, Context};
 use cnidarium::Storage;
 use metrics_exporter_prometheus::PrometheusBuilder;
 use pd::{
-    cli::{Opt, RootCommand, NetworkCommand},
+    cli::{NetworkCommand, Opt, RootCommand},
     migrate::Migration::{ReadyToStart, Testnet78},
     network::{
         config::{get_network_dir, parse_tm_address, url_has_necessary_parts},
diff --git a/crates/misc/measure/src/main.rs b/crates/misc/measure/src/main.rs
index 9dcb263013..70dd03cd44 100644
--- a/crates/misc/measure/src/main.rs
+++ b/crates/misc/measure/src/main.rs
@@ -31,7 +31,6 @@ pub struct Opt {
     #[clap(
         short,
         long,
-        default_value = "https://grpc.testnet.penumbra.zone",
         env = "PENUMBRA_NODE_PD_URL",
         parse(try_from_str = url::Url::parse)
     )]