Skip to content

Commit 5675f8b

Browse files
authored
prepare 0.3.0 [TCE-674] (#57)
* chore: upgrade TCE, remove unused `triomphe` dependency * fix: breakage from upgrading TCE * chore: bump crate version
1 parent 1317664 commit 5675f8b

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Cargo.lock

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ features = ["full"]
1111

1212
[package]
1313
name = "foxmq"
14-
version = "0.1.0"
14+
version = "0.3.0"
1515
edition = "2021"
1616
publish = false
1717
default-run = "foxmq"
1818

1919
[dependencies.tashi-consensus-engine]
2020
git = "ssh://git@github.com/tashigg/tashi-consensus-engine"
21-
rev = "493410f6ea9b4fcd94b444ac3cebb6c5f12b4d02"
21+
rev = "aaf0206f2a71c710bafe6c5c89f172e5fae2b277"
2222

2323
[dependencies.tashi-collections]
2424
git = "ssh://git@github.com/tashigg/tashi-consensus-engine"
25-
rev = "493410f6ea9b4fcd94b444ac3cebb6c5f12b4d02"
25+
rev = "aaf0206f2a71c710bafe6c5c89f172e5fae2b277"
2626

2727
[dependencies]
2828
argon2 = { version = "0.5.3", features = ["std"] }
@@ -39,7 +39,6 @@ serde = { version = "1.0.196", features = ["derive", "std"] }
3939
thiserror = "1.0.56"
4040
toml = { version = "0.8.10", features = ["parse"] }
4141
tracing = { version = "0.1.40", features = ["attributes"] }
42-
triomphe = "0.1.11"
4342
tokio-util = "0.7.10"
4443
der = { version = "0.7.9", features = ["derive"] }
4544
futures = { version = "0.3.30", features = ["std", "alloc"] }

src/cli/run.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,9 @@ fn create_tce_config(
346346
// The address book is only required to contain the existing nodes.
347347
let joining_running_session = !nodes.contains_key(&secret_key.public_key());
348348

349-
let mut tce_config = tashi_consensus_engine::Config::new(secret_key)
349+
let mut tce_config = tashi_consensus_engine::Config::new(secret_key);
350+
351+
tce_config
350352
.initial_nodes(nodes)
351353
.enable_hole_punching(false)
352354
// TODO: we can dispatch messages before they come to consensus
@@ -356,12 +358,12 @@ fn create_tce_config(
356358
.fallen_behind_kick_seconds(None);
357359

358360
if let Some(cert_path) = &config.cluster_cert {
359-
tce_config = tce_config.tls_cert_chain(Certificate::load_chain_from(cert_path)?);
361+
tce_config.tls_cert_chain(Certificate::load_chain_from(cert_path)?);
360362
}
361363

362364
let roots = if let Some(root_cert_path) = &config.cluster_root_cert {
363365
let roots = Arc::new(RootCertificates::read_from(root_cert_path)?);
364-
tce_config = tce_config.tls_roots(roots.clone());
366+
tce_config.tls_roots(roots.clone());
365367
Some(roots)
366368
} else {
367369
None
@@ -370,7 +372,7 @@ fn create_tce_config(
370372
let (add_nodes_tx, add_nodes_rx) = mpsc::unbounded_channel();
371373

372374
if config.cluster_accept_peer_with_cert {
373-
tce_config = tce_config.on_unknown_connection(move |addr, key, certs| {
375+
tce_config.on_unknown_connection(move |addr, key, certs| {
374376
// Certificate chain has already been verified by TCE at this point.
375377

376378
add_nodes_tx

0 commit comments

Comments
 (0)