Skip to content

prepare 0.3.0 [TCE-674] #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abonander merged 3 commits into from
Jan 30, 2025
Merged

prepare 0.3.0 [TCE-674] #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47c3f78
chore: upgrade TCE, remove unused `triomphe` dependency
abonander Jan 29, 2025
b0b4723
fix: breakage from upgrading TCE
abonander Jan 29, 2025
c8f5dfe
chore: bump crate version
abonander Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ features = ["full"]

[package]
name = "foxmq"
version = "0.1.0"
version = "0.3.0"
edition = "2021"
publish = false
default-run = "foxmq"

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

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

[dependencies]
argon2 = { version = "0.5.3", features = ["std"] }
Expand All @@ -39,7 +39,6 @@ serde = { version = "1.0.196", features = ["derive", "std"] }
thiserror = "1.0.56"
toml = { version = "0.8.10", features = ["parse"] }
tracing = { version = "0.1.40", features = ["attributes"] }
triomphe = "0.1.11"
tokio-util = "0.7.10"
der = { version = "0.7.9", features = ["derive"] }
futures = { version = "0.3.30", features = ["std", "alloc"] }
Expand Down
10 changes: 6 additions & 4 deletions src/cli/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,9 @@ fn create_tce_config(
// The address book is only required to contain the existing nodes.
let joining_running_session = !nodes.contains_key(&secret_key.public_key());

let mut tce_config = tashi_consensus_engine::Config::new(secret_key)
let mut tce_config = tashi_consensus_engine::Config::new(secret_key);

tce_config
.initial_nodes(nodes)
.enable_hole_punching(false)
// TODO: we can dispatch messages before they come to consensus
Expand All @@ -356,12 +358,12 @@ fn create_tce_config(
.fallen_behind_kick_seconds(None);

if let Some(cert_path) = &config.cluster_cert {
tce_config = tce_config.tls_cert_chain(Certificate::load_chain_from(cert_path)?);
tce_config.tls_cert_chain(Certificate::load_chain_from(cert_path)?);
}

let roots = if let Some(root_cert_path) = &config.cluster_root_cert {
let roots = Arc::new(RootCertificates::read_from(root_cert_path)?);
tce_config = tce_config.tls_roots(roots.clone());
tce_config.tls_roots(roots.clone());
Some(roots)
} else {
None
Expand All @@ -370,7 +372,7 @@ fn create_tce_config(
let (add_nodes_tx, add_nodes_rx) = mpsc::unbounded_channel();

if config.cluster_accept_peer_with_cert {
tce_config = tce_config.on_unknown_connection(move |addr, key, certs| {
tce_config.on_unknown_connection(move |addr, key, certs| {
// Certificate chain has already been verified by TCE at this point.

add_nodes_tx
Expand Down
Loading