cleanup

Author: Zoran Cvetkov

graph/src/components/store/write.rs

@@ -1017,30 +1017,29 @@ mod test {
 
             let value = value.clone();
             let key = THING_TYPE.parse_key("one").unwrap();
-            let vid = 0i64;
             match value {
                 Ins(block) => EntityModification::Insert {
                     key,
-                    data: Arc::new(entity! { SCHEMA => id: "one", count: block, vid: vid }),
+                    data: Arc::new(entity! { SCHEMA => id: "one", count: block }),
                     block,
                     end: None,
                 },
                 Ovw(block) => EntityModification::Overwrite {
                     key,
-                    data: Arc::new(entity! { SCHEMA => id: "one", count: block, vid: vid }),
+                    data: Arc::new(entity! { SCHEMA => id: "one", count: block }),
                     block,
                     end: None,
                 },
                 Rem(block) => EntityModification::Remove { key, block },
                 InsC(block, end) => EntityModification::Insert {
                     key,
-                    data: Arc::new(entity! { SCHEMA => id: "one", count: block, vid: vid }),
+                    data: Arc::new(entity! { SCHEMA => id: "one", count: block }),
                     block,
                     end: Some(end),
                 },
                 OvwC(block, end) => EntityModification::Overwrite {
                     key,
-                    data: Arc::new(entity! { SCHEMA => id: "one", count: block, vid: vid }),
+                    data: Arc::new(entity! { SCHEMA => id: "one", count: block }),
                     block,
                     end: Some(end),
                 },

graph/src/data/store/mod.rs

@@ -924,7 +924,7 @@ impl Entity {
         self.0.insert("vid", value.into())
     }
 
-    /// Sets the VID if not set. Should be used only for tests.
+    /// Sets the VID if it's not already set. Should be used only for tests.
     #[cfg(debug_assertions)]
     pub fn set_vid_if_empty(&mut self) {
         let vid = self.get("vid");

store/test-store/tests/postgres/aggregation.rs

@@ -82,7 +82,7 @@ pub async fn insert(
         .map(|mut data| {
             let data_type = schema.entity_type("Data").unwrap();
             let key = data_type.key(data.id());
-            let _ = data.set_vid_if_empty();
+            data.set_vid_if_empty();
             EntityOperation::Set { data, key }
         })
         .collect();