From 3e7edb2665363f482ab909b54c49219d5104a897 Mon Sep 17 00:00:00 2001 From: arkpar Date: Fri, 24 Jun 2016 14:29:15 +0200 Subject: [PATCH] More cases --- parity/cli.rs | 4 ++-- parity/configuration.rs | 2 +- parity/main.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parity/cli.rs b/parity/cli.rs index 0133ca0fb..12ec8344f 100644 --- a/parity/cli.rs +++ b/parity/cli.rs @@ -117,9 +117,9 @@ API and Console Options: [default: $HOME/.parity/dapps] --signer Enable Trusted Signer WebSocket endpoint used by - Signer UIs. Default if no command is specified. - --no-signer Disable Trusted Signer WebSocket endpoint used by Signer UIs. Default if run with ui command. + --no-signer Disable Trusted Signer WebSocket endpoint used by + Signer UIs. Default if no command is specified. --signer-port PORT Specify the port of Trusted Signer server [default: 8180]. --signer-path PATH Specify directory where Signer UIs tokens should diff --git a/parity/configuration.rs b/parity/configuration.rs index 925d2041c..d92e50a41 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -441,7 +441,7 @@ impl Configuration { } pub fn signer_port(&self) -> Option { - if !self.args.flag_signer { + if !self.signer_enabled() { None } else { Some(self.args.flag_signer_port) diff --git a/parity/main.rs b/parity/main.rs index 84f144396..7d39143cb 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -278,7 +278,7 @@ fn execute_client(conf: Configuration, spec: Spec, client_config: ClientConfig) // Set up a signer let signer_server = signer::start(signer::Configuration { - enabled: deps_for_rpc_apis.signer_port.is_some(), + enabled: conf.signer_enabled(), port: conf.args.flag_signer_port, signer_path: conf.directories().signer, }, signer::Dependencies {