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

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

Browse Source
This commit is contained in:
arkpar 2016-02-11 14:08:56 +01:00
commit 64b15cdbc0
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,12 @@
# Contributing to Parity
## License
By contributing to Parity, you agree that your contributions will be
licensed under the [BSD License](LICENSE).
At the top of every source code file you alter, after the initial
licence section, please append a second section that reads:
Portions contributed by YOUR NAME are hereby placed under the BSD licence.

3
ethcore/src/service.rs
View File

@ -133,7 +133,8 @@ mod tests {
#[test] #[test]
fn it_can_be_started() { fn it_can_be_started() {
let spec = get_test_spec(); let spec = get_test_spec();
let service = ClientService::start(spec, NetworkConfiguration::new()); let temp_path = RandomTempPath::new();
let service = ClientService::start(spec, NetworkConfiguration::new(), &temp_path.as_path());
assert!(service.is_ok()); assert!(service.is_ok());
} }
} }

2
install-deps.sh
View File

@ -688,7 +688,7 @@ function run_installer()
info "- Run tests with:" info "- Run tests with:"
info " ${b}cargo test --release --features ethcore/json-tests -p ethcore${reset}" info " ${b}cargo test --release --features ethcore/json-tests -p ethcore${reset}"
info "- Install the client with:" info "- Install the client with:"
info " ${b}sudo cp parity/target/release/parity${reset}" info " ${b}sudo cp parity/target/release/parity${reset} /usr/local/bin"
echo echo
} }

5
parity/main.rs
View File

@ -55,13 +55,14 @@ Parity. Ethereum Client.
Copyright 2015, 2016 Ethcore (UK) Limited Copyright 2015, 2016 Ethcore (UK) Limited
Usage: Usage:
parity [options] [ <enode>... ] parity [options] [ --no-bootstrap | <enode>... ]
Options: Options:
--chain CHAIN Specify the blockchain type. CHAIN may be either a JSON chain specification file --chain CHAIN Specify the blockchain type. CHAIN may be either a JSON chain specification file
or frontier, mainnet, morden, or testnet [default: frontier]. or frontier, mainnet, morden, or testnet [default: frontier].
-d --db-path PATH Specify the database & configuration directory path [default: $HOME/.parity] -d --db-path PATH Specify the database & configuration directory path [default: $HOME/.parity]
--no-bootstrap Don't bother trying to connect to any nodes initially.
--listen-address URL Specify the IP/port on which to listen for peers [default: 0.0.0.0:30304]. --listen-address URL Specify the IP/port on which to listen for peers [default: 0.0.0.0:30304].
--public-address URL Specify the IP/port on which peers may connect [default: 0.0.0.0:30304]. --public-address URL Specify the IP/port on which peers may connect [default: 0.0.0.0:30304].
--address URL Equivalent to --listen-address URL --public-address URL. --address URL Equivalent to --listen-address URL --public-address URL.
@ -145,11 +146,13 @@ impl Configuration {
} }
fn init_nodes(&self, spec: &Spec) -> Vec<String> { fn init_nodes(&self, spec: &Spec) -> Vec<String> {
if self.args.flag_no_bootstrap { Vec::new() } else {
match self.args.arg_enode.len() { match self.args.arg_enode.len() {
0 => spec.nodes().clone(), 0 => spec.nodes().clone(),
_ => self.args.arg_enode.clone(), _ => self.args.arg_enode.clone(),
} }
} }
}
fn net_addresses(&self) -> (SocketAddr, SocketAddr) { fn net_addresses(&self) -> (SocketAddr, SocketAddr) {
let listen_address; let listen_address;