From f655372b08f3cfe30e40c073880d67ebd3d4f71c Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 10 Mar 2020 14:09:59 -0700
Subject: [PATCH] Revert to a computed `websocket_url` value when
 `json_rpc_url` is changed

---
 cli-config/src/config.rs | 5 ++++-
 cli/src/main.rs          | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cli-config/src/config.rs b/cli-config/src/config.rs
index e060fe64fb..6503dc4b5e 100644
--- a/cli-config/src/config.rs
+++ b/cli-config/src/config.rs
@@ -31,7 +31,10 @@ impl Default for Config {
             keypair_path.to_str().unwrap().to_string()
         };
         let json_rpc_url = "http://127.0.0.1:8899".to_string();
-        let websocket_url = Self::compute_websocket_url(&json_rpc_url);
+
+        // Empty websocket_url string indicates the client should
+        // `Config::compute_websocket_url(&json_rpc_url)`
+        let websocket_url = "".to_string();
 
         Self {
             json_rpc_url,
diff --git a/cli/src/main.rs b/cli/src/main.rs
index 5100a906f6..345448b9ee 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -55,6 +55,9 @@ fn parse_settings(matches: &ArgMatches<'_>) -> Result<bool, Box<dyn error::Error
                     let mut config = Config::load(config_file).unwrap_or_default();
                     if let Some(url) = subcommand_matches.value_of("json_rpc_url") {
                         config.json_rpc_url = url.to_string();
+                        // Revert to a computed `websocket_url` value when `json_rpc_url` is
+                        // changed
+                        config.websocket_url = "".to_string();
                     }
                     if let Some(url) = subcommand_matches.value_of("websocket_url") {
                         config.websocket_url = url.to_string();