matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor: Remove unneccessary functions

Browse source
This commit is contained in:
Matthias Beyer 2017-12-22 12:01:58 +01:00
parent 20a552f527
commit 35410aaa2e
1 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/core/libimagstore/src/store.rs
View file

@ -1067,7 +1067,16 @@ pub trait Header {
impl Header for Value { impl Header for Value {
fn verify(&self) -> Result<()> { fn verify(&self) -> Result<()> {
verify_header(self) if !has_main_section(self)? {
Err(SE::from_kind(SEK::MissingMainSection))
} else if !has_imag_version_in_main_section(self)? {
Err(SE::from_kind(SEK::MissingVersionInfo))
} else if !has_only_tables(self)? {
debug!("Could not verify that it only has tables in its base table");
Err(SE::from_kind(SEK::NonTableInBaseTable))
} else {
Ok(())
}
} }
fn parse(s: &str) -> Result<Value> { fn parse(s: &str) -> Result<Value> {
@ -1075,7 +1084,7 @@ impl Header for Value {
from_str(s) from_str(s)
.map_err(From::from) .map_err(From::from)
.and_then(verify_header_consistency) .and_then(|h: Value| h.verify().map(|_| h))
} }
fn default_header() -> Value { fn default_header() -> Value {
@ -1094,23 +1103,6 @@ impl Header for Value {
} }
fn verify_header_consistency(t: Value) -> Result<Value> {
verify_header(&t).chain_err(|| SEK::HeaderInconsistency).map(|_| t)
}
fn verify_header(t: &Value) -> Result<()> {
if !has_main_section(t)? {
Err(SE::from_kind(SEK::MissingMainSection))
} else if !has_imag_version_in_main_section(t)? {
Err(SE::from_kind(SEK::MissingVersionInfo))
} else if !has_only_tables(t)? {
debug!("Could not verify that it only has tables in its base table");
Err(SE::from_kind(SEK::NonTableInBaseTable))
} else {
Ok(())
}
}
fn has_only_tables(t: &Value) -> Result<bool> { fn has_only_tables(t: &Value) -> Result<bool> {
debug!("Verifying that table has only tables"); debug!("Verifying that table has only tables");
match *t { match *t {
@ -1142,9 +1134,9 @@ mod test {
use std::collections::BTreeMap; use std::collections::BTreeMap;
use storeid::StoreId; use storeid::StoreId;
use store::Header;
use store::has_main_section; use store::has_main_section;
use store::has_imag_version_in_main_section; use store::has_imag_version_in_main_section;
use store::verify_header_consistency;
use toml::Value; use toml::Value;
@ -1153,7 +1145,7 @@ mod test {
let mut map = BTreeMap::new(); let mut map = BTreeMap::new();
map.insert("imag".into(), Value::Table(BTreeMap::new())); map.insert("imag".into(), Value::Table(BTreeMap::new()));
assert!(has_main_section(&map)); assert!(has_main_section(&Value::Table(map)).unwrap());
} }
#[test] #[test]
@ -1169,7 +1161,7 @@ mod test {
let mut map = BTreeMap::new(); let mut map = BTreeMap::new();
map.insert("not_imag".into(), Value::Boolean(false)); map.insert("not_imag".into(), Value::Boolean(false));
assert!(!has_main_section(&map)); assert!(has_main_section(&Value::Table(map)).is_err());
} }
#[test] #[test]
@ -1177,7 +1169,7 @@ mod test {
let mut map = BTreeMap::new(); let mut map = BTreeMap::new();
map.insert("imag".into(), Value::Table(BTreeMap::new())); map.insert("imag".into(), Value::Table(BTreeMap::new()));
assert!(has_imag_version_in_main_section(&map).is_err()); assert!(has_imag_version_in_main_section(&Value::Table(map)).is_err());
} }
#[test] #[test]
@ -1187,7 +1179,7 @@ mod test {
sub.insert("version".into(), Value::String("0.0.0".into())); sub.insert("version".into(), Value::String("0.0.0".into()));
map.insert("imag".into(), Value::Table(sub)); map.insert("imag".into(), Value::Table(sub));
assert!(has_imag_version_in_main_section(&map)?); assert!(has_imag_version_in_main_section(&Value::Table(map)).unwrap());
} }
#[test] #[test]
@ -1197,7 +1189,7 @@ mod test {
sub.insert("version".into(), Value::Boolean(false)); sub.insert("version".into(), Value::Boolean(false));
map.insert("imag".into(), Value::Table(sub)); map.insert("imag".into(), Value::Table(sub));
assert!(has_imag_version_in_main_section(&map).is_err()); assert!(has_imag_version_in_main_section(&Value::Table(map)).is_err());
} }
#[test] #[test]
@ -1212,7 +1204,7 @@ mod test {
header.insert("imag".into(), sub); header.insert("imag".into(), sub);
assert!(verify_header_consistency(header).is_ok()); assert!(Value::Table(header).verify().is_ok());
} }
#[test] #[test]
@ -1227,7 +1219,7 @@ mod test {
header.insert("imag".into(), sub); header.insert("imag".into(), sub);
assert!(!verify_header_consistency(header).is_ok()); assert!(!Value::Table(header).verify().is_ok());
} }
@ -1243,7 +1235,7 @@ mod test {
header.insert("imag".into(), sub); header.insert("imag".into(), sub);
assert!(verify_header_consistency(header).is_ok()); assert!(Value::Table(header).verify().is_ok());
} }
static TEST_ENTRY : &'static str = "--- static TEST_ENTRY : &'static str = "---