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

Rebased on master

Browse Source
This commit is contained in:
Kristoffer Ström
2016-11-02 17:14:05 +01:00
committed by arkpar
parent 6552319074
commit 0e516162c3
6 changed files with 142 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parity/configuration.rs
View File

@@ -120,16 +120,12 @@ impl Configuration {
let cmd = if self.args.flag_version {
Cmd::Version
<<<<<<< HEAD
} else if self.args.cmd_signer && self.args.cmd_new_token {
Cmd::SignerToken(signer_conf)
=======
} else if self.args.cmd_signer {
let mut authfile = PathBuf::from(signer_conf.signer_path);
let mut authfile = PathBuf::from(signer_conf.signer_path.clone());
authfile.push(AUTHCODE_FILENAME);
if self.args.cmd_new_token {
Cmd::SignerToken(dirs.signer)
Cmd::SignerToken(signer_conf)
} else if self.args.cmd_sign {
let pwfile = self.args.flag_password.get(0).map(|pwfile| {
PathBuf::from(pwfile)
@@ -154,7 +150,6 @@ impl Configuration {
} else {
unreachable!();
}
>>>>>>> Add Ws Json rpc client and command line utils
} else if self.args.cmd_tools && self.args.cmd_hash {
Cmd::Hash(self.args.arg_file)
} else if self.args.cmd_account {