Rename Wallet's id to keypair

2019-04-02 07:08:11 -06:00
parent d228b6467c
commit dd4c512954
4 changed files with 82 additions and 67 deletions
--- a/wallet/src/main.rs
+++ b/wallet/src/main.rs
@@ -58,17 +58,17 @@ pub fn parse_args(matches: &ArgMatches<'_>) -> Result<WalletConfig, Box<dyn erro

        path.to_str().unwrap()
    };
-    let id = read_keypair(id_path).or_else(|err| {
+    let keypair = read_keypair(id_path).or_else(|err| {
        Err(WalletError::BadParameter(format!(
            "{}: Unable to open keypair file: {}",
            err, id_path
        )))
    })?;

-    let command = parse_command(&id.pubkey(), &matches)?;
+    let command = parse_command(&keypair.pubkey(), &matches)?;

    Ok(WalletConfig {
-        id,
+        keypair,
        command,
        drone_host,
        drone_port,