Fix tests

Author: adamgerhant

node-graph/gcore/src/memo.rs

@@ -93,9 +93,12 @@ where
 
 		drop(cache_guard);
 
+		let fut = self.node.eval(input);
+		let cache = self.cache.clone();
+
 		Box::pin(async move {
-			let value = self.node.eval(input).await;
-			*self.cache.lock().unwrap() = Some((hash, Arc::new(value.clone())));
+			let value = fut.await;
+			*cache.lock().unwrap() = Some((hash, Arc::new(value.clone())));
 			value
 		})
 	}

node-graph/gcore/src/vector/algorithms/instance.rs

@@ -1,12 +1,12 @@
 use crate::instances::{InstanceRef, Instances};
 use crate::raster_types::{CPU, RasterDataTable};
 use crate::vector::VectorDataTable;
-use crate::{ Context, Ctx, ExtractIndex, ExtractVarArgs, GraphicElement, GraphicGroupTable, WithIndex};
+use crate::{Context, Ctx, ExtractIndex, ExtractVarArgs, GraphicElement, GraphicGroupTable, WithIndex};
 use glam::DVec2;
 
 #[node_macro::node(name("Instance on Points"), category("Instancing"), path(graphene_core::vector))]
 async fn instance_on_points<T: Into<GraphicElement> + Default + Send + Clone + 'static>(
-	ctx: impl Ctx + WithIndex,
+	ctx: impl Ctx + WithIndex + Sync,
 	points: VectorDataTable,
 	#[implementations(
 		Context -> GraphicGroupTable,

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

@@ -397,7 +397,6 @@ impl Display for TaggedValue {
 
 pub struct UpcastNode {
 	value: MemoHash<TaggedValue>,
-	inspected: Cell<bool>,
 }
 impl<'input> Node<'input, DAny<'input>> for UpcastNode {
 	type Output = FutureAny<'input>;
@@ -407,13 +406,12 @@ impl<'input> Node<'input, DAny<'input>> for UpcastNode {
 	}
 
 	fn introspect(&self) -> graphene_core::memo::MonitorIntrospectResult {
-		let inspected = self.inspected.replace(true);
-		graphene_core::memo::MonitorIntrospectResult::Evaluated((Arc::new(self.value.clone().into_inner()) as Arc<dyn std::any::Any + Send + Sync>, !inspected))
+		graphene_core::memo::MonitorIntrospectResult::Evaluated((Arc::new(self.value.clone().into_inner()) as Arc<dyn std::any::Any + Send + Sync>, true))
 	}
 }
 impl UpcastNode {
 	pub fn new(value: MemoHash<TaggedValue>) -> Self {
-		Self { value, inspected: Cell::new(false) }
+		Self { value }
 	}
 }
 #[derive(Default, Debug, Clone, Copy)]

node-graph/graphene-cli/src/main.rs

@@ -180,7 +180,7 @@ fn compile_graph(document_string: String, application_io: Arc<WasmApplicationIo>
 	let mut network = load_network(&document_string);
 	fix_nodes(&mut network);
 
-	let substitutions: std::collections::HashMap<String, DocumentNode> = preprocessor::generate_node_substitutions();
+	let substitutions = preprocessor::generate_node_substitutions();
 	preprocessor::expand_network(&mut network, &substitutions);
 
 	let mut wrapped_network = wrap_network_in_scope(network, Arc::new(FontCache::default()), EditorMetadata::default(), application_io);

node-graph/interpreted-executor/benches/run_demo_art_criterion.rs

@@ -15,7 +15,7 @@ fn update_executor<M: Measurement>(name: &str, c: &mut BenchmarkGroup<M>) {
 	c.bench_function(name, |b| {
 		b.iter_batched(
 			|| (executor.clone(), proto_network.clone()),
-			|(mut executor, network)| futures::executor::block_on(executor.update(black_box(network, None))),
+			|(mut executor, network)| futures::executor::block_on(executor.update(black_box(network), None)),
 			criterion::BatchSize::SmallInput,
 		)
 	});