summaryrefslogtreecommitdiffstats
path: root/src/app.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/app.cpp')
-rw-r--r--src/app.cpp23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/app.cpp b/src/app.cpp
index 871222f..29f84f7 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -79,28 +79,7 @@ struct result<surface_id_to_layer_map>
std::ifstream i(filename);
i >> jids;
- auto m = to_surface_id_to_layer_map(jids["mappings"]);
-
- if (m.is_ok()) {
- auto i = m.unwrap();
-
- auto jtests = jids.value("tests", json());
-
- std::vector<std::pair<int, int>> tests;
- std::transform(std::cbegin(jtests), std::cend(jtests),
- std::back_inserter(tests), [](json const &j) {
- return std::make_pair(get<int>(j["surface_id"]),
- get<int>(j["expect_layer_id"]));
- });
-
- for (auto sid : tests) {
- if (i.get_layer_for_surface(sid.first).value_or(-1) != sid.second) {
- return Err<surface_id_to_layer_map>("ID Map embedded test failed!");
- }
- }
- }
-
- return m;
+ return to_surface_id_to_layer_map(jids);
}
} // namespace