diff --git a/Cargo.lock b/Cargo.lock index 09e7233d..ebe36335 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2825,6 +2825,7 @@ dependencies = [ "qcheck", "qcheck-macros", "radicle-cob", + "radicle-core", "radicle-crypto", "radicle-git-metadata", "radicle-git-ref-format", diff --git a/Cargo.toml b/Cargo.toml index e456fb30..cf07d16c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,6 +45,7 @@ radicle = { version = "0.20", path = "crates/radicle" } radicle-cli = { version = "0.17", path = "crates/radicle-cli" } radicle-cli-test = { path = "crates/radicle-cli-test" } radicle-cob = { version = "0.17", path = "crates/radicle-cob" } +radicle-core = { version = "0.1", path = "crates/radicle-core" } radicle-crypto = { version = "0.14", path = "crates/radicle-crypto" } radicle-dag = { version = "0.10", path = "crates/radicle-dag" } radicle-fetch = { version = "0.16", path = "crates/radicle-fetch" } diff --git a/crates/radicle/Cargo.toml b/crates/radicle/Cargo.toml index 1a41d54a..8b79ea53 100644 --- a/crates/radicle/Cargo.toml +++ b/crates/radicle/Cargo.toml @@ -33,6 +33,7 @@ multibase = { workspace = true } nonempty = { workspace = true, features = ["serialize"] } qcheck = { workspace = true, optional = true } radicle-cob = { workspace = true, features = ["git2"] } +radicle-core = { workspace = true, features = ["git2"] } radicle-crypto = { workspace = true, features = ["git-ref-format-core", "ssh", "sqlite", "cyphernet"] } radicle-git-ref-format = { workspace = true, features = ["macro", "serde"] } radicle-localtime = { workspace = true, features = ["serde"] } diff --git a/crates/radicle/src/node.rs b/crates/radicle/src/node.rs index f179f04a..8f761fb5 100644 --- a/crates/radicle/src/node.rs +++ b/crates/radicle/src/node.rs @@ -50,6 +50,7 @@ pub use cyphernet::addr::{HostName, PeerAddr, PeerAddrParseError}; pub use db::Database; pub use events::{Event, Events}; pub use features::Features; +pub use radicle_core::NodeId; pub use seed::SyncedAt; pub use timestamp::Timestamp; @@ -1002,9 +1003,6 @@ impl Iterator for LineIter { } } -/// Public node & device identifier. -pub type NodeId = PublicKey; - /// Node controller. #[derive(Debug, Clone)] pub struct Node {