Remove legacy key upgrading

Author: paulhauner

account_manager/Cargo.toml

@@ -26,6 +26,6 @@ clap_utils = { path = "../common/clap_utils" }
 eth2_wallet = { path = "../crypto/eth2_wallet" }
 eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
 rand = "0.7.2"
-validator_dir = { path = "../common/validator_dir", features = ["unencrypted_keys"] }
+validator_dir = { path = "../common/validator_dir" }
 tokio = { version = "0.2.21", features = ["full"] }
 eth2_keystore = { path = "../crypto/eth2_keystore" }

account_manager/src/lib.rs

@@ -1,5 +1,4 @@
 mod common;
-pub mod upgrade_legacy_keypairs;
 pub mod validator;
 pub mod wallet;
 
@@ -19,15 +18,13 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
         .about("Utilities for generating and managing Ethereum 2.0 accounts.")
         .subcommand(wallet::cli_app())
         .subcommand(validator::cli_app())
-        .subcommand(upgrade_legacy_keypairs::cli_app())
 }
 
 /// Run the account manager, returning an error if the operation did not succeed.
 pub fn run<T: EthSpec>(matches: &ArgMatches<'_>, env: Environment<T>) -> Result<(), String> {
     match matches.subcommand() {
         (wallet::CMD, Some(matches)) => wallet::cli_run(matches)?,
         (validator::CMD, Some(matches)) => validator::cli_run(matches, env)?,
-        (upgrade_legacy_keypairs::CMD, Some(matches)) => upgrade_legacy_keypairs::cli_run(matches)?,
         (unknown, _) => {
             return Err(format!(
                 "{} is not a valid {} command. See --help.",

account_manager/src/upgrade_legacy_keypairs.rs

@@ -5,7 +5,6 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [features]
-unencrypted_keys = []
 insecure_keys = []
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

common/validator_dir/Cargo.toml

@@ -10,7 +10,6 @@
 mod builder;
 pub mod insecure_keys;
 mod manager;
-pub mod unencrypted_keys;
 mod validator_dir;
 
 pub use crate::validator_dir::{Error, Eth1DepositData, ValidatorDir, ETH1_DEPOSIT_TX_HASH_FILE};

common/validator_dir/src/lib.rs

@@ -1,7 +1,6 @@
 #![cfg(not(debug_assertions))]
 
 use account_manager::{
-    upgrade_legacy_keypairs::{CMD as UPGRADE_CMD, *},
     validator::{create::*, CMD as VALIDATOR_CMD},
     wallet::{
         create::{CMD as CREATE_CMD, *},
@@ -16,7 +15,6 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Output};
 use std::str::from_utf8;
 use tempfile::{tempdir, TempDir};
-use types::Keypair;
 use validator_dir::ValidatorDir;
 
 // TODO: create tests for the `lighthouse account validator deposit` command. This involves getting
@@ -365,56 +363,3 @@ fn validator_create() {
 
     assert_eq!(dir_child_count(validator_dir.path()), 6);
 }
-
-fn write_legacy_keypair<P: AsRef<Path>>(name: &str, dir: P) -> Keypair {
-    let keypair = Keypair::random();
-
-    let mut keypair_bytes = keypair.pk.serialize().to_vec();
-    keypair_bytes.extend_from_slice(keypair.sk.serialize().as_ref());
-
-    fs::write(dir.as_ref().join(name), &keypair_bytes).unwrap();
-
-    keypair
-}
-
-#[test]
-fn upgrade_legacy_keypairs() {
-    let validators_dir = tempdir().unwrap();
-    let secrets_dir = tempdir().unwrap();
-
-    let validators = (0..2)
-        .into_iter()
-        .map(|i| {
-            let validator_dir = validators_dir.path().join(format!("myval{}", i));
-
-            fs::create_dir_all(&validator_dir).unwrap();
-
-            let voting_keypair = write_legacy_keypair(VOTING_KEYPAIR_FILE, &validator_dir);
-            let withdrawal_keypair = write_legacy_keypair(WITHDRAWAL_KEYPAIR_FILE, &validator_dir);
-
-            (validator_dir, voting_keypair, withdrawal_keypair)
-        })
-        .collect::<Vec<_>>();
-
-    account_cmd()
-        .arg(UPGRADE_CMD)
-        .arg(format!("--{}", VALIDATOR_DIR_FLAG))
-        .arg(validators_dir.path().as_os_str())
-        .arg(format!("--{}", SECRETS_DIR_FLAG))
-        .arg(secrets_dir.path().as_os_str())
-        .output()
-        .unwrap();
-
-    for (validator_dir, voting_keypair, withdrawal_keypair) in validators {
-        let dir = ValidatorDir::open(&validator_dir).unwrap();
-
-        assert_eq!(
-            voting_keypair.pk,
-            dir.voting_keypair(secrets_dir.path()).unwrap().pk
-        );
-        assert_eq!(
-            withdrawal_keypair.pk,
-            dir.withdrawal_keypair(secrets_dir.path()).unwrap().pk
-        );
-    }
-}