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

Merge branch 'master' into engine-password

Browse Source
This commit is contained in:
keorn
2016-12-05 17:08:57 +00:00
parent 529a7fc33c a726472023
commit 81a756394a
17 changed files with 35 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parity/cli/mod.rs
View File

@@ -48,7 +48,7 @@ usage! {
flag_testnet: bool,
flag_import_geth_keys: bool,
flag_datadir: Option<String>,
flag_networkid: Option<usize>,
flag_networkid: Option<u64>,
flag_peers: Option<u16>,
flag_nodekey: Option<String>,
flag_nodiscover: bool,
@@ -122,7 +122,7 @@ usage! {
or |c: &Config| otry!(c.network).nat.clone(),
flag_allow_ips: String = "all",
or |c: &Config| otry!(c.network).allow_ips.clone(),
flag_network_id: Option<usize> = None,
flag_network_id: Option<u64> = None,
or |c: &Config| otry!(c.network).id.clone().map(Some),
flag_bootnodes: Option<String> = None,
or |c: &Config| otry!(c.network).bootnodes.clone().map(|vec| Some(vec.join(","))),
@@ -328,7 +328,7 @@ struct Network {
max_pending_peers: Option<u16>,
nat: Option<String>,
allow_ips: Option<String>,
id: Option<usize>,
id: Option<u64>,
bootnodes: Option<Vec<String>>,
discovery: Option<bool>,
node_key: Option<String>,

2
parity/configuration.rs
View File

@@ -527,7 +527,7 @@ impl Configuration {
Ok(ret)
}
fn network_id(&self) -> Option<usize> {
fn network_id(&self) -> Option<u64> {
self.args.flag_network_id.or(self.args.flag_networkid)
}