3081126 Get around circular-dependency — heartwood

Radicle Heartwood Protocol & Stack

Get around circular-dependency

Alexis Sellier committed 3 years ago

commit 308112618fa492626a219981907c919e27c765ab
parent e258c72eca212f9379183262b1b3177e6c9da992

4 files changed +28 -42

modified Cargo.lock

@@ -1687,7 +1687,6 @@ dependencies = [

  "radicle-cob",
  "radicle-crypto",
  "radicle-git-ext",
  "radicle-node",
  "radicle-ssh",
  "serde",
  "serde_json",

modified radicle-node/src/control.rs

@@ -213,6 +213,8 @@ mod tests {

     use super::*;
     use crate::identity::Id;
     use crate::node::Handle;
     use crate::node::Node;
     use crate::test;
     #[test]

@@ -247,4 +249,29 @@ mod tests {

             assert!(handle.updates.lock().unwrap().contains(proj));
         }
     }
     #[test]
     fn test_track_untrack() {
         let tmp = tempfile::tempdir().unwrap();
         let socket = tmp.path().join("node.sock");
         let proj = test::arbitrary::gen::<Id>(1);
         thread::spawn({
             let socket = socket.clone();
             let handle = crate::test::handle::Handle::default();
             move || crate::control::listen(socket, handle)
         });
         let handle = loop {
             if let Ok(conn) = Node::connect(&socket) {
                 break conn;
             }
         };
         assert!(handle.track(&proj).unwrap());
         assert!(!handle.track(&proj).unwrap());
         assert!(handle.untrack(&proj).unwrap());
         assert!(!handle.untrack(&proj).unwrap());
     }
 }

modified radicle/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"

 [features]
 default = []
 test = ["quickcheck", "radicle-crypto/test", "radicle-node/test"]
 test = ["quickcheck", "radicle-crypto/test"]
 sql = ["sqlite"]
 [dependencies]

@@ -67,8 +67,3 @@ quickcheck = { version = "1", default-features = false }

 path = "../radicle-crypto"
 version = "0"
 features = ["test"]
 [dev-dependencies.radicle-node]
 path = "../radicle-node"
 version = "0"
 features = ["test"]

modified radicle/src/node.rs

@@ -131,38 +131,3 @@ impl Handle for Node {

 pub fn connect<P: AsRef<Path>>(path: P) -> Result<Node, Error> {
     Node::connect(path)
 }
 #[cfg(test)]
 mod tests {
     use std::thread;
     use super::*;
     use crate::test;
     #[test]
     fn test_track_untrack() {
         let tmp = tempfile::tempdir().unwrap();
         let socket = tmp.path().join("node.sock");
         let proj = test::arbitrary::gen::<Id>(1);
         thread::spawn({
             use radicle_node as node;
             let socket = socket.clone();
             let handle = node::test::handle::Handle::default();
             move || node::control::listen(socket, handle)
         });
         let handle = loop {
             if let Ok(conn) = Node::connect(&socket) {
                 break conn;
             }
         };
         assert!(handle.track(&proj).unwrap());
         assert!(!handle.track(&proj).unwrap());
         assert!(handle.untrack(&proj).unwrap());
         assert!(!handle.untrack(&proj).unwrap());
     }
 }