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

Don't use product name in solana library

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-09-03 01:18:17 -10:00
parent 4e2deaa33b
commit ab7a2960b1
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/fullnode-config.rs
View File

@ -5,7 +5,7 @@ extern crate serde_json;
extern crate solana; extern crate solana;
use clap::{App, Arg}; use clap::{App, Arg};
use solana::crdt::SOLANA_PORT_RANGE; use solana::crdt::FULLNODE_PORT_RANGE;
use solana::fullnode::Config; use solana::fullnode::Config;
use solana::nat::{get_ip_addr, get_public_ip_addr, parse_port_or_addr}; use solana::nat::{get_ip_addr, get_public_ip_addr, parse_port_or_addr};
use solana::signature::read_pkcs8; use solana::signature::read_pkcs8;
@ -48,7 +48,7 @@ fn main() {
.get_matches(); .get_matches();
let bind_addr: SocketAddr = { let bind_addr: SocketAddr = {
let mut bind_addr = parse_port_or_addr(matches.value_of("bind"), SOLANA_PORT_RANGE.0); let mut bind_addr = parse_port_or_addr(matches.value_of("bind"), FULLNODE_PORT_RANGE.0);
if matches.is_present("local") { if matches.is_present("local") {
let ip = get_ip_addr().unwrap(); let ip = get_ip_addr().unwrap();
bind_addr.set_ip(ip); bind_addr.set_ip(ip);

6
src/client.rs
View File

@ -1,11 +1,11 @@
use crdt::{NodeInfo, SOLANA_PORT_RANGE}; use crdt::{NodeInfo, FULLNODE_PORT_RANGE};
use nat::bind_in_range; use nat::bind_in_range;
use std::time::Duration; use std::time::Duration;
use thin_client::ThinClient; use thin_client::ThinClient;
pub fn mk_client(r: &NodeInfo) -> ThinClient { pub fn mk_client(r: &NodeInfo) -> ThinClient {
let requests_socket = bind_in_range(SOLANA_PORT_RANGE).unwrap(); let requests_socket = bind_in_range(FULLNODE_PORT_RANGE).unwrap();
let transactions_socket = bind_in_range(SOLANA_PORT_RANGE).unwrap(); let transactions_socket = bind_in_range(FULLNODE_PORT_RANGE).unwrap();
requests_socket requests_socket
.set_read_timeout(Some(Duration::new(1, 0))) .set_read_timeout(Some(Duration::new(1, 0)))

46
src/crdt.rs
View File

@ -39,7 +39,7 @@ use timing::{duration_as_ms, timestamp};
use transaction::Vote; use transaction::Vote;
use window::{SharedWindow, WindowIndex}; use window::{SharedWindow, WindowIndex};
pub const SOLANA_PORT_RANGE: (u16, u16) = (8000, 10_000); pub const FULLNODE_PORT_RANGE: (u16, u16) = (8000, 10_000);
/// milliseconds we sleep for between gossip requests /// milliseconds we sleep for between gossip requests
const GOSSIP_SLEEP_MILLIS: u64 = 100; const GOSSIP_SLEEP_MILLIS: u64 = 100;
const GOSSIP_PURGE_MILLIS: u64 = 15000; const GOSSIP_PURGE_MILLIS: u64 = 15000;
@ -1254,7 +1254,7 @@ impl Crdt {
} }
pub fn spy_node() -> (NodeInfo, UdpSocket) { pub fn spy_node() -> (NodeInfo, UdpSocket) {
let gossip_socket = bind_in_range(SOLANA_PORT_RANGE).unwrap(); let gossip_socket = bind_in_range(FULLNODE_PORT_RANGE).unwrap();
let pubkey = Keypair::new().pubkey(); let pubkey = Keypair::new().pubkey();
let daddr = socketaddr_any!(); let daddr = socketaddr_any!();
@ -1317,7 +1317,7 @@ impl Node {
} }
pub fn new_with_external_ip(pubkey: Pubkey, ncp: &SocketAddr) -> Node { pub fn new_with_external_ip(pubkey: Pubkey, ncp: &SocketAddr) -> Node {
fn bind() -> (u16, UdpSocket) { fn bind() -> (u16, UdpSocket) {
match bind_in_range(SOLANA_PORT_RANGE) { match bind_in_range(FULLNODE_PORT_RANGE) {
Ok(socket) => (socket.local_addr().unwrap().port(), socket), Ok(socket) => (socket.local_addr().unwrap().port(), socket),
Err(err) => { Err(err) => {
panic!("Failed to bind err: {}", err); panic!("Failed to bind err: {}", err);
@ -1388,8 +1388,8 @@ fn report_time_spent(label: &str, time: &Duration, extra: &str) {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crdt::{ use crdt::{
Crdt, CrdtError, Node, NodeInfo, Protocol, GOSSIP_PURGE_MILLIS, GOSSIP_SLEEP_MILLIS, Crdt, CrdtError, Node, NodeInfo, Protocol, FULLNODE_PORT_RANGE, GOSSIP_PURGE_MILLIS,
MIN_TABLE_SIZE, SOLANA_PORT_RANGE, GOSSIP_SLEEP_MILLIS, MIN_TABLE_SIZE,
}; };
use entry::Entry; use entry::Entry;
use hash::{hash, Hash}; use hash::{hash, Hash};
@ -2065,16 +2065,16 @@ mod tests {
assert_eq!(node.sockets.transaction.local_addr().unwrap().ip(), ip); assert_eq!(node.sockets.transaction.local_addr().unwrap().ip(), ip);
assert_eq!(node.sockets.repair.local_addr().unwrap().ip(), ip); assert_eq!(node.sockets.repair.local_addr().unwrap().ip(), ip);
assert!(node.sockets.gossip.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.gossip.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.gossip.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.gossip.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
assert!(node.sockets.replicate.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.replicate.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.replicate.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.replicate.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
assert!(node.sockets.requests.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.requests.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.requests.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.requests.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
assert!(node.sockets.transaction.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.transaction.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.transaction.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.transaction.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
assert!(node.sockets.repair.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.repair.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.repair.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.repair.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
} }
#[test] #[test]
@ -2088,13 +2088,13 @@ mod tests {
assert_eq!(node.sockets.repair.local_addr().unwrap().ip(), ip); assert_eq!(node.sockets.repair.local_addr().unwrap().ip(), ip);
assert_eq!(node.sockets.gossip.local_addr().unwrap().port(), 8050); assert_eq!(node.sockets.gossip.local_addr().unwrap().port(), 8050);
assert!(node.sockets.replicate.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.replicate.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.replicate.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.replicate.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
assert!(node.sockets.requests.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.requests.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.requests.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.requests.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
assert!(node.sockets.transaction.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.transaction.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.transaction.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.transaction.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
assert!(node.sockets.repair.local_addr().unwrap().port() >= SOLANA_PORT_RANGE.0); assert!(node.sockets.repair.local_addr().unwrap().port() >= FULLNODE_PORT_RANGE.0);
assert!(node.sockets.repair.local_addr().unwrap().port() < SOLANA_PORT_RANGE.1); assert!(node.sockets.repair.local_addr().unwrap().port() < FULLNODE_PORT_RANGE.1);
} }
} }