From 3772910bf21886d68b710fa5079324b6b60e6d3e Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Fri, 9 Nov 2018 17:03:53 -0700
Subject: [PATCH] Boot rpc_port

---
 src/bin/wallet.rs | 14 --------------
 src/wallet.rs     | 18 ++++++------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/bin/wallet.rs b/src/bin/wallet.rs
index f56b2568e2..31bd93bcd8 100644
--- a/src/bin/wallet.rs
+++ b/src/bin/wallet.rs
@@ -6,7 +6,6 @@ extern crate solana;
 
 use clap::{App, Arg, ArgMatches, SubCommand};
 use solana::logger;
-use solana::rpc::RPC_PORT;
 use solana::signature::{read_keypair, KeypairUtil};
 use solana::wallet::{gen_keypair_file, parse_command, process_command, WalletConfig, WalletError};
 use std::error;
@@ -30,12 +29,6 @@ pub fn parse_args(matches: &ArgMatches) -> Result<WalletConfig, Box<error::Error
 
     let proxy = matches.value_of("proxy").map(|proxy| proxy.to_string());
 
-    let rpc_port = if let Some(port) = matches.value_of("rpc-port") {
-        port.to_string().parse().expect("integer")
-    } else {
-        RPC_PORT
-    };
-
     let mut path = dirs::home_dir().expect("home directory");
     let id_path = if matches.is_present("keypair") {
         matches.value_of("keypair").unwrap()
@@ -63,7 +56,6 @@ pub fn parse_args(matches: &ArgMatches) -> Result<WalletConfig, Box<error::Error
         network,
         timeout,
         proxy,
-        rpc_port,
     })
 }
 
@@ -91,12 +83,6 @@ fn main() -> Result<(), Box<error::Error>> {
                 .value_name("SECS")
                 .takes_value(true)
                 .help("Max seconds to wait to get necessary gossip from the network"),
-        ).arg(
-            Arg::with_name("rpc-port")
-                .long("port")
-                .takes_value(true)
-                .value_name("NUM")
-                .help("Optional rpc-port configuration to connect to non-default nodes")
         ).arg(
             Arg::with_name("proxy")
                 .long("proxy")
diff --git a/src/wallet.rs b/src/wallet.rs
index f7d61b4a64..78497661fd 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -89,7 +89,6 @@ pub struct WalletConfig {
     pub network: SocketAddr,
     pub timeout: Option<u64>,
     pub proxy: Option<String>,
-    pub rpc_port: u16,
 }
 
 impl Default for WalletConfig {
@@ -101,7 +100,6 @@ impl Default for WalletConfig {
             network: default_addr,
             timeout: None,
             proxy: None,
-            rpc_port: 0,
         }
     }
 }
@@ -112,13 +110,6 @@ impl WalletConfig {
         drone_addr.set_port(DRONE_PORT);
         drone_addr
     }
-
-    pub fn rpc_addr(&self, tpu_addr: SocketAddr) -> String {
-        let mut rpc_addr = tpu_addr;
-        rpc_addr.set_port(self.rpc_port);
-        let rpc_addr_str = format!("http://{}", rpc_addr.to_string());
-        self.proxy.clone().unwrap_or(rpc_addr_str)
-    }
 }
 
 pub fn parse_command(
@@ -319,9 +310,12 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<error::Error
     }
 
     let leader = poll_gossip_for_leader(config.network, config.timeout)?;
-    let tpu_addr = leader.contact_info.tpu;
-    let drone_addr = config.drone_addr(tpu_addr);
-    let rpc_addr = config.rpc_addr(tpu_addr);
+    let leader_info = &leader.contact_info;
+    let drone_addr = config.drone_addr(leader_info.tpu);
+    let rpc_addr = config
+        .proxy
+        .clone()
+        .unwrap_or_else(|| leader_info.rpc.to_string());
 
     match config.command {
         // Get address of this client