Check content before zip/unzip the txhashset (#1174)

* Check txhashset content before zip/unzip
* Add header in txhashset verification
* Add copy function and test
* Add file util
* Now check and remove unexpected files instead of just crashing

util/src/file.rs

@@ -0,0 +1,64 @@
+// Copyright 2018 The Grin Developers
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+use std::fs;
+use std::io;
+use std::path::{Path, PathBuf};
+use walkdir::WalkDir;
+
+pub fn delete(path_buf: PathBuf) ->  io::Result<()>{
+	if path_buf.is_dir() {
+		fs::remove_dir_all(path_buf)
+	} else if path_buf.is_file() {
+		fs::remove_file(path_buf)
+	} else {
+        Ok(())
+    }
+}		
+
+pub fn copy_dir_to(src: &Path, dst: &Path) -> io::Result<u64> {
+	let mut counter = 0u64;
+	if !dst.is_dir() {
+		fs::create_dir(dst)?
+	}
+
+	for entry_result in src.read_dir()? {
+		let entry = entry_result?;
+		let file_type = entry.file_type()?;
+		let count = copy_to(&entry.path(), &file_type, &dst.join(entry.file_name()))?;
+		counter +=count;
+	}
+	Ok(counter)
+}
+
+pub fn list_files(path: String) -> Vec<String> {
+ 	let mut files_vec: Vec<String> = vec![];
+	for entry in WalkDir::new(Path::new(&path)).into_iter().filter_map(|e| e.ok()) {
+		match entry.file_name().to_str(){
+			Some(path_str) => files_vec.push(path_str.to_string()),
+			None => println!("Could not read optional type"),
+		}
+	}
+	return files_vec;
+}
+
+fn copy_to(src: &Path, src_type: &fs::FileType, dst: &Path) -> io::Result<u64> {
+	if src_type.is_file() {
+		fs::copy(src,dst)
+	} else if src_type.is_dir() {
+		copy_dir_to(src, dst)
+	} else {
+		return Err(io::Error::new(io::ErrorKind::Other, format!("Could not copy: {}", src.display())))
+	}
+}
+

util/src/lib.rs

@@ -64,6 +64,8 @@ pub use hex::*;
 
 /// Compress and decompress zip bz2 archives
 pub mod zip;
+/// File util
+pub mod file;
 
 /// Encapsulation of a RefCell<Option<T>> for one-time initialization after
 /// construction. This implementation will purposefully fail hard if not used

util/src/logger.rs

@@ -88,7 +88,7 @@ lazy_static! {
 	};
 }
 
-/// Initialises the logger with the given configuration
+/// Initialize the logger with the given configuration
 pub fn init_logger(config: Option<LoggingConfig>) {
 	if let Some(c) = config {
 		let mut config_ref = LOGGING_CONFIG.lock().unwrap();

util/src/zip.rs

@@ -97,4 +97,4 @@ where
 		}
 	}
 	Ok(())
-}
+}