Record format generalization

Currently, tombstone counting is bugged. But the rest of it appears to
be working.

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/internal_level_tests.cpp b/tests/internal_level_tests.cpp
index 7e542e6..7842b01 100644
--- a/tests/internal_level_tests.cpp
+++ b/tests/internal_level_tests.cpp
@@ -20,19 +20,19 @@ using namespace de;
 
 START_TEST(t_memlevel_merge)
 {
-    auto tbl1 = create_test_mbuffer<uint64_t, uint32_t, uint64_t>(100);
-    auto tbl2 = create_test_mbuffer<uint64_t, uint32_t, uint64_t>(100);
+    auto tbl1 = create_test_mbuffer<WRec>(100);
+    auto tbl2 = create_test_mbuffer<WRec>(100);
 
-    auto base_level = new WeightedLevel(1, 1, false);
+    auto base_level = new InternalLevel<WRec>(1, 1, false);
     base_level->append_mem_table(tbl1, g_rng);
     ck_assert_int_eq(base_level->get_record_cnt(), 100);
 
-    auto merging_level = new WeightedLevel(0, 1, false);
+    auto merging_level = new InternalLevel<WRec>(0, 1, false);
     merging_level->append_mem_table(tbl2, g_rng);
     ck_assert_int_eq(merging_level->get_record_cnt(), 100);
 
     auto old_level = base_level;
-    base_level = WeightedLevel::merge_levels(old_level, merging_level, false, g_rng);
+    base_level = InternalLevel<WRec>::merge_levels(old_level, merging_level, false, g_rng);
 
     delete old_level;
     delete merging_level;
@@ -44,11 +44,11 @@ START_TEST(t_memlevel_merge)
 }
 
 
-WeightedLevel *create_test_memlevel(size_t reccnt) {
-    auto tbl1 = create_test_mbuffer<uint64_t, uint32_t, uint64_t>(reccnt/2);
-    auto tbl2 = create_test_mbuffer<uint64_t, uint32_t, uint64_t>(reccnt/2);
+InternalLevel<WRec> *create_test_memlevel(size_t reccnt) {
+    auto tbl1 = create_test_mbuffer<WRec>(reccnt/2);
+    auto tbl2 = create_test_mbuffer<WRec>(reccnt/2);
 
-    auto base_level = new WeightedLevel(1, 2, false);
+    auto base_level = new InternalLevel<WRec>(1, 2, false);
     base_level->append_mem_table(tbl1, g_rng);
     base_level->append_mem_table(tbl2, g_rng);