grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:ethcore/parity into ark

Browse Source
This commit is contained in:
arkpar
2016-01-24 19:21:31 +01:00
parent cd250d4959 0e296e78bd
commit 02d33f6861
7 changed files with 68 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
util/src/network/host.rs
View File

@@ -42,7 +42,7 @@ pub struct NetworkConfiguration {
/// Pin to boot nodes only
pub pin: bool,
/// List of initial node addresses
pub boot_nodes: Option<Vec<String>>,
pub boot_nodes: Vec<String>,
/// Use provided node key instead of default
pub use_secret: Option<Secret>,
}
@@ -56,7 +56,7 @@ impl NetworkConfiguration {
nat_enabled: true,
discovery_enabled: true,
pin: false,
boot_nodes: None,
boot_nodes: Vec::new(),
use_secret: None,
}
}
@@ -304,16 +304,8 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
*/
let boot_nodes = host.info.read().unwrap().config.boot_nodes.clone();
if boot_nodes.is_none() {
// GO bootnodes
host.add_node("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303"); // IE
host.add_node("enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303"); // BR
host.add_node("enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303"); // SG
}
else {
for n in boot_nodes.unwrap() {
host.add_node(&n);
}
for n in boot_nodes {
host.add_node(&n);
}
host
}