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

fullnode-config no longer depends on src/

Browse Source
This commit is contained in:
Michael Vines
2018-12-14 17:42:46 -08:00
parent eedc8c7812
commit 5bf9a20d42
13 changed files with 118 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fullnode/Cargo.toml
View File

@@ -11,10 +11,13 @@ homepage = "https://solana.com/"
clap = "2.32.0"
log = "0.4.2"
rayon = "1.0.3"
reqwest = "0.9.0"
serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" }
solana-drone = { path = "../drone", version = "0.11.0" }
solana-fullnode-config = { path = "../fullnode-config", version = "0.11.0" }
solana-logger = { path = "../logger", version = "0.11.0" }
solana-netutil = { path = "../netutil", version = "0.11.0" }
solana-metrics = { path = "../metrics", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" }

40
fullnode/src/main.rs
View File

@@ -1,20 +1,10 @@
#[macro_use]
extern crate clap;
#[macro_use]
extern crate log;
use serde_json;
#[macro_use]
extern crate solana;
use solana_metrics;
use clap::{App, Arg};
use clap::{crate_version, App, Arg};
use log::*;
use solana::client::mk_client;
use solana::cluster_info::{Node, FULLNODE_PORT_RANGE};
use solana::fullnode::{Config, Fullnode, FullnodeReturnType};
use solana::cluster_info::{Node, NodeInfo, FULLNODE_PORT_RANGE};
use solana::fullnode::{Fullnode, FullnodeReturnType};
use solana::leader_scheduler::LeaderScheduler;
use solana::netutil::find_available_port_in_range;
use solana::socketaddr;
use solana::thin_client::poll_gossip_for_leader;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::vote_program::VoteProgram;
@@ -82,12 +72,20 @@ fn main() {
let (keypair, vote_account_keypair, gossip) = if let Some(i) = matches.value_of("identity") {
let path = i.to_string();
if let Ok(file) = File::open(path.clone()) {
let parse: serde_json::Result<Config> = serde_json::from_reader(file);
if let Ok(data) = parse {
let parse: serde_json::Result<solana_fullnode_config::Config> =
serde_json::from_reader(file);
if let Ok(config_data) = parse {
let keypair = config_data.keypair();
let node_info = NodeInfo::new_with_pubkey_socketaddr(
keypair.pubkey(),
&config_data.bind_addr(FULLNODE_PORT_RANGE.0),
);
(
data.keypair(),
data.vote_account_keypair(),
data.node_info.gossip,
keypair,
config_data.vote_account_keypair(),
node_info.gossip,
)
} else {
eprintln!("failed to parse {}", path);
@@ -131,7 +129,7 @@ fn main() {
}
Some(port_number)
} else {
match find_available_port_in_range(FULLNODE_PORT_RANGE) {
match solana_netutil::find_available_port_in_range(FULLNODE_PORT_RANGE) {
Ok(port) => Some(port),
Err(_) => None,
}