Adjusted the way that Wrapping records works to clean up interfaces

1 files changed, 15 insertions, 15 deletions

diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp
index 3a80a9e..ba4b754 100644
--- a/tests/wirs_tests.cpp
+++ b/tests/wirs_tests.cpp
@@ -17,39 +17,39 @@
 
 using namespace de;
 
-typedef WIRS<WrappedWRec> Shard;
+typedef WIRS<WRec> Shard;
 
 START_TEST(t_mbuffer_init)
 {
-    auto mem_table = new MutableBuffer<WrappedWRec>(1024, true, 1024);
+    auto buffer = new MutableBuffer<WRec>(1024, true, 1024);
     for (uint64_t i = 512; i > 0; i--) {
         uint32_t v = i;
-        mem_table->append({i,v, 1});
+        buffer->append({i,v, 1});
     }
     
     for (uint64_t i = 1; i <= 256; ++i) {
         uint32_t v = i;
-        mem_table->append({i, v, 1, 1});
+        buffer->append({i, v, 1}, true);
     }
 
     for (uint64_t i = 257; i <= 512; ++i) {
         uint32_t v = i + 1;
-        mem_table->append({i, v, 1});
+        buffer->append({i, v, 1});
     }
 
-    Shard* shard = new Shard(mem_table);
+    Shard* shard = new Shard(buffer);
     ck_assert_uint_eq(shard->get_record_count(), 512);
 
-    delete mem_table;
+    delete buffer;
     delete shard;
 }
 
 START_TEST(t_wirs_init)
 {
     size_t n = 512;
-    auto mbuffer1 = create_test_mbuffer<WrappedWRec>(n);
-    auto mbuffer2 = create_test_mbuffer<WrappedWRec>(n);
-    auto mbuffer3 = create_test_mbuffer<WrappedWRec>(n);
+    auto mbuffer1 = create_test_mbuffer<WRec>(n);
+    auto mbuffer2 = create_test_mbuffer<WRec>(n);
+    auto mbuffer3 = create_test_mbuffer<WRec>(n);
 
     auto shard1 = new Shard(mbuffer1);
     auto shard2 = new Shard(mbuffer2);
@@ -73,11 +73,11 @@ START_TEST(t_wirs_init)
 
         auto cur_rec = shard4->get_record_at(i);
 
-        if (shard1_idx < n && *cur_rec == *rec1) {
+        if (shard1_idx < n && cur_rec->rec == rec1->rec) {
             ++shard1_idx;
-        } else if (shard2_idx < n && *cur_rec == *rec2) {
+        } else if (shard2_idx < n && cur_rec->rec == rec2->rec) {
             ++shard2_idx;
-        } else if (shard3_idx < n && *cur_rec == *rec3) {
+        } else if (shard3_idx < n && cur_rec->rec == rec3->rec) {
             ++shard3_idx;
         } else {
            assert(false);
@@ -123,8 +123,8 @@ START_TEST(t_get_lower_bound_index)
 START_TEST(t_full_cancelation)
 {
     size_t n = 100;
-    auto buffer = create_double_seq_mbuffer<WrappedWRec>(n, false);
-    auto buffer_ts = create_double_seq_mbuffer<WrappedWRec>(n, true);
+    auto buffer = create_double_seq_mbuffer<WRec>(n, false);
+    auto buffer_ts = create_double_seq_mbuffer<WRec>(n, true);
 
     Shard* shard = new Shard(buffer);
     Shard* shard_ts = new Shard(buffer_ts);