first pass of merging in warp (doesn't build)

crates/jsonrpc/src/service.rs

@@ -1,17 +1,16 @@
-use std::{
-    collections::HashMap,
-    sync::{
-        atomic::{AtomicI32, Ordering},
-        Arc, Mutex,
-    },
-};
+use std::collections::HashMap;
+use std::sync::atomic::{AtomicI32, Ordering};
+use std::sync::{Arc, Mutex};
+
+use anyhow::{anyhow, Result};
+use futures::channel::oneshot;
+use futures::lock::Mutex as AsyncMutex;
+use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue;
+use serde_json::Value;
+use galaxyui_core::r#async::executor::Background;
 
 use crate::transport::Transport;
-use anyhow::{anyhow, Result};
-use futures::{channel::oneshot, lock::Mutex as AsyncMutex};
-use galaxyui::r#async::executor::Background;
-use serde::{Deserialize, Serialize};
-use serde_json::{value::RawValue, Value};
 
 pub const JSON_RPC_VERSION: &str = "2.0";
 

crates/jsonrpc/src/service_tests.rs

@@ -1,10 +1,11 @@
 #[cfg(test)]
 mod service_tests {
-    use crate::{JsonRpcService, Transport};
+    use std::sync::{Arc, Mutex};
+
     use async_trait::async_trait;
-    use galaxyui::r#async::executor::Background;
-    use std::sync::Arc;
-    use std::sync::Mutex;
+    use galaxyui_core::r#async::executor::Background;
+
+    use crate::{JsonRpcService, Transport};
 
     #[derive(Debug, Clone)]
     struct MockTransport {