chore(code): Rename malachite-consensus to `malachite-core-consensu…

…s` (#691)

* chore(code): Rename `malachite-consensus` to `malachite-core-consensus`

* Fix MSRV workflow

.github/workflows/rust.yml

@@ -141,7 +141,7 @@ jobs:
         with:
           tool: cargo-msrv
       - name: Check MSRV
-        run: cargo msrv verify --manifest-path crates/consensus/Cargo.toml --output-format minimal -- cargo check --all-features
+        run: cargo msrv verify --manifest-path crates/engine/Cargo.toml --output-format minimal -- cargo check --all-features
 
   standalone:
     name: Standalone

code/Cargo.toml

@@ -6,7 +6,7 @@ members = [
   "crates/app-channel",
   "crates/codec",
   "crates/config",
-  "crates/consensus",
+  "crates/core-consensus",
   "crates/core-driver",
   "crates/core-state-machine",
   "crates/core-types",
@@ -68,7 +68,7 @@ malachite-app-channel        = { version = "0.1.0", path = "crates/app-channel"
 malachite-test-cli           = { version = "0.1.0", path = "crates/test/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-consensus     = { version = "0.1.0", path = "crates/core-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" }

code/crates/app/Cargo.toml

@@ -12,7 +12,7 @@ malachite-engine.workspace = true
 malachite-codec.workspace = true
 malachite-core-types.workspace = true
 malachite-config.workspace = true
-malachite-consensus.workspace = true
+malachite-core-consensus.workspace = true
 malachite-network.workspace = true
 malachite-metrics.workspace = true
 malachite-peer.workspace = true

code/crates/app/src/lib.rs

@@ -27,7 +27,7 @@ pub mod host {
 }
 
 pub mod consensus {
-    pub use malachite_consensus::*;
+    pub use malachite_core_consensus::*;
 }
 
 pub mod metrics {

code/crates/app/src/types.rs

@@ -1,6 +1,6 @@
 //! Re-export of all types required to build a Malachite application.
 
-pub use malachite_consensus::{ConsensusMsg, ProposedValue, SignedConsensusMsg, ValuePayload};
+pub use malachite_core_consensus::{ConsensusMsg, ProposedValue, SignedConsensusMsg, ValuePayload};
 pub use malachite_engine::host::LocallyProposedValue;
 pub use malachite_peer::PeerId;
 

code/crates/consensus/Cargo.toml → code/crates/core-consensus/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name                   = "malachite-consensus"
+name                   = "malachite-core-consensus"
 version.workspace      = true
 edition.workspace      = true
 repository.workspace   = true

code/crates/consensus/src/macros.rs → code/crates/core-consensus/src/macros.rs

@@ -6,7 +6,7 @@
 /// # Example
 ///
 /// ```rust,ignore
-/// malachite_consensus::process!(
+/// malachite_core_consensus::process!(
 ///     // Input to process
 ///     input: input,
 ///     // Consensus state

code/crates/consensus/tests/full_proposal.rs → code/crates/core-consensus/tests/full_proposal.rs

@@ -1,4 +1,4 @@
-use malachite_consensus::{FullProposal, FullProposalKeeper, Input, ProposedValue};
+use malachite_core_consensus::{FullProposal, FullProposalKeeper, Input, ProposedValue};
 use malachite_core_types::{
     Context, Round, SignedProposal, SigningProvider, Validity, ValueOrigin,
 };

code/crates/engine/Cargo.toml

@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true
 repository.workspace = true
 license.workspace = true
+rust-version.workspace = true
 publish.workspace = true
 
 [lints]
@@ -12,7 +13,7 @@ workspace = true
 [dependencies]
 malachite-codec.workspace = true
 malachite-config.workspace = true
-malachite-consensus.workspace = true
+malachite-core-consensus.workspace = true
 malachite-core-types.workspace = true
 malachite-network.workspace = true
 malachite-metrics.workspace = true

code/crates/engine/src/consensus.rs

@@ -9,7 +9,9 @@ use tracing::{debug, error, info, warn};
 
 use malachite_codec as codec;
 use malachite_config::TimeoutConfig;
-use malachite_consensus::{Effect, PeerId, Resumable, Resume, SignedConsensusMsg, ValueToPropose};
+use malachite_core_consensus::{
+    Effect, PeerId, Resumable, Resume, SignedConsensusMsg, ValueToPropose,
+};
 use malachite_core_types::{
     Context, Round, SignedExtension, SigningProvider, SigningProviderExt, Timeout, TimeoutKind,
     ValidatorSet, ValueOrigin,
@@ -28,9 +30,9 @@ use crate::util::streaming::StreamMessage;
 use crate::util::timers::{TimeoutElapsed, TimerScheduler};
 use crate::wal::{Msg as WalMsg, WalEntry, WalRef};
 
-pub use malachite_consensus::Error as ConsensusError;
-pub use malachite_consensus::Params as ConsensusParams;
-pub use malachite_consensus::State as ConsensusState;
+pub use malachite_core_consensus::Error as ConsensusError;
+pub use malachite_core_consensus::Params as ConsensusParams;
+pub use malachite_core_consensus::State as ConsensusState;
 
 /// Codec for consensus messages.
 ///
@@ -102,7 +104,7 @@ impl<Ctx: Context> From<NetworkEvent<Ctx>> for Msg<Ctx> {
     }
 }
 
-type ConsensusInput<Ctx> = malachite_consensus::Input<Ctx>;
+type ConsensusInput<Ctx> = malachite_core_consensus::Input<Ctx>;
 
 impl<Ctx: Context> From<TimeoutElapsed<Timeout>> for Msg<Ctx> {
     fn from(msg: TimeoutElapsed<Timeout>) -> Self {
@@ -224,7 +226,7 @@ where
     ) -> Result<(), ConsensusError<Ctx>> {
         let height = state.height();
 
-        malachite_consensus::process!(
+        malachite_core_consensus::process!(
             input: input,
             state: &mut state.consensus,
             metrics: &self.metrics,
@@ -834,7 +836,7 @@ where
             }
 
             Effect::VerifySignature(msg, pk, r) => {
-                use malachite_consensus::ConsensusMsg as Msg;
+                use malachite_core_consensus::ConsensusMsg as Msg;
 
                 let start = Instant::now();
 

code/crates/engine/src/host.rs

@@ -4,15 +4,15 @@ use std::time::Duration;
 use derive_where::derive_where;
 use ractor::{ActorRef, RpcReplyPort};
 
-use malachite_consensus::PeerId;
+use malachite_core_consensus::PeerId;
 use malachite_core_types::{CommitCertificate, Context, Round, SignedExtension, ValueId};
 use malachite_sync::DecidedValue;
 
 use crate::consensus::ConsensusRef;
 use crate::util::streaming::StreamMessage;
 
 /// A value to propose that has just been received.
-pub use malachite_consensus::ProposedValue;
+pub use malachite_core_consensus::ProposedValue;
 
 /// This is the value that the application constructed
 /// and has finished streaming on gossip.

code/crates/engine/src/network.rs

@@ -16,7 +16,7 @@ use malachite_sync::{
 };
 
 use malachite_codec as codec;
-use malachite_consensus::SignedConsensusMsg;
+use malachite_core_consensus::SignedConsensusMsg;
 use malachite_core_types::{Context, SignedProposal, SignedVote};
 use malachite_metrics::SharedRegistry;
 use malachite_network::handle::CtrlHandle;

code/crates/engine/src/sync.rs

@@ -12,7 +12,7 @@ use tokio::task::JoinHandle;
 use tracing::{debug, error, info, warn};
 
 use malachite_codec as codec;
-use malachite_consensus::PeerId;
+use malachite_core_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};

code/crates/engine/src/util/events.rs

@@ -3,7 +3,7 @@ use core::fmt;
 use derive_where::derive_where;
 use tokio::sync::broadcast;
 
-use malachite_consensus::{ProposedValue, SignedConsensusMsg, ValueToPropose};
+use malachite_core_consensus::{ProposedValue, SignedConsensusMsg, ValueToPropose};
 use malachite_core_types::{CommitCertificate, Context, Round, Timeout, ValueOrigin};
 
 pub type RxEvent<Ctx> = broadcast::Receiver<Event<Ctx>>;

code/crates/engine/src/wal/entry.rs

@@ -4,7 +4,7 @@ use byteorder::{ReadBytesExt, WriteBytesExt, BE};
 use derive_where::derive_where;
 
 use malachite_codec::Codec;
-use malachite_consensus::SignedConsensusMsg;
+use malachite_core_consensus::SignedConsensusMsg;
 use malachite_core_types::{Context, Round, Timeout};
 
 /// Codec for encoding and decoding WAL entries.

code/crates/metrics/src/metrics.rs

@@ -135,7 +135,7 @@ impl Metrics {
     pub fn register(registry: &SharedRegistry) -> Self {
         let metrics = Self::new();
 
-        registry.with_prefix("malachite_consensus", |registry| {
+        registry.with_prefix("malachite_core_consensus", |registry| {
             registry.register(
                 "finalized_blocks",
                 "Number of blocks finalized",

code/crates/network/src/lib.rs

@@ -33,7 +33,7 @@ pub use channel::Channel;
 use behaviour::{Behaviour, NetworkEvent};
 use handle::Handle;
 
-const PROTOCOL: &str = "/malachite-consensus/v1beta1";
+const PROTOCOL: &str = "/malachite-core-consensus/v1beta1";
 const METRICS_PREFIX: &str = "malachite_network";
 const DISCOVERY_METRICS_PREFIX: &str = "malachite_discovery";
 

code/crates/starknet/host/Cargo.toml

@@ -12,7 +12,7 @@ malachite-engine = { workspace = true }
 malachite-app = { workspace = true }
 malachite-codec = { workspace = true }
 malachite-config = { workspace = true }
-malachite-consensus = { workspace = true, features = ["debug"] }
+malachite-core-consensus = { workspace = true, features = ["debug"] }
 malachite-core-types = { workspace = true }
 malachite-network = { workspace = true }
 malachite-metrics = { workspace = true }

code/crates/starknet/host/src/actor.rs

@@ -10,7 +10,7 @@ use rand::SeedableRng;
 use tokio::time::Instant;
 use tracing::{debug, error, info, trace, warn};
 
-use malachite_consensus::PeerId;
+use malachite_core_consensus::PeerId;
 use malachite_core_types::{CommitCertificate, Round, Validity, ValueOrigin};
 use malachite_engine::consensus::{ConsensusMsg, ConsensusRef};
 use malachite_engine::host::{LocallyProposedValue, ProposedValue};

code/crates/starknet/host/src/block_store.rs

@@ -9,7 +9,7 @@ use thiserror::Error;
 use tracing::error;
 
 use malachite_codec::Codec;
-use malachite_consensus::ProposedValue;
+use malachite_core_consensus::ProposedValue;
 use malachite_core_types::{CommitCertificate, Round};
 use malachite_proto::Protobuf;
 

code/crates/starknet/host/src/codec.rs

@@ -9,7 +9,7 @@ use malachite_core_types::{
 use malachite_engine::util::streaming::{StreamContent, StreamMessage};
 use malachite_sync::{self as sync, ValueRequest, ValueResponse, VoteSetRequest, VoteSetResponse};
 
-use malachite_consensus::{PeerId, ProposedValue, SignedConsensusMsg};
+use malachite_core_consensus::{PeerId, ProposedValue, SignedConsensusMsg};
 use malachite_starknet_p2p_proto::ConsensusMessage;
 
 use crate::proto::consensus_message::Messages;

code/crates/starknet/host/src/host/starknet.rs

@@ -8,7 +8,7 @@ use tokio::time::Instant;
 use tracing::{debug, Instrument};
 
 use malachite_config::VoteExtensionsConfig;
-use malachite_consensus::ValuePayload;
+use malachite_core_consensus::ValuePayload;
 use malachite_core_types::{CommitCertificate, Extension, Round, SignedExtension, SignedVote};
 
 use crate::host::Host;

code/crates/starknet/host/src/spawn.rs

@@ -9,7 +9,7 @@ use tokio::task::JoinHandle;
 use malachite_config::{
     self as config, Config as NodeConfig, MempoolConfig, SyncConfig, TestConfig, TransportProtocol,
 };
-use malachite_consensus::ValuePayload;
+use malachite_core_consensus::ValuePayload;
 use malachite_engine::consensus::{Consensus, ConsensusParams, ConsensusRef};
 use malachite_engine::host::HostRef;
 use malachite_engine::network::{Network, NetworkRef};

code/crates/starknet/host/src/streaming.rs

@@ -3,7 +3,7 @@ use std::collections::{BTreeMap, BinaryHeap, HashSet};
 
 use derive_where::derive_where;
 
-use malachite_consensus::PeerId;
+use malachite_core_consensus::PeerId;
 use malachite_core_types::Round;
 use malachite_engine::util::streaming::{Sequence, StreamId, StreamMessage};
 

code/crates/starknet/test/Cargo.toml

@@ -11,7 +11,7 @@ publish = false
 malachite-engine.workspace = true
 malachite-core-types.workspace = true
 malachite-config.workspace = true
-malachite-consensus.workspace = true
+malachite-core-consensus.workspace = true
 malachite-metrics.workspace = true
 malachite-starknet-host.workspace = true
 

code/crates/starknet/test/src/lib.rs

@@ -17,7 +17,7 @@ use malachite_config::{
     Config as NodeConfig, Config, DiscoveryConfig, LoggingConfig, PubSubProtocol, SyncConfig,
     TestConfig, TransportProtocol,
 };
-use malachite_consensus::{SignedConsensusMsg, ValueToPropose};
+use malachite_core_consensus::{SignedConsensusMsg, ValueToPropose};
 use malachite_core_types::{SignedVote, VotingPower};
 use malachite_engine::util::events::{Event, RxEvent, TxEvent};
 use malachite_starknet_host::spawn::spawn_node_actor;

code/crates/starknet/test/tests/wal.rs

@@ -4,7 +4,7 @@ use eyre::bail;
 use tracing::info;
 
 use malachite_config::ValuePayload;
-use malachite_consensus::ValueToPropose;
+use malachite_core_consensus::ValueToPropose;
 use malachite_core_types::SignedVote;
 use malachite_engine::util::events::Event;
 use malachite_starknet_host::types::MockContext;

code/crates/sync/src/macros.rs

@@ -6,7 +6,7 @@
 /// # Example
 ///
 /// ```rust,ignore
-/// malachite_consensus::process!(
+/// malachite_core_consensus::process!(
 ///     // Input to process
 ///     input: input,
 ///     // Consensus state

code/crates/test/Cargo.toml

@@ -15,7 +15,7 @@ malachite-app = { workspace = true }
 malachite-codec = { workspace = true }
 malachite-core-types = { workspace = true }
 malachite-config = { workspace = true }
-malachite-consensus = { workspace = true }
+malachite-core-consensus = { workspace = true }
 malachite-proto = { workspace = true }
 malachite-signing-ed25519 = { workspace = true, features = ["rand", "serde"] }
 malachite-sync = { workspace = true }

code/crates/test/mbt/tests/consensus.rs

@@ -16,8 +16,8 @@ const RANDOM_SEED: u64 = 0x42;
 
 #[test]
 fn test_itf() {
-    let temp_dir =
-        tempfile::TempDir::with_prefix("malachite-consensus-").expect("Failed to create temp dir");
+    let temp_dir = tempfile::TempDir::with_prefix("malachite-core-consensus-")
+        .expect("Failed to create temp dir");
     let temp_path = temp_dir.path().to_owned();
 
     if std::env::var("KEEP_TEMP").is_ok() {

code/crates/test/src/codec/json/mod.rs

@@ -1,7 +1,7 @@
 use bytes::Bytes;
 use malachite_codec::Codec;
 
-use malachite_consensus::SignedConsensusMsg;
+use malachite_core_consensus::SignedConsensusMsg;
 use malachite_engine::util::streaming::StreamMessage;
 use malachite_sync::{Request, Response, Status};