Cleanup.

Author: twittner

Cargo.lock

@@ -23,7 +23,7 @@ sailfish = { path = "../sailfish", features = ["test"] }
 sailfish-types = { path = "../sailfish-types" }
 serde = { workspace = true }
 timeboost = { path = "../timeboost" }
-timeboost-utils = { path = "../timeboost-utils", features = ["test"] }
+timeboost-utils = { path = "../timeboost-utils" }
 tokio = { workspace = true }
 tokio-stream = { workspace = true }
 tokio-util = { workspace = true }

tests/Cargo.toml

@@ -12,7 +12,7 @@ use multisig::Keypair;
 use multisig::{Committee, x25519};
 use sailfish_types::UNKNOWN_COMMITTEE_ID;
 use timeboost::builder::CertifierConfig;
-use timeboost::conf::{ChainConfig, ParentChain};
+use timeboost::config::{ChainConfig, ParentChain};
 use timeboost::crypto::prelude::DkgDecKey;
 use timeboost::sequencer::SequencerConfig;
 use timeboost::types::BundleVariant;

tests/src/tests/timeboost.rs

@@ -14,7 +14,7 @@ use sailfish::consensus::Consensus;
 use sailfish::rbc::Rbc;
 use sailfish::types::{ConsensusTime, RoundNumber, Timestamp};
 use sailfish::{Coordinator, Event};
-use timeboost::conf::{ChainConfig, ParentChain};
+use timeboost::config::{ChainConfig, ParentChain};
 use timeboost::crypto::prelude::DkgDecKey;
 use timeboost::sequencer::SequencerConfig;
 use timeboost::types::{DecryptionKeyCell, KeyStore};

tests/src/tests/timeboost/handover.rs

@@ -128,13 +128,16 @@ public = "3V1LzAgCwubtAb1MT1YgTH2scXg6d2bQEhhsAMeyNo6X"
 secret = "Cab231aFJTQYmZV7Qw4qa2x49K58fbyTEsM4Tz2CKi1"
 public = "7jdMG9MUWoN4avAc3mbf2tTTGdKSmmGZWTgR3NJ9hJPn6dHj9Vdqspcs3j6zTThfjC"
 
+[chain]
+namespace = 10101
+
 [chain.parent]
 id = 31337
 rpc_url = "http://127.0.0.1:8545/"
 ibox_contract = "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"
-    "#;
+"#;
 
     use super::NodeConfig;
 

timeboost-config/src/lib.rs

@@ -5,41 +5,24 @@ version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
 
-[features]
-test = ["committable", "crossbeam-queue", "sailfish-types"]
-
 [dependencies]
 alloy = { workspace = true }
 anyhow = { workspace = true }
 arbitrary = { workspace = true }
 ark-std = { workspace = true }
-async-trait = { workspace = true }
 bincode = { workspace = true }
 blake3 = { workspace = true }
 bs58 = { workspace = true }
 bytes = { workspace = true }
-clap = { workspace = true }
 cliquenet = { path = "../cliquenet" }
-committable = { workspace = true, optional = true }
-crossbeam-queue = { workspace = true, optional = true }
 ethereum_ssz = { workspace = true }
 futures = { workspace = true }
-jiff = { workspace = true }
-metrics = { path = "../metrics" }
 multisig = { path = "../multisig" }
-parking_lot = { workspace = true }
-prometheus = { workspace = true }
 rand = { workspace = true }
 reqwest = { workspace = true }
-sailfish-types = { path = "../sailfish-types", optional = true }
-secp256k1 = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
-thiserror = { workspace = true }
 timeboost-crypto = { path = "../timeboost-crypto" }
 timeboost-types = { path = "../timeboost-types", features = ["arbitrary"] }
 tokio = { workspace = true }
-toml = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-url = { workspace = true }

timeboost-utils/Cargo.toml

@@ -13,7 +13,7 @@ use sailfish::{
     types::{Action, HasTime, Timestamp, UNKNOWN_COMMITTEE_ID},
 };
 use serde::{Deserialize, Serialize};
-use timeboost::conf::NodeConfig;
+use timeboost::config::NodeConfig;
 use timeboost_contract::{CommitteeMemberSol, KeyManager};
 use timeboost_types::provider;
 use timeboost_utils::types::logging;

timeboost/src/binaries/sailfish.rs

@@ -21,7 +21,7 @@ use anyhow::ensure;
 use timeboost_utils::until::run_until;
 
 use clap::Parser;
-use timeboost::conf::{CERTIFIER_PORT_OFFSET, DECRYPTER_PORT_OFFSET, NodeConfig};
+use timeboost::config::{CERTIFIER_PORT_OFFSET, DECRYPTER_PORT_OFFSET, NodeConfig};
 use timeboost::types::UNKNOWN_COMMITTEE_ID;
 use timeboost_utils::types::logging;
 use timeboost_utils::wait_for_live_peer;

timeboost/src/binaries/timeboost.rs

@@ -1,4 +1,4 @@
-mod config;
+mod conf;
 
 use std::iter::once;
 use std::sync::Arc;
@@ -14,9 +14,9 @@ use tokio::select;
 use tokio::sync::mpsc::{self, Receiver, Sender};
 use tracing::{info, warn};
 
-pub use config::{TimeboostConfig, TimeboostConfigBuilder};
+pub use conf::{TimeboostConfig, TimeboostConfigBuilder};
 pub use timeboost_builder as builder;
-pub use timeboost_config as conf;
+pub use timeboost_config as config;
 pub use timeboost_crypto as crypto;
 pub use timeboost_proto as proto;
 pub use timeboost_sequencer as sequencer;