a1fa380 protocol: Depend on `cypheraddr` not `cyphernet` — heartwood

rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5

Radicle Heartwood Protocol & Stack

protocol: Depend on `cypheraddr` not `cyphernet`

Lorenz Leutgeb committed 2 months ago

commit a1fa38018e0160484cfe1152b13a653e503d43b5
parent d530f12

5 files changed +7 -5

modified Cargo.lock

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

  "amplify",
  "base32",
  "cyphergraphy",
  "serde",
  "sha3",
 ]

@@ -3083,7 +3084,7 @@ dependencies = [

  "bloomy",
  "bytes",
  "crossbeam-channel",
  "cyphernet",
  "cypheraddr",
  "fastrand",
  "log",
  "nonempty",

modified Cargo.toml

@@ -25,6 +25,7 @@ bytes = "1.11.1"

 chrono = { version = "0.4.26", default-features = false }
 colored = "2.1.0"
 crossbeam-channel = "0.5.6"
 cypheraddr = "0.4.0"
 cyphernet = "0.5.2"
 dunce = "1.0.5"
 fastrand = { version = "2.0.0", default-features = false }

modified crates/radicle-protocol/Cargo.toml

@@ -15,7 +15,7 @@ test = ["radicle/test", "radicle-crypto/test", "radicle-crypto/cyphernet", "qche

 bloomy = "1.2"
 bytes = { workspace = true }
 crossbeam-channel = { workspace = true }
 cyphernet = { workspace = true, features = ["tor"] }
 cypheraddr = { workspace = true, features = ["serde", "tor"] }
 fastrand = { workspace = true }
 log = { workspace = true, features = ["std"] }
 nonempty = { workspace = true, features = ["serialize"] }

modified crates/radicle-protocol/src/wire.rs

@@ -15,7 +15,7 @@ use std::string::FromUtf8Error;

 use bytes::{Buf, BufMut};
 use cyphernet::addr::tor;
 use cypheraddr::tor;
 use radicle::crypto::{PublicKey, Signature, Unverified};
 use radicle::git;

@@ -257,7 +257,7 @@ impl Encode for Refs {

     }
 }
 impl Encode for cyphernet::addr::tor::OnionAddrV3 {
 impl Encode for cypheraddr::tor::OnionAddrV3 {
     fn encode(&self, buf: &mut impl BufMut) {
         self.into_raw_bytes().encode(buf)
     }

modified crates/radicle-protocol/src/wire/message.rs

@@ -2,7 +2,7 @@ use std::{mem, net};

 use bytes::Buf;
 use bytes::BufMut;
 use cyphernet::addr::{tor, HostName, NetAddr};
 use cypheraddr::{tor, HostName, NetAddr};
 use radicle::crypto::Signature;
 use radicle::git::Oid;
 use radicle::identity::RepoId;