From 1168ac0458c7e92f22d1c77bf31daea4e23ac750 Mon Sep 17 00:00:00 2001
From: Hristo Venev <hristo@venev.name>
Date: Fri, 7 Feb 2020 20:10:31 +0000
Subject: Load the preshared keys on startup.

---
 src/fileutil.rs | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'src/fileutil.rs')

diff --git a/src/fileutil.rs b/src/fileutil.rs
index 2c322c4..190a7d0 100644
--- a/src/fileutil.rs
+++ b/src/fileutil.rs
@@ -82,22 +82,13 @@ pub fn update(path: &Path, data: &[u8]) -> io::Result<()> {
 }
 
 #[inline]
-pub fn load(path: &impl AsRef<Path>) -> io::Result<Option<Vec<u8>>> {
+pub fn load(path: &impl AsRef<Path>) -> io::Result<Vec<u8>> {
     _load(path.as_ref())
 }
 
-fn _load(path: &Path) -> io::Result<Option<Vec<u8>>> {
-    let mut file = match fs::File::open(&path) {
-        Ok(file) => file,
-        Err(e) => {
-            if e.kind() == io::ErrorKind::NotFound {
-                return Ok(None);
-            }
-            return Err(e);
-        }
-    };
-
+fn _load(path: &Path) -> io::Result<Vec<u8>> {
+    let mut file = fs::File::open(&path)?;
     let mut data = Vec::new();
     io::Read::read_to_end(&mut file, &mut data)?;
-    Ok(Some(data))
+    Ok(data)
 }
-- 
cgit