cleanup

Author: Zoran Cvetkov

core/src/subgraph/runner.rs

@@ -1585,7 +1585,7 @@ async fn update_proof_of_indexing(
             data.push((entity_cache.schema.poi_block_time(), block_time));
         }
         let poi = entity_cache.make_entity(data)?;
-        // VOI is autogenerated for POI table and our input is ignored
+        // VID is autogenerated for POI table and our input is ignored
         entity_cache.set(key, EntityV::new(poi, 0))
     }
 

graph/src/data/store/mod.rs

@@ -913,10 +913,12 @@ impl Entity {
         Id::try_from(self.get("id").unwrap().clone()).expect("the id is set to a valid value")
     }
 
-    // TODO: only for tests!
+    // TODO: try to use it only for tests!
+    // #[cfg(debug_assertions)]
     pub fn vid(&self) -> i64 {
         self.get("vid")
             .expect("the vid is set")
+            // .unwrap_or(&Value::Int8(0))
             .as_int8()
             .expect("the vid is set to a valid value")
     }
@@ -1087,7 +1089,7 @@ impl std::fmt::Debug for Entity {
     }
 }
 
-/// An entity is represented as a map of attribute names to values.
+/// An entity wrapper that has VID too.
 #[derive(Debug, Clone, CacheWeight, PartialEq, Eq, Serialize)]
 pub struct EntityV {
     pub e: Entity,

graph/src/schema/input/mod.rs

@@ -35,7 +35,7 @@ pub(crate) const POI_OBJECT: &str = "Poi$";
 const POI_DIGEST: &str = "digest";
 /// The name of the PoI attribute for storing the block time
 const POI_BLOCK_TIME: &str = "blockTime";
-const VID: &str = "vid";
+const VID_FIELD: &str = "vid";
 
 pub mod kw {
     pub const ENTITY: &str = "entity";
@@ -1488,10 +1488,6 @@ impl InputSchema {
     }
 
     pub fn has_field_with_name(&self, entity_type: &EntityType, field: &str) -> bool {
-        // TODO: check if it is needed
-        // if field == VID {
-        //     return true;
-        // }
         let field = self.inner.pool.lookup(field);
 
         match field {
@@ -1602,7 +1598,7 @@ fn atom_pool(document: &s::Document) -> AtomPool {
     pool.intern(POI_DIGEST);
     pool.intern(POI_BLOCK_TIME);
 
-    pool.intern(VID);
+    pool.intern(VID_FIELD);
 
     for definition in &document.definitions {
         match definition {

runtime/wasm/src/host_exports.rs

@@ -315,7 +315,6 @@ impl HostExports {
                 data.insert(store::ID.clone(), value);
             }
         }
-        // data.insert(store::VID.clone(), Value::Int8(vid));
 
         self.check_invalid_fields(
             self.data_source.api_version.clone(),

store/test-store/src/store.rs

@@ -106,16 +106,6 @@ lazy_static! {
     };
 }
 
-pub fn filter_vid(arr: Vec<Entity>) -> Vec<Entity> {
-    arr.into_iter()
-        .map(|mut e| {
-            e.remove("vid");
-            e.remove_null_fields();
-            e
-        })
-        .collect()
-}
-
 /// Run the `test` after performing `setup`. The result of `setup` is passed
 /// into `test`. All tests using `run_test_sequentially` are run in sequence,
 /// never in parallel. The `test` is passed a `Store`, but it is permissible

store/test-store/tests/core/interfaces.rs

@@ -1114,11 +1114,11 @@ async fn enums() {
     let entities = vec![
         (
             "Trajectory",
-            entity! { schema =>  id: "1", direction: "EAST", meters: 10, vid: 0i64},
+            entity! { schema =>  id: "1", direction: "EAST", meters: 10, vid: 0i64 },
         ),
         (
             "Trajectory",
-            entity! { schema =>  id: "2", direction: "NORTH", meters: 15, vid: 1i64},
+            entity! { schema =>  id: "2", direction: "NORTH", meters: 15, vid: 1i64 },
         ),
     ];
     let query = "query { trajectories { id, direction, meters } }";
@@ -1365,11 +1365,11 @@ async fn derived_interface_bytes() {
         ("Pool", entity! { schema =>  id: b("0xf001"), vid: 0i64 }),
         (
             "Sell",
-            entity! { schema =>  id: b("0xc0"), pool: "0xf001", vid: 0i64},
+            entity! { schema =>  id: b("0xc0"), pool: "0xf001", vid: 0i64 },
         ),
         (
             "Buy",
-            entity! { schema =>  id: b("0xb0"), pool: "0xf001", vid: 0i64},
+            entity! { schema =>  id: b("0xb0"), pool: "0xf001", vid: 0i64 },
         ),
     ];