chore: bump kestrel to fix movement-core.

Author: l-monninger

Cargo.lock

@@ -123,12 +123,12 @@ secure-signer-loader = { git = "https://github.com/movementlabsxyz/secure-signin
 secure-signer-aws-kms = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "f37eebd6d494d21b26b2faa44e1188de42ff1007" }
 
 # kestrel 
-kestrel = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "8395e2dce55192269a41f5bacacedaf49555f875" }
-jsonlvar = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "8395e2dce55192269a41f5bacacedaf49555f875" }
-commander = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "8395e2dce55192269a41f5bacacedaf49555f875" }
-include-dir = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "8395e2dce55192269a41f5bacacedaf49555f875" }
-include-vendor = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "8395e2dce55192269a41f5bacacedaf49555f875" }
-ready-docker = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "8395e2dce55192269a41f5bacacedaf49555f875" }
+kestrel = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
+jsonlvar = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
+commander = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
+include-dir = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
+include-vendor = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
+ready-docker = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
 
 # orfile
 orfile = { git = "https://github.com/movementlabsxyz/orfile.git", rev = "b49cb42495816fa00a1107be5bbf41aff3a8255d" }

Cargo.toml

@@ -64,15 +64,37 @@ where
 	}
 
 	/// Runs the internal node logic
-	pub(crate) fn run_node(&self) -> Result<(), MovementAptosError> {
-		aptos_node::start(
-			self.node_config.clone(),
-			self.log_file.clone(),
-			R::create_global_rayon_pool(),
-		)
-		.map_err(|e| MovementAptosError::Internal(e.into()))?;
-
-		Ok(())
+	pub(crate) async fn run_node(&self) -> Result<(), MovementAptosError> {
+		// Clone necessary data for the closure
+		let node_config = self.node_config.clone();
+		let log_file = self.log_file.clone();
+
+		// Spawn the blocking task
+		let blocking_task_result = tokio::task::spawn_blocking(move || {
+			// This closure runs on a blocking thread
+			aptos_node::start(
+				node_config,
+				log_file,
+				R::create_global_rayon_pool(), // Assuming R is in scope and its result is Send
+			)
+			// The closure should return the direct result from aptos_node::start.
+			// The error type from aptos_node::start (let's call it AptosNodeError)
+			// needs to be Send + 'static for the closure.
+		})
+		.await;
+
+		match blocking_task_result {
+			Ok(Ok(())) => Ok(()), // aptos_node::start succeeded
+			Ok(Err(aptos_node_err)) => {
+				// aptos_node::start failed. We need aptos_node_err to be convertible
+				// into the Box<dyn Error> for MovementAptosError::Internal.
+				Err(MovementAptosError::Internal(aptos_node_err.into()))
+			}
+			Err(join_err) => {
+				// spawn_blocking task failed (e.g., panicked or was cancelled by Tokio)
+				Err(MovementAptosError::Internal(Box::new(join_err)))
+			}
+		}
 	}
 
 	/// Runs the node and fills state.
@@ -87,7 +109,7 @@ where
 
 		let runner = self.clone();
 		let runner_task = kestrel::task(async move {
-			runner.run_node()?;
+			runner.run_node().await?;
 			Ok::<_, MovementAptosError>(())
 		});
 
@@ -163,6 +185,8 @@ mod tests {
 
 		rest_api_state.wait_for(tokio::time::Duration::from_secs(30)).await?;
 
+		println!("ENDING MOVEMENT APTOS");
+
 		kestrel::end!(movement_aptos_task)?;
 
 		Ok(())

util/movement-aptos/movement-aptos-core/src/movement_aptos.rs

@@ -303,7 +303,7 @@ impl Movement {
 	}
 }
 
-impl Drop for Movement {
+/*impl Drop for Movement {
 	fn drop(&mut self) {
 		// Get the real path of the workspace, following symlinks
 		if let Ok(real_path) = std::fs::canonicalize(self.workspace.get_workspace_path()) {
@@ -314,7 +314,7 @@ impl Drop for Movement {
 				.unwrap();
 		}
 	}
-}
+}*/
 
 #[cfg(test)]
 mod tests {