remove drone port magic number

This commit is contained in:
Stephen Akridge 2018-07-18 12:38:18 -07:00 committed by sakridge
parent cc229b535d
commit 2348733d6c
4 changed files with 7 additions and 6 deletions

View File

@ -9,7 +9,7 @@ use bincode::serialize;
use clap::{App, Arg}; use clap::{App, Arg};
use rayon::prelude::*; use rayon::prelude::*;
use solana::crdt::{Crdt, NodeInfo}; use solana::crdt::{Crdt, NodeInfo};
use solana::drone::DroneRequest; use solana::drone::{DroneRequest, DRONE_PORT};
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::hash::Hash; use solana::hash::Hash;
use solana::nat::{udp_public_bind, udp_random_bind}; use solana::nat::{udp_public_bind, udp_random_bind};
@ -220,7 +220,7 @@ fn main() {
} }
let mut drone_addr = leader.contact_info.tpu; let mut drone_addr = leader.contact_info.tpu;
drone_addr.set_port(9900); drone_addr.set_port(DRONE_PORT);
let signal = Arc::new(AtomicBool::new(false)); let signal = Arc::new(AtomicBool::new(false));
let mut c_threads = vec![]; let mut c_threads = vec![];

View File

@ -10,7 +10,7 @@ extern crate tokio_io;
use bincode::deserialize; use bincode::deserialize;
use clap::{App, Arg}; use clap::{App, Arg};
use solana::crdt::NodeInfo; use solana::crdt::NodeInfo;
use solana::drone::{Drone, DroneRequest}; use solana::drone::{Drone, DroneRequest, DRONE_PORT};
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::metrics::set_panic_hook; use solana::metrics::set_panic_hook;
use solana::signature::read_keypair; use solana::signature::read_keypair;
@ -85,7 +85,7 @@ fn main() {
request_cap = None; request_cap = None;
} }
let drone_addr: SocketAddr = "0.0.0.0:9900".parse().unwrap(); let drone_addr: SocketAddr = format!("0.0.0.0:{}", DRONE_PORT).parse().unwrap();
let drone = Arc::new(Mutex::new(Drone::new( let drone = Arc::new(Mutex::new(Drone::new(
mint_keypair, mint_keypair,

View File

@ -10,7 +10,7 @@ extern crate solana;
use bincode::serialize; use bincode::serialize;
use clap::{App, Arg, SubCommand}; use clap::{App, Arg, SubCommand};
use solana::crdt::NodeInfo; use solana::crdt::NodeInfo;
use solana::drone::DroneRequest; use solana::drone::{DroneRequest, DRONE_PORT};
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::signature::{read_keypair, KeyPair, KeyPairUtil, PublicKey, Signature}; use solana::signature::{read_keypair, KeyPair, KeyPairUtil, PublicKey, Signature};
use solana::thin_client::ThinClient; use solana::thin_client::ThinClient;
@ -164,7 +164,7 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
})?; })?;
let mut drone_addr = leader.contact_info.tpu; let mut drone_addr = leader.contact_info.tpu;
drone_addr.set_port(9900); drone_addr.set_port(DRONE_PORT);
let command = match matches.subcommand() { let command = match matches.subcommand() {
("airdrop", Some(airdrop_matches)) => { ("airdrop", Some(airdrop_matches)) => {

View File

@ -16,6 +16,7 @@ use transaction::Transaction;
pub const TIME_SLICE: u64 = 60; pub const TIME_SLICE: u64 = 60;
pub const REQUEST_CAP: u64 = 1_000_000; pub const REQUEST_CAP: u64 = 1_000_000;
pub const DRONE_PORT: u16 = 9900;
#[derive(Serialize, Deserialize, Debug, Clone, Copy)] #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
pub enum DroneRequest { pub enum DroneRequest {