Fix some remaining hash violations

Author: TrueDoctor

editor/src/messages/portfolio/document/utility_types/network_interface/memo_network.rs

@@ -1,6 +1,5 @@
 use graph_craft::document::NodeNetwork;
 use std::cell::Cell;
-use std::hash::{Hash, Hasher};
 
 #[derive(Debug, Default, Clone, PartialEq)]
 pub struct MemoNetwork {
@@ -26,9 +25,9 @@ impl serde::Serialize for MemoNetwork {
 	}
 }
 
-impl Hash for MemoNetwork {
-	fn hash<H: Hasher>(&self, state: &mut H) {
-		self.current_hash().hash(state);
+impl core_types::CacheHash for MemoNetwork {
+	fn cache_hash<H: ::core::hash::Hasher>(&self, state: &mut H) {
+		self.current_hash().cache_hash(state);
 	}
 }
 

node-graph/graph-craft/src/document.rs

@@ -546,29 +546,34 @@ pub struct NodeNetwork {
 	pub generated: bool,
 }
 
-impl Hash for NodeNetwork {
-	fn hash<H: Hasher>(&self, state: &mut H) {
-		self.exports.hash(state);
+impl core_types::CacheHash for NodeNetwork {
+	fn cache_hash<H: ::core::hash::Hasher>(&self, state: &mut H) {
+		use core_types::CacheHash;
+		self.exports.cache_hash(state);
 		let mut nodes: Vec<_> = self.nodes.iter().collect();
 		nodes.sort_by_key(|(id, _)| *id);
 		for (id, node) in nodes {
-			id.hash(state);
-			node.hash(state);
+			id.cache_hash(state);
+			node.cache_hash(state);
 		}
 	}
 }
 
 impl PartialEq for NodeNetwork {
 	fn eq(&self, other: &Self) -> bool {
-		self.exports == other.exports
+		self.exports == other.exports && self.nodes == other.nodes && self.scope_injections == other.scope_injections
 	}
 }
 
 /// Graph modification functions
 impl NodeNetwork {
 	pub fn current_hash(&self) -> u64 {
-		use std::hash::BuildHasher;
-		FxBuildHasher.hash_one(self)
+		use core_types::graphene_hash::CacheHash;
+		use rustc_hash::FxHasher;
+		use std::hash::Hasher;
+		let mut hasher = FxHasher::default();
+		self.cache_hash(&mut hasher);
+		hasher.finish()
 	}
 
 	pub fn value_network(node: DocumentNode) -> Self {

node-graph/graph-craft/src/document/value.rs

@@ -517,22 +517,10 @@ impl CacheHash for RenderOutputType {
 	}
 }
 
-impl Hash for RenderOutputType {
-	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-		CacheHash::cache_hash(self, state);
-	}
-}
-
 // Metadata is excluded because it's editor-side auxiliary data (click targets, transforms)
 // that shouldn't affect render cache invalidation, and it contains HashMaps with non-deterministic iteration order
 impl CacheHash for RenderOutput {
 	fn cache_hash<H: core::hash::Hasher>(&self, state: &mut H) {
 		self.data.cache_hash(state);
 	}
 }
-
-impl Hash for RenderOutput {
-	fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-		CacheHash::cache_hash(self, state);
-	}
-}

node-graph/nodes/gcore/src/context_modification.rs

@@ -51,9 +51,10 @@ async fn context_modification<T>(
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use core_types::graphene_hash::CacheHash;
 	use core_types::transform::Footprint;
 	use std::collections::hash_map::DefaultHasher;
-	use std::hash::{Hash, Hasher};
+	use std::hash::Hasher;
 
 	/// Test that the hash of a nullified context remains stable even when nullified inputs change
 	#[test]
@@ -77,9 +78,9 @@ mod tests {
 		// Create nullified context - this should only keep features specified in features_to_keep
 		let nullified_ctx = OwnedContextImpl::from_flags(original_ctx.clone().unwrap(), features_to_keep);
 
-		// Calculate hash of nullified context
+		// Calculate cache hash of nullified context
 		let mut hasher1 = DefaultHasher::new();
-		nullified_ctx.hash(&mut hasher1);
+		nullified_ctx.cache_hash(&mut hasher1);
 		let hash1 = hasher1.finish();
 
 		// Create a different original context with changed values
@@ -96,7 +97,7 @@ mod tests {
 		let nullified_changed_ctx = OwnedContextImpl::from_flags(changed_ctx.clone().unwrap(), features_to_keep);
 
 		let mut hasher2 = DefaultHasher::new();
-		nullified_changed_ctx.hash(&mut hasher2);
+		nullified_changed_ctx.cache_hash(&mut hasher2);
 		let hash2 = hasher2.finish();
 
 		// Hash should be the same because all features were nullified
@@ -109,11 +110,11 @@ mod tests {
 		let partial_nullified2 = OwnedContextImpl::from_flags(changed_ctx.clone().unwrap(), partial_features);
 
 		let mut hasher3 = DefaultHasher::new();
-		partial_nullified1.hash(&mut hasher3);
+		partial_nullified1.cache_hash(&mut hasher3);
 		let hash3 = hasher3.finish();
 
 		let mut hasher4 = DefaultHasher::new();
-		partial_nullified2.hash(&mut hasher4);
+		partial_nullified2.cache_hash(&mut hasher4);
 		let hash4 = hasher4.finish();
 
 		// These should be the same because both have the same footprint (Footprint::default()) and varargs