diff --git a/code/Cargo.lock b/code/Cargo.lock index d0c2f76d3..1eb027a74 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -2759,9 +2759,9 @@ dependencies = [ "eyre", "libp2p", "malachite-codec", - "malachite-common", "malachite-config", "malachite-consensus", + "malachite-core-types", "malachite-gossip-consensus", "malachite-metrics", "malachite-sync", @@ -2782,9 +2782,9 @@ dependencies = [ "libp2p-identity", "malachite-actors", "malachite-codec", - "malachite-common", "malachite-config", "malachite-consensus", + "malachite-core-types", "malachite-gossip-consensus", "malachite-metrics", "malachite-peer", @@ -2821,8 +2821,8 @@ dependencies = [ "directories", "itertools 0.13.0", "malachite-app", - "malachite-common", "malachite-config", + "malachite-core-types", "malachite-metrics", "rand", "serde_json", @@ -2841,15 +2841,6 @@ dependencies = [ "bytes", ] -[[package]] -name = "malachite-common" -version = "0.1.0" -dependencies = [ - "bytes", - "derive-where", - "thiserror 2.0.6", -] - [[package]] name = "malachite-config" version = "0.1.0" @@ -2857,7 +2848,7 @@ dependencies = [ "bytesize", "config", "humantime-serde", - "malachite-common", + "malachite-core-types", "multiaddr", "serde", "toml", @@ -2870,8 +2861,8 @@ dependencies = [ "async-recursion", "derive-where", "genawaiter", - "malachite-common", - "malachite-driver", + "malachite-core-driver", + "malachite-core-types", "malachite-metrics", "malachite-peer", "malachite-test", @@ -2880,6 +2871,59 @@ dependencies = [ "tracing", ] +[[package]] +name = "malachite-core-driver" +version = "0.1.0" +dependencies = [ + "derive-where", + "malachite-core-driver-test-utils", + "malachite-core-state-machine", + "malachite-core-types", + "malachite-core-votekeeper", + "malachite-test", + "thiserror 2.0.6", +] + +[[package]] +name = "malachite-core-driver-test-utils" +version = "0.1.0" +dependencies = [ + "malachite-core-driver", + "malachite-core-state-machine", + "malachite-core-types", + "malachite-core-votekeeper", + "malachite-test", +] + +[[package]] +name = "malachite-core-state-machine" +version = "0.1.0" +dependencies = [ + "derive-where", + "displaydoc", + "malachite-core-types", + "time", +] + +[[package]] +name = "malachite-core-types" +version = "0.1.0" +dependencies = [ + "bytes", + "derive-where", + "thiserror 2.0.6", +] + +[[package]] +name = "malachite-core-votekeeper" +version = "0.1.0" +dependencies = [ + "derive-where", + "malachite-core-types", + "malachite-test", + "thiserror 2.0.6", +] + [[package]] name = "malachite-discovery" version = "0.1.0" @@ -2907,30 +2951,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "malachite-driver" -version = "0.1.0" -dependencies = [ - "derive-where", - "malachite-common", - "malachite-driver-test-utils", - "malachite-round", - "malachite-test", - "malachite-vote", - "thiserror 2.0.6", -] - -[[package]] -name = "malachite-driver-test-utils" -version = "0.1.0" -dependencies = [ - "malachite-common", - "malachite-driver", - "malachite-round", - "malachite-test", - "malachite-vote", -] - [[package]] name = "malachite-gossip-consensus" version = "0.1.0" @@ -2955,7 +2975,7 @@ dependencies = [ name = "malachite-metrics" version = "0.1.0" dependencies = [ - "malachite-round", + "malachite-core-state-machine", "prometheus-client", ] @@ -2983,23 +3003,13 @@ dependencies = [ "thiserror 2.0.6", ] -[[package]] -name = "malachite-round" -version = "0.1.0" -dependencies = [ - "derive-where", - "displaydoc", - "malachite-common", - "time", -] - [[package]] name = "malachite-signing-ed25519" version = "0.1.0" dependencies = [ "base64 0.22.1", "ed25519-consensus", - "malachite-common", + "malachite-core-types", "rand", "serde", "signature", @@ -3034,9 +3044,9 @@ dependencies = [ "malachite-app", "malachite-cli", "malachite-codec", - "malachite-common", "malachite-config", "malachite-consensus", + "malachite-core-types", "malachite-gossip-consensus", "malachite-metrics", "malachite-node", @@ -3071,7 +3081,7 @@ name = "malachite-starknet-p2p-types" version = "0.1.0" dependencies = [ "bytes", - "malachite-common", + "malachite-core-types", "malachite-proto", "malachite-starknet-p2p-proto", "rand", @@ -3089,9 +3099,9 @@ dependencies = [ "bytesize", "eyre", "malachite-actors", - "malachite-common", "malachite-config", "malachite-consensus", + "malachite-core-types", "malachite-metrics", "malachite-starknet-host", "ractor", @@ -3113,7 +3123,7 @@ dependencies = [ "displaydoc", "genawaiter", "libp2p", - "malachite-common", + "malachite-core-types", "malachite-metrics", "malachite-peer", "rand", @@ -3135,9 +3145,9 @@ dependencies = [ "malachite-actors", "malachite-app", "malachite-codec", - "malachite-common", "malachite-config", "malachite-consensus", + "malachite-core-types", "malachite-proto", "malachite-signing-ed25519", "malachite-sync", @@ -3157,10 +3167,10 @@ version = "0.1.0" dependencies = [ "glob", "itf", - "malachite-common", - "malachite-round", + "malachite-core-state-machine", + "malachite-core-types", + "malachite-core-votekeeper", "malachite-test", - "malachite-vote", "num-bigint", "num-traits", "pretty_assertions", @@ -3187,16 +3197,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "malachite-vote" -version = "0.1.0" -dependencies = [ - "derive-where", - "malachite-common", - "malachite-test", - "thiserror 2.0.6", -] - [[package]] name = "malachite-wal" version = "0.1.0" @@ -3980,9 +3980,9 @@ dependencies = [ [[package]] name = "ractor" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4ae37fcb0f6037609e8722df14afac91cebb44209c1debd8ac473def992586" +checksum = "8cbebed288497a3e7567eba6e1496e89d6b9850f03fb27876e1451fd85b07cf4" dependencies = [ "async-trait", "bon", @@ -4242,9 +4242,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.19" +version = "0.23.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" +checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" dependencies = [ "once_cell", "ring 0.17.8", diff --git a/code/Cargo.toml b/code/Cargo.toml index 73f9c9e98..b0f32354c 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -7,18 +7,18 @@ members = [ "crates/app-channel", "crates/cli", "crates/codec", - "crates/common", "crates/config", "crates/consensus", - "crates/driver", + "crates/core-driver", + "crates/core-state-machine", + "crates/core-types", + "crates/core-votekeeper", "crates/gossip-consensus", "crates/metrics", "crates/node", "crates/peer", "crates/proto", - "crates/round", "crates/sync", - "crates/vote", "crates/wal", # Signing scheme @@ -29,7 +29,7 @@ members = [ "crates/test/mbt", "crates/test/mempool", "crates/gossip-consensus/test", - "crates/driver/test-utils", + "crates/core-driver/test-utils", # Starknet "crates/starknet/*", @@ -59,32 +59,32 @@ debug = true # None for now [workspace.dependencies] -malachite-actors = { version = "0.1.0", path = "crates/actors" } -malachite-app = { version = "0.1.0", path = "crates/app" } -malachite-app-channel = { version = "0.1.0", path = "crates/app-channel" } -malachite-sync = { version = "0.1.0", path = "crates/sync" } -malachite-codec = { version = "0.1.0", path = "crates/codec" } -malachite-cli = { version = "0.1.0", path = "crates/cli" } -malachite-common = { version = "0.1.0", path = "crates/common" } -malachite-config = { version = "0.1.0", path = "crates/config" } -malachite-consensus = { version = "0.1.0", path = "crates/consensus", features = ["debug"] } -malachite-discovery = { version = "0.1.0", path = "crates/discovery" } -malachite-driver = { version = "0.1.0", path = "crates/driver" } -malachite-gossip-consensus = { version = "0.1.0", path = "crates/gossip-consensus" } -malachite-metrics = { version = "0.1.0", path = "crates/metrics" } -malachite-node = { version = "0.1.0", path = "crates/node" } -malachite-peer = { version = "0.1.0", path = "crates/peer" } -malachite-proto = { version = "0.1.0", path = "crates/proto" } -malachite-round = { version = "0.1.0", path = "crates/round" } -malachite-vote = { version = "0.1.0", path = "crates/vote" } -malachite-signing-ed25519 = { version = "0.1.0", path = "crates/signing-ed25519" } -malachite-wal = { version = "0.1.0", path = "crates/wal" } +malachite-actors = { version = "0.1.0", path = "crates/actors" } +malachite-app = { version = "0.1.0", path = "crates/app" } +malachite-app-channel = { version = "0.1.0", path = "crates/app-channel" } +malachite-cli = { version = "0.1.0", path = "crates/cli" } +malachite-codec = { version = "0.1.0", path = "crates/codec" } +malachite-config = { version = "0.1.0", path = "crates/config" } +malachite-consensus = { version = "0.1.0", path = "crates/consensus" } +malachite-core-driver = { version = "0.1.0", path = "crates/core-driver" } +malachite-core-state-machine = { version = "0.1.0", path = "crates/core-state-machine" } +malachite-core-types = { version = "0.1.0", path = "crates/core-types" } +malachite-core-votekeeper = { version = "0.1.0", path = "crates/core-votekeeper" } +malachite-discovery = { version = "0.1.0", path = "crates/discovery" } +malachite-gossip-consensus = { version = "0.1.0", path = "crates/gossip-consensus" } +malachite-metrics = { version = "0.1.0", path = "crates/metrics" } +malachite-node = { version = "0.1.0", path = "crates/node" } +malachite-peer = { version = "0.1.0", path = "crates/peer" } +malachite-proto = { version = "0.1.0", path = "crates/proto" } +malachite-signing-ed25519 = { version = "0.1.0", path = "crates/signing-ed25519" } +malachite-sync = { version = "0.1.0", path = "crates/sync" } +malachite-wal = { version = "0.1.0", path = "crates/wal" } # Test -malachite-test = { version = "0.1.0", path = "crates/test" } -malachite-test-mbt = { version = "0.1.0", path = "crates/test/mbt" } -malachite-test-mempool = { version = "0.1.0", path = "crates/test/mempool" } -malachite-driver-test-utils = { version = "0.1.0", path = "crates/driver/test-utils" } +malachite-test = { version = "0.1.0", path = "crates/test" } +malachite-test-mbt = { version = "0.1.0", path = "crates/test/mbt" } +malachite-test-mempool = { version = "0.1.0", path = "crates/test/mempool" } +malachite-core-driver-test-utils = { version = "0.1.0", path = "crates/core-driver/test-utils" } # Starknet malachite-starknet-host = { version = "0.1.0", path = "crates/starknet/host" } diff --git a/code/crates/actors/Cargo.toml b/code/crates/actors/Cargo.toml index 4af833d2e..c16f8b14e 100644 --- a/code/crates/actors/Cargo.toml +++ b/code/crates/actors/Cargo.toml @@ -11,9 +11,9 @@ workspace = true [dependencies] malachite-codec.workspace = true -malachite-common.workspace = true malachite-config.workspace = true malachite-consensus.workspace = true +malachite-core-types.workspace = true malachite-gossip-consensus.workspace = true malachite-metrics.workspace = true malachite-sync.workspace = true diff --git a/code/crates/actors/src/consensus.rs b/code/crates/actors/src/consensus.rs index 9bfd07675..1daf9e65a 100644 --- a/code/crates/actors/src/consensus.rs +++ b/code/crates/actors/src/consensus.rs @@ -10,11 +10,11 @@ use tokio::time::Instant; use tracing::{debug, error, info, warn}; use malachite_codec as codec; -use malachite_common::{ - Context, Round, SignedExtension, Timeout, TimeoutKind, ValidatorSet, ValueOrigin, -}; use malachite_config::TimeoutConfig; use malachite_consensus::{Effect, PeerId, Resume, SignedConsensusMsg, ValueToPropose}; +use malachite_core_types::{ + Context, Round, SignedExtension, Timeout, TimeoutKind, ValidatorSet, ValueOrigin, +}; use malachite_metrics::Metrics; use malachite_sync::{self as sync, Response, ValueResponse, VoteSetRequest, VoteSetResponse}; diff --git a/code/crates/actors/src/gossip_consensus.rs b/code/crates/actors/src/gossip_consensus.rs index 15c4bb11a..f8ea015f6 100644 --- a/code/crates/actors/src/gossip_consensus.rs +++ b/code/crates/actors/src/gossip_consensus.rs @@ -15,8 +15,8 @@ use malachite_sync::{ }; use malachite_codec as codec; -use malachite_common::{Context, SignedProposal, SignedVote}; use malachite_consensus::SignedConsensusMsg; +use malachite_core_types::{Context, SignedProposal, SignedVote}; use malachite_gossip_consensus::handle::CtrlHandle; use malachite_gossip_consensus::{Channel, Config, Event, Multiaddr, PeerId}; use malachite_metrics::SharedRegistry; diff --git a/code/crates/actors/src/host.rs b/code/crates/actors/src/host.rs index c63947049..e272de7a6 100644 --- a/code/crates/actors/src/host.rs +++ b/code/crates/actors/src/host.rs @@ -4,8 +4,8 @@ use std::time::Duration; use derive_where::derive_where; use ractor::{ActorRef, RpcReplyPort}; -use malachite_common::{CommitCertificate, Context, Round, SignedExtension, ValueId}; use malachite_consensus::PeerId; +use malachite_core_types::{CommitCertificate, Context, Round, SignedExtension, ValueId}; use malachite_sync::DecidedValue; use crate::consensus::ConsensusRef; diff --git a/code/crates/actors/src/node.rs b/code/crates/actors/src/node.rs index e223e8c99..fa5cba190 100644 --- a/code/crates/actors/src/node.rs +++ b/code/crates/actors/src/node.rs @@ -3,7 +3,7 @@ use ractor::{Actor, ActorCell, ActorProcessingErr, ActorRef, SupervisionEvent}; use tokio::task::JoinHandle; use tracing::{error, info, warn}; -use malachite_common::Context; +use malachite_core_types::Context; use crate::consensus::ConsensusRef; use crate::gossip_consensus::GossipConsensusRef; diff --git a/code/crates/actors/src/sync.rs b/code/crates/actors/src/sync.rs index aff29e3f1..1e79ff109 100644 --- a/code/crates/actors/src/sync.rs +++ b/code/crates/actors/src/sync.rs @@ -12,8 +12,8 @@ use tokio::task::JoinHandle; use tracing::{debug, error, info, warn}; use malachite_codec as codec; -use malachite_common::{CertificateError, CommitCertificate, Context, Height, Round}; use malachite_consensus::PeerId; +use malachite_core_types::{CertificateError, CommitCertificate, Context, Height, Round}; use malachite_sync::{self as sync, InboundRequestId, OutboundRequestId, Response}; use malachite_sync::{DecidedValue, Request}; diff --git a/code/crates/actors/src/util/events.rs b/code/crates/actors/src/util/events.rs index 613002bde..ca466bf7a 100644 --- a/code/crates/actors/src/util/events.rs +++ b/code/crates/actors/src/util/events.rs @@ -3,8 +3,8 @@ use core::fmt; use derive_where::derive_where; use tokio::sync::broadcast; -use malachite_common::{CommitCertificate, Context, Round, Timeout, ValueOrigin}; use malachite_consensus::{ProposedValue, SignedConsensusMsg, ValueToPropose}; +use malachite_core_types::{CommitCertificate, Context, Round, Timeout, ValueOrigin}; pub type RxEvent = broadcast::Receiver>; diff --git a/code/crates/actors/src/wal.rs b/code/crates/actors/src/wal.rs index 1af8567d7..6b7e1d887 100644 --- a/code/crates/actors/src/wal.rs +++ b/code/crates/actors/src/wal.rs @@ -6,7 +6,7 @@ use ractor::{async_trait, Actor, ActorProcessingErr, ActorRef, RpcReplyPort, Spa use tokio::sync::{mpsc, oneshot}; use tracing::{debug, error, info}; -use malachite_common::Context; +use malachite_core_types::Context; use malachite_metrics::SharedRegistry; use malachite_wal as wal; diff --git a/code/crates/actors/src/wal/entry.rs b/code/crates/actors/src/wal/entry.rs index e9b1576ac..9aaec48a7 100644 --- a/code/crates/actors/src/wal/entry.rs +++ b/code/crates/actors/src/wal/entry.rs @@ -4,8 +4,8 @@ use byteorder::{ReadBytesExt, WriteBytesExt, BE}; use derive_where::derive_where; use malachite_codec::Codec; -use malachite_common::{Context, Round, Timeout}; use malachite_consensus::SignedConsensusMsg; +use malachite_core_types::{Context, Round, Timeout}; /// Codec for encoding and decoding WAL entries. /// @@ -125,7 +125,7 @@ where } fn encode_timeout(timeout: &Timeout, mut buf: impl Write) -> io::Result<()> { - use malachite_common::TimeoutKind; + use malachite_core_types::TimeoutKind; let step = match timeout.kind { TimeoutKind::Propose => 1, @@ -146,7 +146,7 @@ fn encode_timeout(timeout: &Timeout, mut buf: impl Write) -> io::Result<()> { } fn decode_timeout(mut buf: impl Read) -> io::Result { - use malachite_common::TimeoutKind; + use malachite_core_types::TimeoutKind; let step = match buf.read_u8()? { 1 => TimeoutKind::Propose, diff --git a/code/crates/actors/src/wal/thread.rs b/code/crates/actors/src/wal/thread.rs index ef34c0d02..ddb62fa97 100644 --- a/code/crates/actors/src/wal/thread.rs +++ b/code/crates/actors/src/wal/thread.rs @@ -5,7 +5,7 @@ use eyre::Result; use tokio::sync::{mpsc, oneshot}; use tracing::{debug, error, info}; -use malachite_common::{Context, Height}; +use malachite_core_types::{Context, Height}; use malachite_wal as wal; use super::entry::{WalCodec, WalEntry}; diff --git a/code/crates/app/Cargo.toml b/code/crates/app/Cargo.toml index 20e3f6409..efb8f566c 100644 --- a/code/crates/app/Cargo.toml +++ b/code/crates/app/Cargo.toml @@ -10,7 +10,7 @@ rust-version.workspace = true [dependencies] malachite-actors.workspace = true malachite-codec.workspace = true -malachite-common.workspace = true +malachite-core-types.workspace = true malachite-config.workspace = true malachite-consensus.workspace = true malachite-gossip-consensus.workspace = true diff --git a/code/crates/app/src/types.rs b/code/crates/app/src/types.rs index e939bdabe..b8721c3c3 100644 --- a/code/crates/app/src/types.rs +++ b/code/crates/app/src/types.rs @@ -5,7 +5,7 @@ pub use malachite_consensus::{ConsensusMsg, ProposedValue, SignedConsensusMsg, V pub use malachite_peer::PeerId; pub mod core { - pub use malachite_common::*; + pub use malachite_core_types::*; } pub mod config { diff --git a/code/crates/cli/Cargo.toml b/code/crates/cli/Cargo.toml index ef54e4060..4dcbc4bd6 100644 --- a/code/crates/cli/Cargo.toml +++ b/code/crates/cli/Cargo.toml @@ -10,7 +10,7 @@ publish.workspace = true workspace = true [dependencies] -malachite-common.workspace = true +malachite-core-types.workspace = true malachite-metrics.workspace = true malachite-config.workspace = true malachite-app.workspace = true diff --git a/code/crates/cli/src/new.rs b/code/crates/cli/src/new.rs index ed76951e6..47a1035c0 100644 --- a/code/crates/cli/src/new.rs +++ b/code/crates/cli/src/new.rs @@ -7,8 +7,8 @@ use rand::rngs::OsRng; use rand::{seq::IteratorRandom, Rng, SeedableRng}; use malachite_app::Node; -use malachite_common::{PrivateKey, PublicKey}; use malachite_config::*; +use malachite_core_types::{PrivateKey, PublicKey}; const MIN_VOTING_POWER: u64 = 1; const MAX_VOTING_POWER: u64 = 1; diff --git a/code/crates/config/Cargo.toml b/code/crates/config/Cargo.toml index 58b63e8a8..29e1cb3f3 100644 --- a/code/crates/config/Cargo.toml +++ b/code/crates/config/Cargo.toml @@ -13,7 +13,7 @@ rust-version.workspace = true workspace = true [dependencies] -malachite-common.workspace = true +malachite-core-types.workspace = true bytesize = { workspace = true, features = ["serde"] } config = { workspace = true } diff --git a/code/crates/config/src/lib.rs b/code/crates/config/src/lib.rs index e3f5588dd..8d4e27545 100644 --- a/code/crates/config/src/lib.rs +++ b/code/crates/config/src/lib.rs @@ -10,7 +10,7 @@ use std::time::Duration; use bytesize::ByteSize; use config as config_rs; -use malachite_common::TimeoutKind; +use malachite_core_types::TimeoutKind; use multiaddr::Multiaddr; use serde::{Deserialize, Serialize}; diff --git a/code/crates/consensus/Cargo.toml b/code/crates/consensus/Cargo.toml index 62400aed7..08ad558cf 100644 --- a/code/crates/consensus/Cargo.toml +++ b/code/crates/consensus/Cargo.toml @@ -9,11 +9,11 @@ rust-version.workspace = true [features] std = [] -debug = ["std", "malachite-driver/debug"] +debug = ["std", "malachite-core-driver/debug"] [dependencies] -malachite-common.workspace = true -malachite-driver.workspace = true +malachite-core-types.workspace = true +malachite-core-driver.workspace = true malachite-metrics.workspace = true malachite-peer.workspace = true diff --git a/code/crates/consensus/src/effect.rs b/code/crates/consensus/src/effect.rs index 4a2c53906..48d1fe504 100644 --- a/code/crates/consensus/src/effect.rs +++ b/code/crates/consensus/src/effect.rs @@ -1,6 +1,6 @@ use derive_where::derive_where; -use malachite_common::*; +use malachite_core_types::*; use crate::input::RequestId; use crate::types::SignedConsensusMsg; diff --git a/code/crates/consensus/src/error.rs b/code/crates/consensus/src/error.rs index 61ecd0644..e04fa96c7 100644 --- a/code/crates/consensus/src/error.rs +++ b/code/crates/consensus/src/error.rs @@ -1,7 +1,7 @@ use derive_where::derive_where; -use malachite_common::{CertificateError, CommitCertificate, Context, Round}; -use malachite_driver::Error as DriverError; +use malachite_core_driver::Error as DriverError; +use malachite_core_types::{CertificateError, CommitCertificate, Context, Round}; use crate::effect::Resume; diff --git a/code/crates/consensus/src/full_proposal.rs b/code/crates/consensus/src/full_proposal.rs index ff620f0d9..cb31c747d 100644 --- a/code/crates/consensus/src/full_proposal.rs +++ b/code/crates/consensus/src/full_proposal.rs @@ -3,7 +3,7 @@ use std::collections::BTreeMap; use derive_where::derive_where; use tracing::debug; -use malachite_common::{ +use malachite_core_types::{ Context, Height, Proposal, Round, SignedExtension, SignedProposal, Validity, Value, }; diff --git a/code/crates/consensus/src/handle/driver.rs b/code/crates/consensus/src/handle/driver.rs index cfd4a10eb..64f7874b1 100644 --- a/code/crates/consensus/src/handle/driver.rs +++ b/code/crates/consensus/src/handle/driver.rs @@ -5,8 +5,8 @@ use crate::handle::vote::on_vote; use crate::prelude::*; use crate::types::SignedConsensusMsg; use crate::util::pretty::PrettyVal; -use malachite_driver::Input as DriverInput; -use malachite_driver::Output as DriverOutput; +use malachite_core_driver::Input as DriverInput; +use malachite_core_driver::Output as DriverOutput; #[async_recursion] pub async fn apply_driver_input( diff --git a/code/crates/consensus/src/input.rs b/code/crates/consensus/src/input.rs index f29c2f4ac..c1dc2b61f 100644 --- a/code/crates/consensus/src/input.rs +++ b/code/crates/consensus/src/input.rs @@ -1,5 +1,5 @@ use derive_where::derive_where; -use malachite_common::{ +use malachite_core_types::{ CommitCertificate, Context, Round, SignedProposal, SignedVote, Timeout, ValueOrigin, VoteSet, }; diff --git a/code/crates/consensus/src/params.rs b/code/crates/consensus/src/params.rs index c86f01468..6d382eb08 100644 --- a/code/crates/consensus/src/params.rs +++ b/code/crates/consensus/src/params.rs @@ -1,7 +1,7 @@ use derive_where::derive_where; -use malachite_common::Context; +use malachite_core_types::Context; -pub use malachite_driver::ThresholdParams; +pub use malachite_core_driver::ThresholdParams; use crate::ValuePayload; diff --git a/code/crates/consensus/src/prelude.rs b/code/crates/consensus/src/prelude.rs index e5c35d578..336a098e7 100644 --- a/code/crates/consensus/src/prelude.rs +++ b/code/crates/consensus/src/prelude.rs @@ -1,8 +1,8 @@ pub use async_recursion::async_recursion; pub use tracing::{debug, info, warn}; -pub use malachite_common::*; -pub use malachite_driver::Input as DriverInput; +pub use malachite_core_driver::Input as DriverInput; +pub use malachite_core_types::*; pub use malachite_metrics::Metrics; pub use crate::effect::{Effect, Resume}; diff --git a/code/crates/consensus/src/state.rs b/code/crates/consensus/src/state.rs index 7e07d83fd..870a1ee46 100644 --- a/code/crates/consensus/src/state.rs +++ b/code/crates/consensus/src/state.rs @@ -1,8 +1,8 @@ use std::collections::{BTreeMap, BTreeSet}; use tracing::{debug, warn}; -use malachite_common::*; -use malachite_driver::Driver; +use malachite_core_driver::Driver; +use malachite_core_types::*; use crate::input::Input; use crate::util::max_queue::MaxQueue; diff --git a/code/crates/consensus/src/types.rs b/code/crates/consensus/src/types.rs index cd6440e69..17e5b3afa 100644 --- a/code/crates/consensus/src/types.rs +++ b/code/crates/consensus/src/types.rs @@ -1,6 +1,6 @@ use derive_where::derive_where; -use malachite_common::{ +use malachite_core_types::{ Context, Proposal, Round, Signature, SignedExtension, SignedProposal, SignedVote, Validity, Vote, }; diff --git a/code/crates/consensus/src/util/pretty.rs b/code/crates/consensus/src/util/pretty.rs index 5ae0d7f51..439b63767 100644 --- a/code/crates/consensus/src/util/pretty.rs +++ b/code/crates/consensus/src/util/pretty.rs @@ -1,6 +1,6 @@ use core::fmt; -use malachite_common::{Context, NilOrVal, Proposal, Value}; +use malachite_core_types::{Context, NilOrVal, Proposal, Value}; pub struct PrettyVal<'a, T>(pub NilOrVal<&'a T>); @@ -23,7 +23,7 @@ where Ctx: Context, { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - use malachite_common::Vote; + use malachite_core_types::Vote; write!( f, diff --git a/code/crates/consensus/tests/full_proposal.rs b/code/crates/consensus/tests/full_proposal.rs index a3a3029ee..eed4f4262 100644 --- a/code/crates/consensus/tests/full_proposal.rs +++ b/code/crates/consensus/tests/full_proposal.rs @@ -1,5 +1,5 @@ -use malachite_common::{Context, Round, SignedProposal, Validity, ValueOrigin}; use malachite_consensus::{FullProposal, FullProposalKeeper, Input, ProposedValue}; +use malachite_core_types::{Context, Round, SignedProposal, Validity, ValueOrigin}; use malachite_test::utils::validators::make_validators; use malachite_test::{Address, Proposal, Value}; use malachite_test::{Height, TestContext}; diff --git a/code/crates/driver/Cargo.toml b/code/crates/core-driver/Cargo.toml similarity index 52% rename from code/crates/driver/Cargo.toml rename to code/crates/core-driver/Cargo.toml index d9862d751..9612f5518 100644 --- a/code/crates/driver/Cargo.toml +++ b/code/crates/core-driver/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "malachite-driver" +name = "malachite-core-driver" description = "Driver for the state machine of Malachite consensus engine" version.workspace = true @@ -10,20 +10,20 @@ publish.workspace = true rust-version.workspace = true [features] -std = ["malachite-round/std"] -debug = ["std", "malachite-round/debug"] +std = ["malachite-core-state-machine/std"] +debug = ["std", "malachite-core-state-machine/debug"] [lints] workspace = true [dependencies] -malachite-common = { workspace = true } -malachite-round = { workspace = true } -malachite-vote = { workspace = true } +malachite-core-types = { workspace = true } +malachite-core-state-machine = { workspace = true } +malachite-core-votekeeper = { workspace = true } derive-where = { workspace = true } thiserror = { workspace = true, default-features = false } [dev-dependencies] -malachite-test = { workspace = true } -malachite-driver-test-utils = { workspace = true } +malachite-test = { workspace = true } +malachite-core-driver-test-utils = { workspace = true } diff --git a/code/crates/driver/src/driver.rs b/code/crates/core-driver/src/driver.rs similarity index 97% rename from code/crates/driver/src/driver.rs rename to code/crates/core-driver/src/driver.rs index 62b8df96f..342421cce 100644 --- a/code/crates/driver/src/driver.rs +++ b/code/crates/core-driver/src/driver.rs @@ -2,15 +2,15 @@ use alloc::vec; use alloc::vec::Vec; use core::fmt; -use malachite_common::{ +use malachite_core_state_machine::input::Input as RoundInput; +use malachite_core_state_machine::output::Output as RoundOutput; +use malachite_core_state_machine::state::{RoundValue, State as RoundState, Step}; +use malachite_core_state_machine::state_machine::Info; +use malachite_core_types::{ CommitCertificate, Context, Proposal, Round, SignedProposal, SignedVote, Timeout, TimeoutKind, Validator, ValidatorSet, Validity, ValueId, Vote, }; -use malachite_round::input::Input as RoundInput; -use malachite_round::output::Output as RoundOutput; -use malachite_round::state::{RoundValue, State as RoundState, Step}; -use malachite_round::state_machine::Info; -use malachite_vote::keeper::VoteKeeper; +use malachite_core_votekeeper::keeper::VoteKeeper; use crate::input::Input; use crate::output::Output; @@ -409,7 +409,7 @@ where /// Return the traces logged during execution. #[cfg(feature = "debug")] - pub fn get_traces(&self) -> &[malachite_round::traces::Trace] { + pub fn get_traces(&self) -> &[malachite_core_state_machine::traces::Trace] { self.round_state.get_traces() } } diff --git a/code/crates/driver/src/error.rs b/code/crates/core-driver/src/error.rs similarity index 97% rename from code/crates/driver/src/error.rs rename to code/crates/core-driver/src/error.rs index 044b7fe69..bacb9f9c2 100644 --- a/code/crates/driver/src/error.rs +++ b/code/crates/core-driver/src/error.rs @@ -1,6 +1,6 @@ use derive_where::derive_where; -use malachite_common::{Context, Round}; +use malachite_core_types::{Context, Round}; /// The type of errors that can be yielded by the `Driver`. #[derive_where(Clone, Debug, PartialEq, Eq)] diff --git a/code/crates/driver/src/input.rs b/code/crates/core-driver/src/input.rs similarity index 96% rename from code/crates/driver/src/input.rs rename to code/crates/core-driver/src/input.rs index d4827d5eb..6bf155a8d 100644 --- a/code/crates/driver/src/input.rs +++ b/code/crates/core-driver/src/input.rs @@ -1,4 +1,4 @@ -use malachite_common::{ +use malachite_core_types::{ CommitCertificate, Context, Round, SignedProposal, SignedVote, Timeout, Validity, }; diff --git a/code/crates/driver/src/lib.rs b/code/crates/core-driver/src/lib.rs similarity index 93% rename from code/crates/driver/src/lib.rs rename to code/crates/core-driver/src/lib.rs index f4c21f24d..db1be32ef 100644 --- a/code/crates/driver/src/lib.rs +++ b/code/crates/core-driver/src/lib.rs @@ -29,4 +29,4 @@ pub use error::Error; pub use input::Input; pub use output::Output; -pub use malachite_vote::ThresholdParams; +pub use malachite_core_votekeeper::ThresholdParams; diff --git a/code/crates/driver/src/mux.rs b/code/crates/core-driver/src/mux.rs similarity index 97% rename from code/crates/driver/src/mux.rs rename to code/crates/core-driver/src/mux.rs index 08d308ddc..bfadb67cc 100644 --- a/code/crates/driver/src/mux.rs +++ b/code/crates/core-driver/src/mux.rs @@ -29,13 +29,13 @@ use alloc::vec::Vec; -use malachite_common::{CommitCertificate, SignedProposal}; -use malachite_common::{Context, Proposal, Round, Validity, Value, ValueId, VoteType}; -use malachite_round::input::Input as RoundInput; -use malachite_round::state::Step; -use malachite_vote::keeper::Output as VKOutput; -use malachite_vote::keeper::VoteKeeper; -use malachite_vote::Threshold; +use malachite_core_state_machine::input::Input as RoundInput; +use malachite_core_state_machine::state::Step; +use malachite_core_types::{CommitCertificate, SignedProposal}; +use malachite_core_types::{Context, Proposal, Round, Validity, Value, ValueId, VoteType}; +use malachite_core_votekeeper::keeper::Output as VKOutput; +use malachite_core_votekeeper::keeper::VoteKeeper; +use malachite_core_votekeeper::Threshold; use crate::Driver; diff --git a/code/crates/driver/src/output.rs b/code/crates/core-driver/src/output.rs similarity index 92% rename from code/crates/driver/src/output.rs rename to code/crates/core-driver/src/output.rs index 14bc53a04..2b11b85a6 100644 --- a/code/crates/driver/src/output.rs +++ b/code/crates/core-driver/src/output.rs @@ -1,6 +1,6 @@ use derive_where::derive_where; -use malachite_common::{Context, Round, Timeout}; +use malachite_core_types::{Context, Round, Timeout}; /// Messages emitted by the [`Driver`](crate::Driver) #[derive_where(Clone, Debug, PartialEq, Eq)] diff --git a/code/crates/driver/src/proposal_keeper.rs b/code/crates/core-driver/src/proposal_keeper.rs similarity index 98% rename from code/crates/driver/src/proposal_keeper.rs rename to code/crates/core-driver/src/proposal_keeper.rs index 28aa411c6..41b506439 100644 --- a/code/crates/driver/src/proposal_keeper.rs +++ b/code/crates/core-driver/src/proposal_keeper.rs @@ -7,7 +7,7 @@ use alloc::vec::Vec; use derive_where::derive_where; use thiserror::Error; -use malachite_common::{Context, Proposal, Round, SignedProposal, Validity}; +use malachite_core_types::{Context, Proposal, Round, SignedProposal, Validity}; /// Errors can that be yielded when recording a proposal. #[derive_where(Debug)] diff --git a/code/crates/core-driver/test-utils/Cargo.toml b/code/crates/core-driver/test-utils/Cargo.toml new file mode 100644 index 000000000..173bc57d3 --- /dev/null +++ b/code/crates/core-driver/test-utils/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "malachite-core-driver-test-utils" +description = "Test utilities for the `malachite-core-driver`" +publish = false + +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true +rust-version.workspace = true + + +[dependencies] +malachite-core-driver = { workspace = true } +malachite-core-state-machine = { workspace = true } +malachite-core-types = { workspace = true } +malachite-core-votekeeper = { workspace = true } +malachite-test = { workspace = true } diff --git a/code/crates/driver/test-utils/src/lib.rs b/code/crates/core-driver/test-utils/src/lib.rs similarity index 97% rename from code/crates/driver/test-utils/src/lib.rs rename to code/crates/core-driver/test-utils/src/lib.rs index bb8253364..82f94bf17 100644 --- a/code/crates/driver/test-utils/src/lib.rs +++ b/code/crates/core-driver/test-utils/src/lib.rs @@ -1,6 +1,8 @@ -use malachite_common::{NilOrVal, Round, SignedProposal, SignedVote, Timeout, Validity}; -use malachite_driver::{Input, Output}; -use malachite_round::state::{RoundValue, State, Step}; +#![allow(clippy::needless_update)] + +use malachite_core_driver::{Input, Output}; +use malachite_core_state_machine::state::{RoundValue, State, Step}; +use malachite_core_types::{NilOrVal, Round, SignedProposal, SignedVote, Timeout, Validity}; use malachite_test::{Address, Height, Proposal, Signature, TestContext, Value, Vote}; pub fn new_round_input(round: Round, proposer: Address) -> Input { diff --git a/code/crates/driver/tests/basic.rs b/code/crates/core-driver/tests/basic.rs similarity index 99% rename from code/crates/driver/tests/basic.rs rename to code/crates/core-driver/tests/basic.rs index 1180bb8f6..72a4d2c1c 100644 --- a/code/crates/driver/tests/basic.rs +++ b/code/crates/core-driver/tests/basic.rs @@ -1,10 +1,12 @@ +#![allow(clippy::needless_update)] + use std::sync::Arc; -use malachite_common::{ +use malachite_core_driver::{Driver, Error, Input, Output}; +use malachite_core_state_machine::state::{RoundValue, State, Step}; +use malachite_core_types::{ NilOrVal, Round, SignedProposal, SignedVote, Timeout, TimeoutKind, Validity, }; -use malachite_driver::{Driver, Error, Input, Output}; -use malachite_round::state::{RoundValue, State, Step}; use malachite_test::proposer_selector::{FixedProposer, ProposerSelector, RotateProposer}; use malachite_test::utils::validators::make_validators; use malachite_test::{ diff --git a/code/crates/driver/tests/extra.rs b/code/crates/core-driver/tests/extra.rs similarity index 99% rename from code/crates/driver/tests/extra.rs rename to code/crates/core-driver/tests/extra.rs index 355ca5573..0f1e96fd8 100644 --- a/code/crates/driver/tests/extra.rs +++ b/code/crates/core-driver/tests/extra.rs @@ -1,8 +1,8 @@ -use malachite_common::{Round, Validity}; -use malachite_driver::{Driver, Input, Output}; -use malachite_round::state::State; +use malachite_core_driver::{Driver, Input, Output}; +use malachite_core_state_machine::state::State; +use malachite_core_types::{Round, Validity}; -use malachite_driver_test_utils::*; +use malachite_core_driver_test_utils::*; use malachite_test::utils::validators::make_validators; use malachite_test::{Height, Proposal, TestContext, ValidatorSet, Value}; diff --git a/code/crates/core-state-machine/Cargo.toml b/code/crates/core-state-machine/Cargo.toml new file mode 100644 index 000000000..97e75577f --- /dev/null +++ b/code/crates/core-state-machine/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "malachite-core-state-machine" +description = "Core state-machine for the Malachite consensus engine" + +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true +publish.workspace = true +rust-version.workspace = true + +[dependencies] +malachite-core-types = { workspace = true } + +derive-where = { workspace = true } +displaydoc = { workspace = true } +time = { workspace = true, optional = true } + +[features] +std = [] +debug = ["std", "dep:time"] diff --git a/code/crates/round/src/input.rs b/code/crates/core-state-machine/src/input.rs similarity index 97% rename from code/crates/round/src/input.rs rename to code/crates/core-state-machine/src/input.rs index 6c8f23df4..fa32a9a46 100644 --- a/code/crates/round/src/input.rs +++ b/code/crates/core-state-machine/src/input.rs @@ -2,7 +2,7 @@ use derive_where::derive_where; -use malachite_common::{Context, Round, ValueId}; +use malachite_core_types::{Context, Round, ValueId}; /// Input to the round state machine. #[derive_where(Clone, Debug, PartialEq, Eq)] diff --git a/code/crates/round/src/lib.rs b/code/crates/core-state-machine/src/lib.rs similarity index 100% rename from code/crates/round/src/lib.rs rename to code/crates/core-state-machine/src/lib.rs diff --git a/code/crates/round/src/output.rs b/code/crates/core-state-machine/src/output.rs similarity index 96% rename from code/crates/round/src/output.rs rename to code/crates/core-state-machine/src/output.rs index 07ddf289e..b3bb692cf 100644 --- a/code/crates/round/src/output.rs +++ b/code/crates/core-state-machine/src/output.rs @@ -2,7 +2,7 @@ use derive_where::derive_where; -use malachite_common::{Context, NilOrVal, Round, Timeout, TimeoutKind, ValueId}; +use malachite_core_types::{Context, NilOrVal, Round, Timeout, TimeoutKind, ValueId}; /// Output of the round state machine. #[derive_where(Clone, Debug, PartialEq, Eq)] diff --git a/code/crates/round/src/state.rs b/code/crates/core-state-machine/src/state.rs similarity index 98% rename from code/crates/round/src/state.rs rename to code/crates/core-state-machine/src/state.rs index a72764210..62b153801 100644 --- a/code/crates/round/src/state.rs +++ b/code/crates/core-state-machine/src/state.rs @@ -9,7 +9,7 @@ use crate::transition::Transition; #[cfg(feature = "debug")] use crate::traces::*; -use malachite_common::{Context, Round}; +use malachite_core_types::{Context, Round}; /// A value and its associated round #[derive(Clone, Debug, PartialEq, Eq)] diff --git a/code/crates/round/src/state_machine.rs b/code/crates/core-state-machine/src/state_machine.rs similarity index 99% rename from code/crates/round/src/state_machine.rs rename to code/crates/core-state-machine/src/state_machine.rs index 29ca8d4fb..00ee17d5f 100644 --- a/code/crates/round/src/state_machine.rs +++ b/code/crates/core-state-machine/src/state_machine.rs @@ -1,6 +1,6 @@ //! The consensus state machine. -use malachite_common::{Context, NilOrVal, Proposal, Round, TimeoutKind, Value}; +use malachite_core_types::{Context, NilOrVal, Proposal, Round, TimeoutKind, Value}; use crate::debug_trace; use crate::input::Input; diff --git a/code/crates/round/src/traces/line.rs b/code/crates/core-state-machine/src/traces/line.rs similarity index 100% rename from code/crates/round/src/traces/line.rs rename to code/crates/core-state-machine/src/traces/line.rs diff --git a/code/crates/round/src/traces/mod.rs b/code/crates/core-state-machine/src/traces/mod.rs similarity index 100% rename from code/crates/round/src/traces/mod.rs rename to code/crates/core-state-machine/src/traces/mod.rs diff --git a/code/crates/round/src/traces/trace.rs b/code/crates/core-state-machine/src/traces/trace.rs similarity index 93% rename from code/crates/round/src/traces/trace.rs rename to code/crates/core-state-machine/src/traces/trace.rs index ca228dc56..855248d13 100644 --- a/code/crates/round/src/traces/trace.rs +++ b/code/crates/core-state-machine/src/traces/trace.rs @@ -2,7 +2,7 @@ use derive_where::derive_where; use displaydoc::Display; use time::OffsetDateTime; -use malachite_common::{Context, Round}; +use malachite_core_types::{Context, Round}; use super::Line; diff --git a/code/crates/round/src/transition.rs b/code/crates/core-state-machine/src/transition.rs similarity index 97% rename from code/crates/round/src/transition.rs rename to code/crates/core-state-machine/src/transition.rs index e66f99359..e77b3c0ff 100644 --- a/code/crates/round/src/transition.rs +++ b/code/crates/core-state-machine/src/transition.rs @@ -1,6 +1,6 @@ //! A transition taken by the state machine after processing an input. -use malachite_common::Context; +use malachite_core_types::Context; use crate::output::Output; use crate::state::State; diff --git a/code/crates/common/Cargo.toml b/code/crates/core-types/Cargo.toml similarity index 92% rename from code/crates/common/Cargo.toml rename to code/crates/core-types/Cargo.toml index c08b626d8..c0ee1a8c6 100644 --- a/code/crates/common/Cargo.toml +++ b/code/crates/core-types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "malachite-common" +name = "malachite-core-types" description = "Common datatypes and interfaces for the Malachite consensus engine" version.workspace = true diff --git a/code/crates/common/src/certificate.rs b/code/crates/core-types/src/certificate.rs similarity index 100% rename from code/crates/common/src/certificate.rs rename to code/crates/core-types/src/certificate.rs diff --git a/code/crates/common/src/context.rs b/code/crates/core-types/src/context.rs similarity index 100% rename from code/crates/common/src/context.rs rename to code/crates/core-types/src/context.rs diff --git a/code/crates/common/src/height.rs b/code/crates/core-types/src/height.rs similarity index 100% rename from code/crates/common/src/height.rs rename to code/crates/core-types/src/height.rs diff --git a/code/crates/common/src/lib.rs b/code/crates/core-types/src/lib.rs similarity index 100% rename from code/crates/common/src/lib.rs rename to code/crates/core-types/src/lib.rs diff --git a/code/crates/common/src/proposal.rs b/code/crates/core-types/src/proposal.rs similarity index 100% rename from code/crates/common/src/proposal.rs rename to code/crates/core-types/src/proposal.rs diff --git a/code/crates/common/src/proposal_part.rs b/code/crates/core-types/src/proposal_part.rs similarity index 100% rename from code/crates/common/src/proposal_part.rs rename to code/crates/core-types/src/proposal_part.rs diff --git a/code/crates/common/src/round.rs b/code/crates/core-types/src/round.rs similarity index 100% rename from code/crates/common/src/round.rs rename to code/crates/core-types/src/round.rs diff --git a/code/crates/common/src/signed_message.rs b/code/crates/core-types/src/signed_message.rs similarity index 100% rename from code/crates/common/src/signed_message.rs rename to code/crates/core-types/src/signed_message.rs diff --git a/code/crates/common/src/signing.rs b/code/crates/core-types/src/signing.rs similarity index 100% rename from code/crates/common/src/signing.rs rename to code/crates/core-types/src/signing.rs diff --git a/code/crates/common/src/threshold.rs b/code/crates/core-types/src/threshold.rs similarity index 100% rename from code/crates/common/src/threshold.rs rename to code/crates/core-types/src/threshold.rs diff --git a/code/crates/common/src/timeout.rs b/code/crates/core-types/src/timeout.rs similarity index 100% rename from code/crates/common/src/timeout.rs rename to code/crates/core-types/src/timeout.rs diff --git a/code/crates/common/src/validator_set.rs b/code/crates/core-types/src/validator_set.rs similarity index 100% rename from code/crates/common/src/validator_set.rs rename to code/crates/core-types/src/validator_set.rs diff --git a/code/crates/common/src/value.rs b/code/crates/core-types/src/value.rs similarity index 100% rename from code/crates/common/src/value.rs rename to code/crates/core-types/src/value.rs diff --git a/code/crates/common/src/vote.rs b/code/crates/core-types/src/vote.rs similarity index 100% rename from code/crates/common/src/vote.rs rename to code/crates/core-types/src/vote.rs diff --git a/code/crates/common/src/vote_set.rs b/code/crates/core-types/src/vote_set.rs similarity index 100% rename from code/crates/common/src/vote_set.rs rename to code/crates/core-types/src/vote_set.rs diff --git a/code/crates/vote/Cargo.toml b/code/crates/core-votekeeper/Cargo.toml similarity index 82% rename from code/crates/vote/Cargo.toml rename to code/crates/core-votekeeper/Cargo.toml index 965990705..c69e6411d 100644 --- a/code/crates/vote/Cargo.toml +++ b/code/crates/core-votekeeper/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "malachite-vote" +name = "malachite-core-votekeeper" description = "Voting system for the Malachite consensus engine" version.workspace = true @@ -10,7 +10,7 @@ publish.workspace = true rust-version.workspace = true [dependencies] -malachite-common = { version = "0.1.0", path = "../common" } +malachite-core-types = { workspace = true } derive-where = { workspace = true } thiserror = { workspace = true, default-features = false } diff --git a/code/crates/vote/src/count.rs b/code/crates/core-votekeeper/src/count.rs similarity index 97% rename from code/crates/vote/src/count.rs rename to code/crates/core-votekeeper/src/count.rs index b0a6cfba3..97f01f7a5 100644 --- a/code/crates/vote/src/count.rs +++ b/code/crates/core-votekeeper/src/count.rs @@ -3,7 +3,7 @@ use alloc::collections::BTreeSet; use derive_where::derive_where; -use malachite_common::{Context, NilOrVal, ValueId, Vote}; +use malachite_core_types::{Context, NilOrVal, ValueId, Vote}; use crate::value_weights::ValuesWeights; use crate::{Threshold, ThresholdParam, Weight}; diff --git a/code/crates/vote/src/evidence.rs b/code/crates/core-votekeeper/src/evidence.rs similarity index 96% rename from code/crates/vote/src/evidence.rs rename to code/crates/core-votekeeper/src/evidence.rs index 2adb5cff5..d23552172 100644 --- a/code/crates/vote/src/evidence.rs +++ b/code/crates/core-votekeeper/src/evidence.rs @@ -5,7 +5,7 @@ use alloc::{vec, vec::Vec}; use derive_where::derive_where; -use malachite_common::{Context, SignedVote, Vote}; +use malachite_core_types::{Context, SignedVote, Vote}; /// Keeps track of evidence of equivocation. #[derive_where(Clone, Debug, Default)] diff --git a/code/crates/vote/src/keeper.rs b/code/crates/core-votekeeper/src/keeper.rs similarity index 99% rename from code/crates/vote/src/keeper.rs rename to code/crates/core-votekeeper/src/keeper.rs index bc8c77fa5..e612054dd 100644 --- a/code/crates/vote/src/keeper.rs +++ b/code/crates/core-votekeeper/src/keeper.rs @@ -5,7 +5,7 @@ use thiserror::Error; use alloc::collections::{BTreeMap, BTreeSet}; -use malachite_common::{ +use malachite_core_types::{ Context, NilOrVal, Round, SignedVote, Validator, ValidatorSet, ValueId, Vote, VoteType, }; diff --git a/code/crates/vote/src/lib.rs b/code/crates/core-votekeeper/src/lib.rs similarity index 84% rename from code/crates/vote/src/lib.rs rename to code/crates/core-votekeeper/src/lib.rs index 9116303fa..cc8d45873 100644 --- a/code/crates/vote/src/lib.rs +++ b/code/crates/core-votekeeper/src/lib.rs @@ -25,6 +25,6 @@ pub mod value_weights; /// Represents the weight of a vote, /// ie. the voting power of the validator that cast the vote. -pub type Weight = malachite_common::VotingPower; +pub type Weight = malachite_core_types::VotingPower; -pub use malachite_common::{Threshold, ThresholdParam, ThresholdParams}; +pub use malachite_core_types::{Threshold, ThresholdParam, ThresholdParams}; diff --git a/code/crates/vote/src/round_votes.rs b/code/crates/core-votekeeper/src/round_votes.rs similarity index 97% rename from code/crates/vote/src/round_votes.rs rename to code/crates/core-votekeeper/src/round_votes.rs index 99920beda..b728b8c59 100644 --- a/code/crates/vote/src/round_votes.rs +++ b/code/crates/core-votekeeper/src/round_votes.rs @@ -2,7 +2,7 @@ use derive_where::derive_where; -use malachite_common::{Context, NilOrVal, ValueId, Vote, VoteType}; +use malachite_core_types::{Context, NilOrVal, ValueId, Vote, VoteType}; use crate::count::VoteCount; use crate::{Threshold, ThresholdParam, Weight}; diff --git a/code/crates/vote/src/round_weights.rs b/code/crates/core-votekeeper/src/round_weights.rs similarity index 100% rename from code/crates/vote/src/round_weights.rs rename to code/crates/core-votekeeper/src/round_weights.rs diff --git a/code/crates/vote/src/value_weights.rs b/code/crates/core-votekeeper/src/value_weights.rs similarity index 100% rename from code/crates/vote/src/value_weights.rs rename to code/crates/core-votekeeper/src/value_weights.rs diff --git a/code/crates/vote/tests/round_votes.rs b/code/crates/core-votekeeper/tests/round_votes.rs similarity index 96% rename from code/crates/vote/tests/round_votes.rs rename to code/crates/core-votekeeper/tests/round_votes.rs index f04976dbb..13dcca6fb 100644 --- a/code/crates/vote/tests/round_votes.rs +++ b/code/crates/core-votekeeper/tests/round_votes.rs @@ -1,5 +1,5 @@ -use malachite_common::{NilOrVal, Round}; -use malachite_vote::round_votes::RoundVotes; +use malachite_core_types::{NilOrVal, Round}; +use malachite_core_votekeeper::round_votes::RoundVotes; use malachite_test::{Address, Height, TestContext, ValueId, Vote}; diff --git a/code/crates/vote/tests/vote_count.rs b/code/crates/core-votekeeper/tests/vote_count.rs similarity index 98% rename from code/crates/vote/tests/vote_count.rs rename to code/crates/core-votekeeper/tests/vote_count.rs index 08d305027..6142b8801 100644 --- a/code/crates/vote/tests/vote_count.rs +++ b/code/crates/core-votekeeper/tests/vote_count.rs @@ -1,9 +1,9 @@ #![allow(clippy::bool_assert_comparison)] -use malachite_common::{NilOrVal, Round}; +use malachite_core_types::{NilOrVal, Round}; +use malachite_core_votekeeper::count::VoteCount; +use malachite_core_votekeeper::{Threshold, ThresholdParam}; use malachite_test::{Address, Height, TestContext, ValueId, Vote}; -use malachite_vote::count::VoteCount; -use malachite_vote::{Threshold, ThresholdParam}; #[test] fn vote_count_nil() { diff --git a/code/crates/vote/tests/vote_keeper.rs b/code/crates/core-votekeeper/tests/vote_keeper.rs similarity index 98% rename from code/crates/vote/tests/vote_keeper.rs rename to code/crates/core-votekeeper/tests/vote_keeper.rs index a92f9825c..20a37d746 100644 --- a/code/crates/vote/tests/vote_keeper.rs +++ b/code/crates/core-votekeeper/tests/vote_keeper.rs @@ -1,5 +1,5 @@ -use malachite_common::{NilOrVal, Round, SignedVote}; -use malachite_vote::keeper::{Output, VoteKeeper}; +use malachite_core_types::{NilOrVal, Round, SignedVote}; +use malachite_core_votekeeper::keeper::{Output, VoteKeeper}; use malachite_test::{ Address, Height, PrivateKey, Signature, TestContext, Validator, ValidatorSet, ValueId, Vote, diff --git a/code/crates/driver/test-utils/Cargo.toml b/code/crates/driver/test-utils/Cargo.toml deleted file mode 100644 index fe875cd0e..000000000 --- a/code/crates/driver/test-utils/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "malachite-driver-test-utils" -description = "Test utilities for the `malachite-driver`" -publish = false - -version.workspace = true -edition.workspace = true -repository.workspace = true -license.workspace = true -rust-version.workspace = true - - -[dependencies] -malachite-common = { workspace = true } -malachite-round = { workspace = true } -malachite-vote = { workspace = true } -malachite-test = { workspace = true } -malachite-driver = { workspace = true } diff --git a/code/crates/metrics/Cargo.toml b/code/crates/metrics/Cargo.toml index e155090d6..10c42d56d 100644 --- a/code/crates/metrics/Cargo.toml +++ b/code/crates/metrics/Cargo.toml @@ -8,7 +8,7 @@ publish.workspace = true rust-version.workspace = true [dependencies] -malachite-round.workspace = true +malachite-core-state-machine.workspace = true prometheus-client.workspace = true [lints] diff --git a/code/crates/metrics/src/metrics.rs b/code/crates/metrics/src/metrics.rs index 5f87e5f39..a4a38e09c 100644 --- a/code/crates/metrics/src/metrics.rs +++ b/code/crates/metrics/src/metrics.rs @@ -3,7 +3,7 @@ use std::ops::Deref; use std::sync::{Arc, Mutex}; use std::time::Instant; -use malachite_round::state::Step; +use malachite_core_state_machine::state::Step; use prometheus_client::encoding::{EncodeLabelSet, EncodeLabelValue}; use prometheus_client::metrics::counter::Counter; use prometheus_client::metrics::family::Family; diff --git a/code/crates/round/Cargo.toml b/code/crates/round/Cargo.toml deleted file mode 100644 index e449acba0..000000000 --- a/code/crates/round/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "malachite-round" -description = "Per-round state-machine for the Malachite consenss engine" - -version.workspace = true -edition.workspace = true -repository.workspace = true -license.workspace = true -publish.workspace = true -rust-version.workspace = true - -[dependencies] -malachite-common = { version = "0.1.0", path = "../common" } - -derive-where.workspace = true -displaydoc.workspace = true -time = { workspace = true, optional = true } - -[features] -std = [] -debug = ["std", "dep:time"] diff --git a/code/crates/signing-ed25519/Cargo.toml b/code/crates/signing-ed25519/Cargo.toml index 108cd26e1..9302e0282 100644 --- a/code/crates/signing-ed25519/Cargo.toml +++ b/code/crates/signing-ed25519/Cargo.toml @@ -13,7 +13,7 @@ serde = ["dep:serde", "dep:base64"] rand = ["dep:rand"] [dependencies] -malachite-common = { workspace = true } +malachite-core-types = { workspace = true } signature = { workspace = true } ed25519-consensus = { workspace = true } diff --git a/code/crates/signing-ed25519/src/lib.rs b/code/crates/signing-ed25519/src/lib.rs index 21fa7a91b..5add93d46 100644 --- a/code/crates/signing-ed25519/src/lib.rs +++ b/code/crates/signing-ed25519/src/lib.rs @@ -8,7 +8,7 @@ extern crate alloc; use alloc::vec::Vec; -use malachite_common::SigningScheme; +use malachite_core_types::SigningScheme; use signature::{Keypair, Signer, Verifier}; #[cfg(feature = "rand")] diff --git a/code/crates/starknet/app/Cargo.toml b/code/crates/starknet/app/Cargo.toml index f3b600955..84905003c 100644 --- a/code/crates/starknet/app/Cargo.toml +++ b/code/crates/starknet/app/Cargo.toml @@ -1,27 +1,26 @@ [package] -name = "malachite-starknet-app" -version.workspace = true -edition.workspace = true -repository.workspace = true -license.workspace = true -publish.workspace = true +name = "malachite-starknet-app" +version.workspace = true +edition.workspace = true +repository.workspace = true +license.workspace = true +rust-version.workspace = true +publish = false [lints] workspace = true [dependencies] -malachite-cli.workspace = true -malachite-config.workspace = true +malachite-cli = { workspace = true } +malachite-config = { workspace = true } +malachite-starknet-host = { workspace = true } -# Starknet -malachite-starknet-host.workspace = true - -color-eyre = { workspace = true } -tracing = { workspace = true } +color-eyre = { workspace = true } +tracing = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] tikv-jemallocator = { workspace = true, features = ["background_threads"] } [dev-dependencies] clap = { workspace = true } -tempfile = {workspace = true } +tempfile = { workspace = true } diff --git a/code/crates/starknet/host/Cargo.toml b/code/crates/starknet/host/Cargo.toml index 597917e09..ef88975fc 100644 --- a/code/crates/starknet/host/Cargo.toml +++ b/code/crates/starknet/host/Cargo.toml @@ -4,43 +4,42 @@ version.workspace = true edition.workspace = true repository.workspace = true license.workspace = true -publish.workspace = true rust-version.workspace = true +publish = false [dependencies] -malachite-actors.workspace = true -malachite-app.workspace = true -malachite-codec.workspace = true -malachite-common.workspace = true -malachite-config.workspace = true -malachite-consensus.workspace = true -malachite-gossip-consensus.workspace = true -malachite-metrics.workspace = true -malachite-node.workspace = true -malachite-proto.workspace = true -malachite-starknet-p2p-proto.workspace = true -malachite-starknet-p2p-types.workspace = true -malachite-sync.workspace = true -malachite-test-mempool.workspace = true +malachite-actors = { workspace = true } +malachite-app = { workspace = true } +malachite-codec = { workspace = true } +malachite-config = { workspace = true } +malachite-consensus = { workspace = true, features = ["debug"] } +malachite-core-types = { workspace = true } +malachite-gossip-consensus = { workspace = true } +malachite-metrics = { workspace = true } +malachite-node = { workspace = true } +malachite-proto = { workspace = true } +malachite-starknet-p2p-proto = { workspace = true } +malachite-starknet-p2p-types = { workspace = true } +malachite-sync = { workspace = true } +malachite-test-mempool = { workspace = true } +async-trait = { workspace = true } bytes = { workspace = true, features = ["serde"] } - -async-trait.workspace = true -bytesize.workspace = true -derive-where.workspace = true -itertools.workspace = true -libp2p-identity.workspace = true -eyre.workspace = true -prost.workspace = true -ractor.workspace = true -rand.workspace = true -redb.workspace = true -sha3.workspace = true -serde.workspace = true -serde_json.workspace = true -tokio.workspace = true -tracing.workspace = true -thiserror.workspace = true +bytesize = { workspace = true } +derive-where = { workspace = true } +eyre = { workspace = true } +itertools = { workspace = true } +libp2p-identity = { workspace = true } +prost = { workspace = true } +ractor = { workspace = true } +rand = { workspace = true } +redb = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +sha3 = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true } +tracing = { workspace = true } [lints] workspace = true diff --git a/code/crates/starknet/host/src/actor.rs b/code/crates/starknet/host/src/actor.rs index f24a846ed..a0900424e 100644 --- a/code/crates/starknet/host/src/actor.rs +++ b/code/crates/starknet/host/src/actor.rs @@ -16,8 +16,8 @@ use malachite_actors::gossip_consensus::{ }; use malachite_actors::host::{LocallyProposedValue, ProposedValue}; use malachite_actors::util::streaming::{StreamContent, StreamMessage}; -use malachite_common::{CommitCertificate, Round, Validity, ValueOrigin}; use malachite_consensus::PeerId; +use malachite_core_types::{CommitCertificate, Round, Validity, ValueOrigin}; use malachite_metrics::Metrics; use malachite_sync::DecidedValue; diff --git a/code/crates/starknet/host/src/block_store.rs b/code/crates/starknet/host/src/block_store.rs index 5e20c0e1b..b621693b8 100644 --- a/code/crates/starknet/host/src/block_store.rs +++ b/code/crates/starknet/host/src/block_store.rs @@ -9,8 +9,8 @@ use thiserror::Error; use tracing::error; use malachite_codec::Codec; -use malachite_common::{CommitCertificate, Round}; use malachite_consensus::ProposedValue; +use malachite_core_types::{CommitCertificate, Round}; use malachite_proto::Protobuf; use crate::codec::{self, ProtobufCodec}; diff --git a/code/crates/starknet/host/src/block_store/keys.rs b/code/crates/starknet/host/src/block_store/keys.rs index 06bc0e537..f535f2bc5 100644 --- a/code/crates/starknet/host/src/block_store/keys.rs +++ b/code/crates/starknet/host/src/block_store/keys.rs @@ -1,6 +1,6 @@ use core::mem::size_of; -use malachite_common::Round; +use malachite_core_types::Round; use malachite_starknet_p2p_types::{BlockHash, Height}; pub type UndecidedValueKey = (HeightKey, RoundKey, BlockHashKey); diff --git a/code/crates/starknet/host/src/codec.rs b/code/crates/starknet/host/src/codec.rs index c7123bfbd..c1bc73fa3 100644 --- a/code/crates/starknet/host/src/codec.rs +++ b/code/crates/starknet/host/src/codec.rs @@ -3,7 +3,7 @@ use prost::Message; use malachite_actors::util::streaming::{StreamContent, StreamMessage}; use malachite_codec::Codec; -use malachite_common::{ +use malachite_core_types::{ AggregatedSignature, CommitCertificate, CommitSignature, Extension, Round, SignedExtension, SignedProposal, SignedVote, Validity, }; @@ -599,7 +599,7 @@ impl Codec> for ProtobufCodec { } pub(crate) fn encode_vote_set( - vote_set: &malachite_common::VoteSet, + vote_set: &malachite_core_types::VoteSet, ) -> Result { Ok(proto::sync::VoteSet { signed_votes: vote_set @@ -619,8 +619,8 @@ pub(crate) fn encode_vote(vote: &SignedVote) -> Result Result, ProtoError> { - Ok(malachite_common::VoteSet { +) -> Result, ProtoError> { + Ok(malachite_core_types::VoteSet { votes: vote_set .signed_votes .into_iter() diff --git a/code/crates/starknet/host/src/host.rs b/code/crates/starknet/host/src/host.rs index c3fcfa9d2..3a9dddd53 100644 --- a/code/crates/starknet/host/src/host.rs +++ b/code/crates/starknet/host/src/host.rs @@ -4,7 +4,7 @@ use async_trait::async_trait; use tokio::sync::{mpsc, oneshot}; use tokio::time::Instant; -use malachite_common::{CommitCertificate, Round}; +use malachite_core_types::{CommitCertificate, Round}; use crate::types::MockContext; diff --git a/code/crates/starknet/host/src/host/proposal.rs b/code/crates/starknet/host/src/host/proposal.rs index 9a220f1f0..bd5b6b9c7 100644 --- a/code/crates/starknet/host/src/host/proposal.rs +++ b/code/crates/starknet/host/src/host/proposal.rs @@ -12,7 +12,7 @@ use tokio::sync::{mpsc, oneshot}; use tokio::time::Instant; use tracing::{error, trace}; -use malachite_common::Round; +use malachite_core_types::Round; use crate::host::starknet::StarknetParams; use crate::mempool::{MempoolMsg, MempoolRef}; diff --git a/code/crates/starknet/host/src/host/starknet.rs b/code/crates/starknet/host/src/host/starknet.rs index 9b879a69f..3ec867a19 100644 --- a/code/crates/starknet/host/src/host/starknet.rs +++ b/code/crates/starknet/host/src/host/starknet.rs @@ -7,9 +7,9 @@ use tokio::sync::{mpsc, oneshot}; use tokio::time::Instant; use tracing::{debug, Instrument}; -use malachite_common::{CommitCertificate, Extension, Round, SignedExtension, SignedVote}; use malachite_config::VoteExtensionsConfig; use malachite_consensus::ValuePayload; +use malachite_core_types::{CommitCertificate, Extension, Round, SignedExtension, SignedVote}; use crate::host::Host; use crate::mempool::MempoolRef; diff --git a/code/crates/starknet/host/src/host/state.rs b/code/crates/starknet/host/src/host/state.rs index f1845347c..a47dda369 100644 --- a/code/crates/starknet/host/src/host/state.rs +++ b/code/crates/starknet/host/src/host/state.rs @@ -8,7 +8,7 @@ use tracing::{debug, error, trace}; use malachite_actors::consensus::ConsensusRef; use malachite_actors::host::ProposedValue; use malachite_actors::util::streaming::StreamId; -use malachite_common::{Round, SignedExtension, Validity}; +use malachite_core_types::{Round, SignedExtension, Validity}; use crate::block_store::BlockStore; use crate::host::proposal::compute_proposal_hash; diff --git a/code/crates/starknet/host/src/node.rs b/code/crates/starknet/host/src/node.rs index 2b52f24b7..8ed6ec042 100644 --- a/code/crates/starknet/host/src/node.rs +++ b/code/crates/starknet/host/src/node.rs @@ -9,8 +9,8 @@ use tracing::{info, Instrument}; use malachite_actors::util::events::TxEvent; use malachite_app::types::Keypair; use malachite_app::Node; -use malachite_common::VotingPower; use malachite_config::Config; +use malachite_core_types::VotingPower; use crate::spawn::spawn_node_actor; use crate::types::Height; diff --git a/code/crates/starknet/host/src/part_store.rs b/code/crates/starknet/host/src/part_store.rs index ef31e0bfc..56409de6f 100644 --- a/code/crates/starknet/host/src/part_store.rs +++ b/code/crates/starknet/host/src/part_store.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use derive_where::derive_where; -use malachite_common::{Context, Round, ValueId}; +use malachite_core_types::{Context, Round, ValueId}; // This is a temporary store implementation for proposal parts // diff --git a/code/crates/starknet/host/src/streaming.rs b/code/crates/starknet/host/src/streaming.rs index 21660048c..1ba3fa7e6 100644 --- a/code/crates/starknet/host/src/streaming.rs +++ b/code/crates/starknet/host/src/streaming.rs @@ -4,8 +4,8 @@ use std::collections::{BTreeMap, BinaryHeap, HashSet}; use derive_where::derive_where; use malachite_actors::util::streaming::{Sequence, StreamId, StreamMessage}; -use malachite_common::Round; use malachite_consensus::PeerId; +use malachite_core_types::Round; use crate::types::{Address, Height, ProposalInit, ProposalPart}; diff --git a/code/crates/starknet/p2p-proto/Cargo.toml b/code/crates/starknet/p2p-proto/Cargo.toml index 32e19ddf8..1317b3fcd 100644 --- a/code/crates/starknet/p2p-proto/Cargo.toml +++ b/code/crates/starknet/p2p-proto/Cargo.toml @@ -4,8 +4,8 @@ version.workspace = true edition.workspace = true repository.workspace = true license.workspace = true -publish.workspace = true rust-version.workspace = true +publish = false [dependencies] prost.workspace = true diff --git a/code/crates/starknet/p2p-types/Cargo.toml b/code/crates/starknet/p2p-types/Cargo.toml index 296673bc8..b46d228e0 100644 --- a/code/crates/starknet/p2p-types/Cargo.toml +++ b/code/crates/starknet/p2p-types/Cargo.toml @@ -4,21 +4,21 @@ version.workspace = true edition.workspace = true repository.workspace = true license.workspace = true -publish.workspace = true rust-version.workspace = true +publish = false [dependencies] -malachite-common.workspace = true -malachite-proto.workspace = true +malachite-core-types.workspace = true +malachite-proto.workspace = true malachite-starknet-p2p-proto.workspace = true -starknet-core.workspace = true +starknet-core.workspace = true starknet-crypto.workspace = true bytes.workspace = true -rand.workspace = true +rand.workspace = true serde.workspace = true -sha3.workspace = true +sha3.workspace = true [lints] workspace = true diff --git a/code/crates/starknet/p2p-types/src/address.rs b/code/crates/starknet/p2p-types/src/address.rs index 3d08fcb98..1d6360832 100644 --- a/code/crates/starknet/p2p-types/src/address.rs +++ b/code/crates/starknet/p2p-types/src/address.rs @@ -37,7 +37,7 @@ impl fmt::Debug for Address { } } -impl malachite_common::Address for Address {} +impl malachite_core_types::Address for Address {} impl Protobuf for Address { type Proto = p2p_proto::Address; diff --git a/code/crates/starknet/p2p-types/src/context.rs b/code/crates/starknet/p2p-types/src/context.rs index aecf50c25..b3c74076c 100644 --- a/code/crates/starknet/p2p-types/src/context.rs +++ b/code/crates/starknet/p2p-types/src/context.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use malachite_common::{ +use malachite_core_types::{ Context, NilOrVal, Round, SignedProposal, SignedProposalPart, SignedVote, ValidatorSet as _, }; use starknet_core::utils::starknet_keccak; diff --git a/code/crates/starknet/p2p-types/src/context/impls.rs b/code/crates/starknet/p2p-types/src/context/impls.rs index f5c518b58..0102e13f4 100644 --- a/code/crates/starknet/p2p-types/src/context/impls.rs +++ b/code/crates/starknet/p2p-types/src/context/impls.rs @@ -1,4 +1,6 @@ -use malachite_common::{self as common, NilOrVal, Round, SignedExtension, VoteType, VotingPower}; +use malachite_core_types::{ + self as common, NilOrVal, Round, SignedExtension, VoteType, VotingPower, +}; use crate::{ Address, BlockHash, Height, MockContext, PartType, Proposal, ProposalPart, PublicKey, diff --git a/code/crates/starknet/p2p-types/src/hash.rs b/code/crates/starknet/p2p-types/src/hash.rs index 0d7f7581c..5473cdab6 100644 --- a/code/crates/starknet/p2p-types/src/hash.rs +++ b/code/crates/starknet/p2p-types/src/hash.rs @@ -12,7 +12,7 @@ use crate::Felt; pub type MessageHash = Hash; pub type BlockHash = Hash; -impl malachite_common::Value for BlockHash { +impl malachite_core_types::Value for BlockHash { type Id = BlockHash; fn id(&self) -> Self::Id { diff --git a/code/crates/starknet/p2p-types/src/height.rs b/code/crates/starknet/p2p-types/src/height.rs index 5254b3f38..60aebde20 100644 --- a/code/crates/starknet/p2p-types/src/height.rs +++ b/code/crates/starknet/p2p-types/src/height.rs @@ -44,7 +44,7 @@ impl fmt::Display for Height { } } -impl malachite_common::Height for Height { +impl malachite_core_types::Height for Height { fn increment_by(&self, n: u64) -> Self { Self { block_number: self.block_number + n, diff --git a/code/crates/starknet/p2p-types/src/proposal.rs b/code/crates/starknet/p2p-types/src/proposal.rs index 668679e83..c05e29923 100644 --- a/code/crates/starknet/p2p-types/src/proposal.rs +++ b/code/crates/starknet/p2p-types/src/proposal.rs @@ -1,5 +1,5 @@ use bytes::Bytes; -use malachite_common::Round; +use malachite_core_types::Round; use malachite_proto as proto; use malachite_starknet_p2p_proto as p2p_proto; diff --git a/code/crates/starknet/p2p-types/src/proposal_part.rs b/code/crates/starknet/p2p-types/src/proposal_part.rs index c3e188566..973a2799f 100644 --- a/code/crates/starknet/p2p-types/src/proposal_part.rs +++ b/code/crates/starknet/p2p-types/src/proposal_part.rs @@ -1,5 +1,5 @@ use bytes::Bytes; -use malachite_common::Round; +use malachite_core_types::Round; use malachite_proto as proto; use malachite_starknet_p2p_proto as p2p_proto; diff --git a/code/crates/starknet/p2p-types/src/signing.rs b/code/crates/starknet/p2p-types/src/signing.rs index 44076851b..8911a5f58 100644 --- a/code/crates/starknet/p2p-types/src/signing.rs +++ b/code/crates/starknet/p2p-types/src/signing.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; use starknet_core::crypto::{ecdsa_sign, ecdsa_verify}; use starknet_crypto::{get_public_key, Felt}; -use malachite_common::SigningScheme; +use malachite_core_types::SigningScheme; use malachite_proto::{Error as ProtoError, Protobuf}; use malachite_starknet_p2p_proto as proto; diff --git a/code/crates/starknet/p2p-types/src/validator.rs b/code/crates/starknet/p2p-types/src/validator.rs index f348b1411..dfde63f69 100644 --- a/code/crates/starknet/p2p-types/src/validator.rs +++ b/code/crates/starknet/p2p-types/src/validator.rs @@ -1,4 +1,4 @@ -use malachite_common::VotingPower; +use malachite_core_types::VotingPower; use serde::{Deserialize, Serialize}; use crate::{Address, PublicKey}; diff --git a/code/crates/starknet/p2p-types/src/validator_set.rs b/code/crates/starknet/p2p-types/src/validator_set.rs index 8cacae0f2..34c4e8c6b 100644 --- a/code/crates/starknet/p2p-types/src/validator_set.rs +++ b/code/crates/starknet/p2p-types/src/validator_set.rs @@ -1,4 +1,4 @@ -use malachite_common::VotingPower; +use malachite_core_types::VotingPower; use serde::{Deserialize, Serialize}; use crate::{Address, PublicKey, Validator}; diff --git a/code/crates/starknet/p2p-types/src/vote.rs b/code/crates/starknet/p2p-types/src/vote.rs index e2e732d62..ab4ec399e 100644 --- a/code/crates/starknet/p2p-types/src/vote.rs +++ b/code/crates/starknet/p2p-types/src/vote.rs @@ -1,6 +1,6 @@ use bytes::Bytes; -use malachite_common::{Extension, NilOrVal, Round, SignedExtension, VoteType}; +use malachite_core_types::{Extension, NilOrVal, Round, SignedExtension, VoteType}; use malachite_proto as proto; use malachite_starknet_p2p_proto as p2p_proto; diff --git a/code/crates/starknet/test/Cargo.toml b/code/crates/starknet/test/Cargo.toml index 4732de127..6e73ecf7f 100644 --- a/code/crates/starknet/test/Cargo.toml +++ b/code/crates/starknet/test/Cargo.toml @@ -1,30 +1,29 @@ [package] name = "malachite-starknet-test" -publish = false - version.workspace = true edition.workspace = true repository.workspace = true license.workspace = true rust-version.workspace = true +publish = false [dependencies] -malachite-actors.workspace = true -malachite-common.workspace = true -malachite-config.workspace = true -malachite-consensus.workspace = true -malachite-metrics.workspace = true -malachite-starknet-host.workspace = true +malachite-actors.workspace = true +malachite-core-types.workspace = true +malachite-config.workspace = true +malachite-consensus.workspace = true +malachite-metrics.workspace = true +malachite-starknet-host.workspace = true -axum.workspace = true -bytesize.workspace = true -eyre.workspace = true -rand.workspace = true -ractor.workspace = true -tokio.workspace = true -tracing.workspace = true -tracing-subscriber.workspace = true -tempfile.workspace = true +axum.workspace = true +bytesize.workspace = true +eyre.workspace = true +rand.workspace = true +ractor.workspace = true +tokio.workspace = true +tracing.workspace = true +tracing-subscriber.workspace = true +tempfile.workspace = true [lints] workspace = true diff --git a/code/crates/starknet/test/src/lib.rs b/code/crates/starknet/test/src/lib.rs index e9329629e..2801b31ea 100644 --- a/code/crates/starknet/test/src/lib.rs +++ b/code/crates/starknet/test/src/lib.rs @@ -14,12 +14,12 @@ use tokio::time::{sleep, Duration}; use tracing::{debug, error, error_span, info, Instrument, Span}; use malachite_actors::util::events::{Event, RxEvent, TxEvent}; -use malachite_common::{SignedVote, VotingPower}; use malachite_config::{ Config as NodeConfig, Config, DiscoveryConfig, LoggingConfig, PubSubProtocol, SyncConfig, TestConfig, TransportProtocol, }; use malachite_consensus::{SignedConsensusMsg, ValueToPropose}; +use malachite_core_types::{SignedVote, VotingPower}; use malachite_starknet_host::spawn::spawn_node_actor; use malachite_starknet_host::types::MockContext; use malachite_starknet_host::types::{Height, PrivateKey, Validator, ValidatorSet}; diff --git a/code/crates/starknet/test/tests/wal.rs b/code/crates/starknet/test/tests/wal.rs index a015285f3..6880594d0 100644 --- a/code/crates/starknet/test/tests/wal.rs +++ b/code/crates/starknet/test/tests/wal.rs @@ -4,9 +4,9 @@ use eyre::bail; use tracing::info; use malachite_actors::util::events::Event; -use malachite_common::SignedVote; use malachite_config::ValuePayload; use malachite_consensus::ValueToPropose; +use malachite_core_types::SignedVote; use malachite_starknet_host::types::MockContext; use malachite_starknet_test::{init_logging, HandlerResult, TestBuilder, TestParams}; diff --git a/code/crates/sync/Cargo.toml b/code/crates/sync/Cargo.toml index 83b9290ac..f8d27adbd 100644 --- a/code/crates/sync/Cargo.toml +++ b/code/crates/sync/Cargo.toml @@ -8,7 +8,7 @@ publish.workspace = true rust-version.workspace = true [dependencies] -malachite-common = { workspace = true } +malachite-core-types = { workspace = true } malachite-metrics = { workspace = true } malachite-peer = { workspace = true } diff --git a/code/crates/sync/src/handle.rs b/code/crates/sync/src/handle.rs index 17c3167fd..071009074 100644 --- a/code/crates/sync/src/handle.rs +++ b/code/crates/sync/src/handle.rs @@ -4,7 +4,7 @@ use derive_where::derive_where; use thiserror::Error; use tracing::{debug, error, info, trace, warn}; -use malachite_common::{CertificateError, CommitCertificate, Context, Height, Round}; +use malachite_core_types::{CertificateError, CommitCertificate, Context, Height, Round}; use crate::co::Co; use crate::{ diff --git a/code/crates/sync/src/state.rs b/code/crates/sync/src/state.rs index 984b5436f..2f09266eb 100644 --- a/code/crates/sync/src/state.rs +++ b/code/crates/sync/src/state.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use rand::seq::IteratorRandom; -use malachite_common::{Context, Height, Round}; +use malachite_core_types::{Context, Height, Round}; use malachite_peer::PeerId; use tracing::warn; diff --git a/code/crates/sync/src/types.rs b/code/crates/sync/src/types.rs index 13b4dec07..1a99f18c8 100644 --- a/code/crates/sync/src/types.rs +++ b/code/crates/sync/src/types.rs @@ -4,7 +4,7 @@ use displaydoc::Display; use libp2p::request_response; use serde::{Deserialize, Serialize}; -use malachite_common::{CommitCertificate, Context, Round, VoteSet}; +use malachite_core_types::{CommitCertificate, Context, Round, VoteSet}; pub use malachite_peer::PeerId; #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Display)] diff --git a/code/crates/test/Cargo.toml b/code/crates/test/Cargo.toml index 103b91da4..a11fcff6e 100644 --- a/code/crates/test/Cargo.toml +++ b/code/crates/test/Cargo.toml @@ -13,7 +13,7 @@ rust-version.workspace = true malachite-actors = { workspace = true } malachite-app = { workspace = true } malachite-codec = { workspace = true } -malachite-common = { workspace = true } +malachite-core-types = { workspace = true } malachite-config = { workspace = true } malachite-consensus = { workspace = true } malachite-proto = { workspace = true } diff --git a/code/crates/test/mbt/Cargo.toml b/code/crates/test/mbt/Cargo.toml index 66ac68d94..4476d6955 100644 --- a/code/crates/test/mbt/Cargo.toml +++ b/code/crates/test/mbt/Cargo.toml @@ -10,9 +10,9 @@ publish.workspace = true rust-version.workspace = true [dependencies] -malachite-common = { workspace = true } -malachite-vote = { workspace = true } -malachite-round = { workspace = true } +malachite-core-types = { workspace = true } +malachite-core-votekeeper = { workspace = true } +malachite-core-state-machine = { workspace = true } malachite-test = { workspace = true } itf = { workspace = true } diff --git a/code/crates/test/mbt/src/types.rs b/code/crates/test/mbt/src/types.rs index bd1b2e040..f35be1edf 100644 --- a/code/crates/test/mbt/src/types.rs +++ b/code/crates/test/mbt/src/types.rs @@ -1,5 +1,5 @@ use itf::de::{As, Integer}; -use malachite_round::state::Step as RoundStep; +use malachite_core_state_machine::state::Step as RoundStep; use serde::Deserialize; pub type Height = i64; @@ -45,10 +45,10 @@ pub enum VoteType { } impl VoteType { - pub fn to_common(&self) -> malachite_common::VoteType { + pub fn to_common(&self) -> malachite_core_types::VoteType { match self { - VoteType::Prevote => malachite_common::VoteType::Prevote, - VoteType::Precommit => malachite_common::VoteType::Precommit, + VoteType::Prevote => malachite_core_types::VoteType::Prevote, + VoteType::Precommit => malachite_core_types::VoteType::Precommit, } } } @@ -109,11 +109,11 @@ pub enum Timeout { } impl Timeout { - pub fn to_common(&self) -> malachite_common::TimeoutKind { + pub fn to_common(&self) -> malachite_core_types::TimeoutKind { match self { - Timeout::Propose => malachite_common::TimeoutKind::Propose, - Timeout::Prevote => malachite_common::TimeoutKind::Prevote, - Timeout::Precommit => malachite_common::TimeoutKind::Precommit, + Timeout::Propose => malachite_core_types::TimeoutKind::Propose, + Timeout::Prevote => malachite_core_types::TimeoutKind::Prevote, + Timeout::Precommit => malachite_core_types::TimeoutKind::Precommit, } } } diff --git a/code/crates/test/mbt/tests/consensus/runner.rs b/code/crates/test/mbt/tests/consensus/runner.rs index 3830de763..3932319fa 100644 --- a/code/crates/test/mbt/tests/consensus/runner.rs +++ b/code/crates/test/mbt/tests/consensus/runner.rs @@ -2,10 +2,10 @@ use std::collections::BTreeMap; use pretty_assertions::assert_eq; -use malachite_common::{Context, NilOrVal, Round}; -use malachite_round::input::Input; -use malachite_round::output::Output; -use malachite_round::{state::State as RoundState, state_machine::Info}; +use malachite_core_state_machine::input::Input; +use malachite_core_state_machine::output::Output; +use malachite_core_state_machine::{state::State as RoundState, state_machine::Info}; +use malachite_core_types::{Context, NilOrVal, Round}; use malachite_test::{Address, Height, TestContext}; use malachite_test_mbt::consensus::{Input as ModelInput, Output as ModelOutput, State}; use malachite_test_mbt::types::Step; diff --git a/code/crates/test/mbt/tests/votekeeper.rs b/code/crates/test/mbt/tests/votekeeper.rs index 9d43cccb2..82d4c802f 100644 --- a/code/crates/test/mbt/tests/votekeeper.rs +++ b/code/crates/test/mbt/tests/votekeeper.rs @@ -15,8 +15,8 @@ const RANDOM_SEED: u64 = 0x42; #[test] fn test_itf() { - let temp_dir = - tempfile::TempDir::with_prefix("malachite-votekeeper-").expect("Failed to create temp dir"); + let temp_dir = tempfile::TempDir::with_prefix("malachite-core-votekeeperkeeper-") + .expect("Failed to create temp dir"); let temp_path = temp_dir.path().to_owned(); if std::env::var("KEEP_TEMP").is_ok() { diff --git a/code/crates/test/mbt/tests/votekeeper/runner.rs b/code/crates/test/mbt/tests/votekeeper/runner.rs index 0c01c238c..0ba701a71 100644 --- a/code/crates/test/mbt/tests/votekeeper/runner.rs +++ b/code/crates/test/mbt/tests/votekeeper/runner.rs @@ -1,12 +1,12 @@ use std::collections::HashMap; -use malachite_common::{Context, NilOrVal, Round, SignedVote, Value}; +use malachite_core_types::{Context, NilOrVal, Round, SignedVote, Value}; +use malachite_core_votekeeper::keeper::{Output, VoteKeeper}; +use malachite_core_votekeeper::ThresholdParams; use malachite_test::{Address, Height, Signature, TestContext, Vote}; use malachite_test_mbt::types::{Value as ModelValue, VoteType}; use malachite_test_mbt::votekeeper::VoteKeeperOutput::*; use malachite_test_mbt::votekeeper::{State, WeightedVote}; -use malachite_vote::keeper::{Output, VoteKeeper}; -use malachite_vote::ThresholdParams; use itf::Runner as ItfRunner; use rand::rngs::StdRng; diff --git a/code/crates/test/mbt/tests/votekeeper/utils.rs b/code/crates/test/mbt/tests/votekeeper/utils.rs index e564abe5e..d9e5b37c8 100644 --- a/code/crates/test/mbt/tests/votekeeper/utils.rs +++ b/code/crates/test/mbt/tests/votekeeper/utils.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use malachite_common::NilOrVal; +use malachite_core_types::NilOrVal; use malachite_test::{ Address, PrivateKey, PublicKey, TestContext, Validator, ValidatorSet, ValueId, }; @@ -46,7 +46,7 @@ pub fn value_from_model(value: &Value) -> NilOrVal { pub fn check_votes( expected: &malachite_test_mbt::votekeeper::VoteCount, - actual: &malachite_vote::count::VoteCount, + actual: &malachite_core_votekeeper::count::VoteCount, address_map: &HashMap, ) { // expected has `total_weight` which is not present in actual diff --git a/code/crates/test/src/address.rs b/code/crates/test/src/address.rs index ae8a8f1ca..b16e2d729 100644 --- a/code/crates/test/src/address.rs +++ b/code/crates/test/src/address.rs @@ -54,7 +54,7 @@ impl fmt::Debug for Address { } } -impl malachite_common::Address for Address {} +impl malachite_core_types::Address for Address {} impl Protobuf for Address { type Proto = proto::Address; diff --git a/code/crates/test/src/codec/types.rs b/code/crates/test/src/codec/types.rs index 7f8bdf993..b8bcf13f1 100644 --- a/code/crates/test/src/codec/types.rs +++ b/code/crates/test/src/codec/types.rs @@ -2,11 +2,11 @@ use crate::{Address, Height, Proposal, ProposalPart, RoundDef, TestContext, Valu use bytes::Bytes; use ed25519_consensus::Signature; use malachite_actors::util::streaming::{StreamContent, StreamMessage}; -use malachite_common::{ +use malachite_consensus::SignedConsensusMsg; +use malachite_core_types::{ AggregatedSignature, CommitCertificate, CommitSignature, Extension, Round, SignedExtension, SignedProposal, SignedVote, VoteSet, }; -use malachite_consensus::SignedConsensusMsg; use malachite_proto::Protobuf; use malachite_sync::{ DecidedValue, PeerId, Request, Response, Status, ValueRequest, ValueResponse, VoteSetRequest, diff --git a/code/crates/test/src/context.rs b/code/crates/test/src/context.rs index c46032b28..e3eda9afe 100644 --- a/code/crates/test/src/context.rs +++ b/code/crates/test/src/context.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use malachite_common::{ +use malachite_core_types::{ Context, NilOrVal, Round, SignedProposal, SignedProposalPart, SignedVote, ValidatorSet as _, }; diff --git a/code/crates/test/src/height.rs b/code/crates/test/src/height.rs index 12c12c90f..8881c752d 100644 --- a/code/crates/test/src/height.rs +++ b/code/crates/test/src/height.rs @@ -38,7 +38,7 @@ impl fmt::Debug for Height { } } -impl malachite_common::Height for Height { +impl malachite_core_types::Height for Height { fn increment_by(&self, n: u64) -> Self { Self(self.0 + n) } diff --git a/code/crates/test/src/node.rs b/code/crates/test/src/node.rs index e3c6f2770..33c6aecf4 100644 --- a/code/crates/test/src/node.rs +++ b/code/crates/test/src/node.rs @@ -5,8 +5,8 @@ use rand::{CryptoRng, RngCore}; use malachite_app::types::Keypair; use malachite_app::Node; -use malachite_common::VotingPower; use malachite_config::Config; +use malachite_core_types::VotingPower; use crate::context::TestContext; use crate::{Address, Genesis, PrivateKey, PublicKey, Validator, ValidatorSet}; diff --git a/code/crates/test/src/proposal.rs b/code/crates/test/src/proposal.rs index 09885fd10..e085301b9 100644 --- a/code/crates/test/src/proposal.rs +++ b/code/crates/test/src/proposal.rs @@ -1,5 +1,5 @@ use bytes::Bytes; -use malachite_common::Round; +use malachite_core_types::Round; use malachite_proto::{Error as ProtoError, Protobuf}; use crate::{Address, Height, TestContext, Value}; @@ -36,7 +36,7 @@ impl Proposal { } } -impl malachite_common::Proposal for Proposal { +impl malachite_core_types::Proposal for Proposal { fn height(&self) -> Height { self.height } diff --git a/code/crates/test/src/proposal_part.rs b/code/crates/test/src/proposal_part.rs index e745e08fb..629b75f1b 100644 --- a/code/crates/test/src/proposal_part.rs +++ b/code/crates/test/src/proposal_part.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use bytes::Bytes; -use malachite_common::Round; +use malachite_core_types::Round; use malachite_proto::{Error as ProtoError, Protobuf}; use serde::{Deserialize, Serialize}; @@ -142,7 +142,7 @@ impl ProposalPart { } } -impl malachite_common::ProposalPart for ProposalPart { +impl malachite_core_types::ProposalPart for ProposalPart { fn is_first(&self) -> bool { self.sequence == 0 } diff --git a/code/crates/test/src/proposer_selector.rs b/code/crates/test/src/proposer_selector.rs index f343d3c7f..7a5578714 100644 --- a/code/crates/test/src/proposer_selector.rs +++ b/code/crates/test/src/proposer_selector.rs @@ -1,4 +1,4 @@ -use malachite_common::{Context, Round}; +use malachite_core_types::{Context, Round}; use crate::{Address, Height, TestContext, ValidatorSet}; diff --git a/code/crates/test/src/utils/validators.rs b/code/crates/test/src/utils/validators.rs index 8c998b5bb..a5fd61c03 100644 --- a/code/crates/test/src/utils/validators.rs +++ b/code/crates/test/src/utils/validators.rs @@ -1,7 +1,7 @@ use rand::rngs::StdRng; use rand::SeedableRng; -use malachite_common::VotingPower; +use malachite_core_types::VotingPower; use crate::{PrivateKey, Validator}; diff --git a/code/crates/test/src/validator_set.rs b/code/crates/test/src/validator_set.rs index e591a303f..8e21d19d5 100644 --- a/code/crates/test/src/validator_set.rs +++ b/code/crates/test/src/validator_set.rs @@ -1,4 +1,4 @@ -use malachite_common::VotingPower; +use malachite_core_types::VotingPower; use serde::{Deserialize, Serialize}; use crate::signing::PublicKey; @@ -35,7 +35,7 @@ impl Ord for Validator { } } -impl malachite_common::Validator for Validator { +impl malachite_core_types::Validator for Validator { fn address(&self) -> &Address { &self.address } @@ -126,7 +126,7 @@ impl ValidatorSet { } } -impl malachite_common::ValidatorSet for ValidatorSet { +impl malachite_core_types::ValidatorSet for ValidatorSet { fn count(&self) -> usize { self.validators.len() } diff --git a/code/crates/test/src/value.rs b/code/crates/test/src/value.rs index f05947eb6..2b0078774 100644 --- a/code/crates/test/src/value.rs +++ b/code/crates/test/src/value.rs @@ -79,7 +79,7 @@ impl Value { } } -impl malachite_common::Value for Value { +impl malachite_core_types::Value for Value { type Id = ValueId; fn id(&self) -> ValueId { diff --git a/code/crates/test/src/vote.rs b/code/crates/test/src/vote.rs index ed6e22815..bddeca694 100644 --- a/code/crates/test/src/vote.rs +++ b/code/crates/test/src/vote.rs @@ -1,11 +1,11 @@ use bytes::Bytes; -use malachite_common::{NilOrVal, Round, SignedExtension, VoteType}; +use malachite_core_types::{NilOrVal, Round, SignedExtension, VoteType}; use malachite_proto::{Error as ProtoError, Protobuf}; use crate::proto; use crate::{Address, Height, TestContext, ValueId}; -pub use malachite_common::Extension; +pub use malachite_core_types::Extension; /// A vote for a value in a round #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] @@ -56,7 +56,7 @@ impl Vote { } } -impl malachite_common::Vote for Vote { +impl malachite_core_types::Vote for Vote { fn height(&self) -> Height { self.height }