Removed deprecated keystore code.

src/keystore.rs

@@ -73,32 +73,6 @@ impl Keystore {
         let path = Path::new(filename);
         match fs::read(&path) {
             Ok(key) => {
-                return match key.len() {
-                    32 => {
-                        let mut keystore = Keystore::from_random_bytes(key.as_slice());
-                        keystore.path = path.to_str().unwrap().to_owned();
-                        keystore.old = true;
-                        let bytes = Bytes::from_bytes(&keystore.keypair.public.to_bytes());
-                        if check_public_key_strength(&bytes, KEYSTORE_DIFFICULTY) {
-                            warn!("Loaded key from OLD format! Please, resave it!");
-                            Some(keystore)
-                        } else {
-                            None
-                        }
-                    }
-                    64 => {
-                        let mut keystore = Self::from_bytes(key.as_slice());
-                        keystore.path = path.to_str().unwrap().to_owned();
-                        keystore.old = true;
-                        let bytes = Bytes::from_bytes(&keystore.keypair.public.to_bytes());
-                        if check_public_key_strength(&bytes, KEYSTORE_DIFFICULTY) {
-                            warn!("Loaded key from OLD format! Please, resave it!");
-                            Some(keystore)
-                        } else {
-                            None
-                        }
-                    }
-                    _ => {
                 match toml::from_slice::<Keys>(key.as_slice()) {
                     Ok(keys) => {
                         let secret = SecretKey::from_bytes(&from_hex(&keys.signing.secret).unwrap()).unwrap();
@@ -119,8 +93,6 @@ impl Keystore {
                     }
                 }
             }
-                }
-            }
             Err(_) => {
                 None
             }

src/main.rs

@@ -131,13 +131,6 @@ fn main() {
                 }
             }
         }
-    } else {
-        match Keystore::from_file(&settings.key_file, "") {
-            None => { warn!("Error loading keyfile from {}", &settings.key_file); }
-            Some(keystore) => {
-                keys.push(keystore);
-            }
-        }
     }
     let context = Context::new(env!("CARGO_PKG_VERSION").to_owned(), settings, keys, chain);
     let context: Arc<Mutex<Context>> = Arc::new(Mutex::new(context));

src/settings.rs

@@ -11,9 +11,6 @@ use crate::Bytes;
 pub struct Settings {
     #[serde(default)]
     pub origin: String,
-    #[serde(default)]
-    #[deprecated]
-    pub key_file: String,
     #[serde(default = "default_key_files")]
     pub key_files: Vec<String>,
     #[serde(default = "default_check_blocks")]
@@ -56,7 +53,6 @@ impl Default for Settings {
     fn default() -> Self {
         Self {
             origin: String::from("0000001D2A77D63477172678502E51DE7F346061FF7EB188A2445ECA3FC0780E"),
-            key_file: String::default(),
             key_files: default_key_files(),
             check_blocks: default_check_blocks(),
             net: Net::default(),