gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't follow the leader: assume drone runs on the network entrypoint

Browse Source
This commit is contained in:
Michael Vines
2019-01-04 13:25:47 -08:00
parent 5143f6d6f1
commit 0a7e199c82
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wallet/src/wallet.rs
View File

@ -101,8 +101,9 @@ impl Default for WalletConfig {
} }
impl WalletConfig { impl WalletConfig {
pub fn drone_addr(&self, tpu_addr: SocketAddr) -> SocketAddr { pub fn drone_addr(&self) -> SocketAddr {
let mut drone_addr = tpu_addr; // Assume drone is running on the provided network entrypoint
let mut drone_addr = self.network;
drone_addr.set_port(self.drone_port.unwrap_or(DRONE_PORT)); drone_addr.set_port(self.drone_port.unwrap_or(DRONE_PORT));
drone_addr drone_addr
} }
@ -311,8 +312,7 @@ pub fn process_command(config: &WalletConfig) -> Result<String, Box<dyn error::E
} }
let leader = poll_gossip_for_leader(config.network, config.timeout)?; let leader = poll_gossip_for_leader(config.network, config.timeout)?;
let tpu_addr = leader.tpu; let drone_addr = config.drone_addr();
let drone_addr = config.drone_addr(tpu_addr);
let rpc_addr = config.rpc_addr(leader.rpc); let rpc_addr = config.rpc_addr(leader.rpc);
let rpc_client = RpcClient::new(rpc_addr); let rpc_client = RpcClient::new(rpc_addr);