Adjustments after rebase on main.

Author: akonring

Cargo.lock

@@ -21,6 +21,7 @@ robusta = { path = "../robusta" }
 serde = { workspace = true }
 smallvec = { workspace = true }
 thiserror = { workspace = true }
+timeboost-config = { path = "../timeboost-config" }
 timeboost-types = { path = "../timeboost-types" }
 timeboost-utils = { path = "../timeboost-utils" }
 tokio = { workspace = true }

timeboost-builder/Cargo.toml

@@ -14,9 +14,9 @@ use multisig::{
     VoteAccumulator,
 };
 use smallvec::SmallVec;
+use timeboost_config::CERTIFIER_PORT_OFFSET;
 use timeboost_types::sailfish::{CommitteeVec, NodeInfo, Round, RoundNumber};
 use timeboost_types::{Block, BlockInfo, BlockNumber, CertifiedBlock};
-use timeboost_utils::keyset::CERTIFIER_PORT_OFFSET;
 use tokio::select;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender, channel};

timeboost-builder/src/certifier.rs

@@ -15,6 +15,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque};
 use std::result::Result as StdResult;
 use std::sync::Arc;
+use timeboost_config::DECRYPTER_PORT_OFFSET;
 use timeboost_crypto::prelude::{DkgDecKey, LabeledDkgDecKey, Vess, Vss};
 use timeboost_crypto::traits::dkg::VerifiableSecretSharing;
 use timeboost_crypto::traits::threshold_enc::{ThresholdEncError, ThresholdEncScheme};
@@ -23,7 +24,6 @@ use timeboost_types::{
     AccumulatorMode, DecryptionKey, DecryptionKeyCell, DkgAccumulator, DkgBundle, DkgSubset,
     InclusionList, KeyStore, KeyStoreVec,
 };
-use timeboost_utils::keyset::DECRYPTER_PORT_OFFSET;
 use tokio::spawn;
 use tokio::sync::mpsc::{Receiver, Sender, channel};
 use tokio::task::{JoinError, JoinHandle};