Radish alpha
h
heartwood
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
node: improve wire session type definition. Update dependencies
✗ CI failure Dr Maxim Orlovsky committed 2 years ago
commit ff0cdaf62b66a6171c0076460db898279f4fcf5c
parent 620c655b03a7572c7ff891e2454338d1021d4959
1 failed (1 total) View logs
4 files changed +22 -11
modified Cargo.lock
@@ -629,7 +629,7 @@ dependencies = [
[[package]]

name = "cypheraddr"

version = "0.3.0"
- 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "base32",
@@ -640,7 +640,7 @@ dependencies = [
[[package]]

name = "cyphergraphy"

version = "0.3.0"
- 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "ec25519",
@@ -651,7 +651,7 @@ dependencies = [
[[package]]

name = "cyphernet"

version = "0.5.0"
- 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "cypheraddr",

 "cyphergraphy",
@@ -1627,6 +1627,7 @@ dependencies = [
 "amplify",

 "crossbeam-channel",

 "libc",
+ 
 "log",

 "popol",

]
@@ -1755,6 +1756,9 @@ name = "log"
version = "0.4.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+ 
dependencies = [
+ 
 "value-bag",
+ 
]



[[package]]

name = "lru"
@@ -1855,12 +1859,13 @@ dependencies = [
[[package]]

name = "netservices"

version = "0.8.0"
- 
source = "git+https://github.com/cyphernet-dao/rust-netservices?branch=v0.8#34b239dc52f70f34673d140cc799f94624be237e"
+ 
source = "git+https://github.com/cyphernet-dao/rust-netservices?branch=v0.8#1805ced7841776b74b36b70eee982e5b1c997351"

dependencies = [

 "amplify",

 "cyphernet",

 "io-reactor",

 "libc",
+ 
 "log",

 "rand",

 "socket2",

]
@@ -1877,7 +1882,7 @@ dependencies = [
[[package]]

name = "noise-framework"

version = "0.3.0"
- 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "chacha20poly1305",
@@ -3025,7 +3030,7 @@ dependencies = [
[[package]]

name = "socks5-client"

version = "0.4.0"
- 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#f49d780424b9dc73d96cb4a74655cb4584827c54"
+ 
source = "git+https://github.com/cyphernet-dao/rust-cyphernet?branch=v0.5#9335259aff558dd55f86f68ef6b266ee033d32e0"

dependencies = [

 "amplify",

 "cypheraddr",
@@ -3689,6 +3694,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"



[[package]]
+ 
name = "value-bag"
+ 
version = "1.9.0"
+ 
source = "registry+https://github.com/rust-lang/crates.io-index"
+ 
checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
+
+ 
[[package]]

name = "vcpkg"

version = "0.2.15"

source = "registry+https://github.com/rust-lang/crates.io-index"
modified radicle-node/Cargo.toml
@@ -26,7 +26,7 @@ lexopt = { version = "0.3.0" }
libc = { version = "0.2.137" }

log = { version = "0.4.17", features = ["std"] }

localtime = { version = "1.2.0" }
- 
netservices = { version = "0.8.0", features = ["io-reactor", "socket2"] }
+ 
netservices = { version = "0.8.0", features = ["io-reactor", "socket2", "log"] }

nonempty = { version = "0.9.0", features = ["serialize"] }

once_cell = { version = "1.13" }

qcheck = { version = "1", default-features = false, optional = true }
modified radicle-node/src/tests/e2e.rs
@@ -36,7 +36,7 @@ mod config {
//     alice -- bob

//

fn test_inventory_sync_basic() {
- 
    logger::init(log::Level::Debug);
+ 
    logger::init(log::Level::Trace);



    let tmp = tempfile::tempdir().unwrap();
modified radicle-node/src/wire/protocol.rs
@@ -16,8 +16,8 @@ use cyphernet::proxy::socks5;
use cyphernet::{Digest, EcSk, Ecdh, Sha256};

use localtime::LocalTime;

use netservices::resource::{ListenerEvent, NetAccept, NetTransport, SessionEvent};
- 
use netservices::session::{ProtocolArtifact, Socks5Session};
- 
use netservices::{NetConnection, NetProtocol, NetReader, NetWriter};
+ 
use netservices::session::{NoiseSession, ProtocolArtifact, Socks5Session};
+ 
use netservices::{NetConnection, NetReader, NetWriter};

use reactor::{ResourceId, ResourceType, Timestamp};



use radicle::collections::RandomMap;
@@ -66,7 +66,7 @@ pub enum Control {
}



/// Peer session type.
- 
pub type WireSession<G> = NetProtocol<NoiseState<G, Sha256>, Socks5Session<net::TcpStream>>;
+ 
pub type WireSession<G> = NoiseSession<G, Sha256, Socks5Session<net::TcpStream>>;

/// Peer session type (read-only).

pub type WireReader = NetReader<Socks5Session<net::TcpStream>>;

/// Peer session type (write-only).