all: Rename EntityModification::entity_ref() to key()

Author: lutter

core/src/subgraph/runner.rs

@@ -452,7 +452,7 @@ where
         // If a deterministic error has happened, make the PoI to be the only entity that'll be stored.
         if has_errors && !is_non_fatal_errors_active {
             let is_poi_entity =
-                |entity_mod: &EntityModification| entity_mod.entity_ref().entity_type.is_poi();
+                |entity_mod: &EntityModification| entity_mod.key().entity_type.is_poi();
             mods.retain(is_poi_entity);
             // Confidence check
             assert!(

graph/src/components/store/write.rs

@@ -283,7 +283,7 @@ impl EntityModification {
         EntityModification::Remove { key, block }
     }
 
-    pub fn entity_ref(&self) -> &EntityKey {
+    pub fn key(&self) -> &EntityKey {
         use EntityModification::*;
         match self {
             Insert { key, .. } | Overwrite { key, .. } | Remove { key, .. } => key,
@@ -649,8 +649,7 @@ impl Batch {
         let mut mods = RowGroups::new();
 
         for m in raw_mods {
-            mods.group_entry(&m.entity_ref().entity_type)
-                .push(m, block)?;
+            mods.group_entry(&m.key().entity_type).push(m, block)?;
         }
 
         let data_sources = DataSources::new(block_ptr.cheap_clone(), data_sources);

runtime/test/src/test.rs

@@ -489,12 +489,7 @@ async fn run_ipfs_map(
             .modifications;
 
         // Bring the modifications into a predictable order (by entity_id)
-        mods.sort_by(|a, b| {
-            a.entity_ref()
-                .entity_id
-                .partial_cmp(&b.entity_ref().entity_id)
-                .unwrap()
-        });
+        mods.sort_by(|a, b| a.key().entity_id.partial_cmp(&b.key().entity_id).unwrap());
         Ok(mods)
     })
     .join()

store/test-store/tests/graph/entity_cache.rs

@@ -183,7 +183,7 @@ fn make_band_key(id: &'static str) -> EntityKey {
 }
 
 fn sort_by_entity_key(mut mods: Vec<EntityModification>) -> Vec<EntityModification> {
-    mods.sort_by_key(|m| m.entity_ref().clone());
+    mods.sort_by_key(|m| m.key().clone());
     mods
 }