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

Make --signer default. (#1392)

Browse Source
This commit is contained in:
Gav Wood 2016-06-22 21:32:17 +02:00 committed by GitHub
parent cb9b1e2ad5
commit e346cbc7f9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parity/cli.rs
View File

@ -116,7 +116,7 @@ API and Console Options:
--dapps-path PATH Specify directory where dapps should be installed. --dapps-path PATH Specify directory where dapps should be installed.
[default: $HOME/.parity/dapps] [default: $HOME/.parity/dapps]
--signer Enable Trusted Signer WebSocket endpoint used by --signer-off Disable Trusted Signer WebSocket endpoint used by
Signer UIs. Signer UIs.
--signer-port PORT Specify the port of Trusted Signer server --signer-port PORT Specify the port of Trusted Signer server
[default: 8180]. [default: 8180].
@ -274,7 +274,7 @@ pub struct Args {
pub flag_dapps_user: Option<String>, pub flag_dapps_user: Option<String>,
pub flag_dapps_pass: Option<String>, pub flag_dapps_pass: Option<String>,
pub flag_dapps_path: String, pub flag_dapps_path: String,
pub flag_signer: bool, pub flag_signer_off: bool,
pub flag_signer_port: u16, pub flag_signer_port: u16,
pub flag_signer_path: String, pub flag_signer_path: String,
pub flag_no_token: bool, pub flag_no_token: bool,

6
parity/configuration.rs
View File

@ -432,10 +432,10 @@ impl Configuration {
} }
pub fn signer_port(&self) -> Option<u16> { pub fn signer_port(&self) -> Option<u16> {
if self.args.flag_signer { if self.args.flag_signer_off {
Some(self.args.flag_signer_port)
} else {
None None
} else {
Some(self.args.flag_signer_port)
} }
} }
} }

2
parity/main.rs
View File

@ -192,7 +192,7 @@ fn execute_client(conf: Configuration, spec: Spec, client_config: ClientConfig)
let sync_config = conf.sync_config(&spec); let sync_config = conf.sync_config(&spec);
// Create and display a new token for UIs. // Create and display a new token for UIs.
if conf.args.flag_signer && !conf.args.flag_no_token { if !conf.args.flag_signer_off && !conf.args.flag_no_token {
new_token(conf.directories().signer).unwrap_or_else(|e| { new_token(conf.directories().signer).unwrap_or_else(|e| {
die!("Error generating token: {:?}", e) die!("Error generating token: {:?}", e)
}); });