chore(consensus): Split of utils

Author: Sawchord

Cargo.lock

@@ -41,6 +41,8 @@ members = [
   "rs/certification/test-utils",
   "rs/config",
   "rs/consensus",
+  "rs/consensus/mocks",
+  "rs/consensus/utils",
   "rs/constants",
   "rs/criterion_time",
   "rs/crypto",

Cargo.toml

@@ -7,8 +7,8 @@ DEPENDENCIES = [
     # Keep sorted.
     "//rs/artifact_pool",
     "//rs/config",
+    "//rs/consensus/utils",
     "//rs/crypto",
-    "//rs/crypto/prng",
     "//rs/crypto/test_utils/canister_threshold_sigs",
     "//rs/interfaces",
     "//rs/interfaces/https_outcalls_adapter_client",
@@ -27,7 +27,6 @@ DEPENDENCIES = [
     "//rs/types/ic00_types",
     "//rs/types/types",
     "//rs/utils",
-    "@crate_index//:hex",
     "@crate_index//:num-integer",
     "@crate_index//:prometheus",
     "@crate_index//:rand_0_8_4",
@@ -40,6 +39,7 @@ DEPENDENCIES = [
 DEV_DEPENDENCIES = [
     # Keep sorted.
     "//rs/bitcoin/types/internal",
+    "//rs/consensus/mocks",
     "//rs/crypto/temp_crypto",
     "//rs/cycles_account_manager",
     "//rs/execution_environment",
@@ -136,6 +136,7 @@ rust_bench(
         ":consensus",
         "//rs/artifact_pool",
         "//rs/config",
+        "//rs/consensus/utils",
         "//rs/constants",
         "//rs/execution_environment",
         "//rs/ingress_manager",

rs/consensus/BUILD.bazel

@@ -6,9 +6,9 @@ edition = "2021"
 [dependencies]
 ic-artifact-pool = { path = "../artifact_pool" }
 ic-config = { path = "../config" }
+ic-consensus-utils = { path = "./utils" }
 ic-constants = { path = "../constants" }
 ic-crypto = { path = "../crypto" }
-ic-crypto-prng = { path = "../crypto/prng" }
 ic-crypto-test-utils-canister-threshold-sigs = { path = "../crypto/test_utils/canister_threshold_sigs", optional = true }
 ic-error-types = { path = "../types/error_types" }
 ic-ic00-types = { path = "../types/ic00_types" }
@@ -17,7 +17,6 @@ ic-interfaces-https-outcalls-adapter-client = { path = "../interfaces/https_outc
 ic-interfaces-registry = { path = "../interfaces/registry" }
 ic-interfaces-state-manager = { path = "../interfaces/state_manager" }
 ic-registry-client-helpers = { path = "../registry/helpers" }
-ic-registry-keys = { path = "../registry/keys" }
 ic-replicated-state = { path = "../replicated_state" }
 ic-logger = { path = "../monitoring/logger" }
 ic-metrics = { path = "../monitoring/metrics" }
@@ -26,7 +25,6 @@ ic-registry-subnet-features = { path = "../registry/subnet_features" }
 ic-protobuf = { path = "../protobuf" }
 ic-types = { path = "../types/types" }
 ic-utils = { path = "../utils" }
-hex = "0.4.2"
 num-integer = "0.1.41"
 phantom_newtype = { path = "../phantom_newtype" }
 prometheus = { version = "0.12.0", features = [ "process" ] }
@@ -44,6 +42,7 @@ criterion = "0.3"
 ic-artifact-pool = { path = "../artifact_pool" }
 ic-btc-types-internal = { path = "../bitcoin/types/internal" }
 ic-config = { path = "../config" }
+ic-consensus-mocks = { path = "./mocks" }
 ic-crypto-test-utils-canister-threshold-sigs = { path = "../crypto/test_utils/canister_threshold_sigs" }
 ic-crypto-temp-crypto = { path = "../crypto/temp_crypto" }
 ic-execution-environment = { path = "../execution_environment" }
@@ -52,6 +51,7 @@ ic-interfaces-certified-stream-store = { path = "../interfaces/certified_stream_
 ic-interfaces-state-manager-mocks = { path = "../interfaces/state_manager/mocks" }
 ic-messaging = { path = "../messaging" }
 ic-registry-client-fake = { path = "../registry/fake" }
+ic-registry-keys = { path = "../registry/keys" }
 ic-registry-proto-data-provider = { path = "../registry/proto_data_provider" }
 ic-replicated-state = { path = "../replicated_state" }
 ic-state-manager = { path = "../state_manager" }

rs/consensus/Cargo.toml

@@ -13,7 +13,8 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use ic_artifact_pool::{consensus_pool::ConsensusPoolImpl, ingress_pool::IngressPoolImpl};
 use ic_config::state_manager::Config as StateManagerConfig;
-use ic_consensus::consensus::{payload_builder::PayloadBuilderImpl, pool_reader::PoolReader};
+use ic_consensus::consensus::payload_builder::PayloadBuilderImpl;
+use ic_consensus_utils::pool_reader::PoolReader;
 use ic_constants::MAX_INGRESS_TTL;
 use ic_execution_environment::IngressHistoryReaderImpl;
 use ic_ic00_types::IC_00;

rs/consensus/benches/validate_payload.rs

@@ -0,0 +1,38 @@
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+DEPENDENCIES = [
+    # Keep sorted.
+    "//rs/artifact_pool",
+    "//rs/config",
+    "//rs/consensus/utils",
+    "//rs/interfaces",
+    "//rs/interfaces/state_manager",
+    "//rs/monitoring/logger",
+    "//rs/monitoring/metrics",
+    "//rs/protobuf",
+    "//rs/registry/fake",
+    "//rs/registry/keys",
+    "//rs/registry/proto_data_provider",
+    "//rs/test_utilities",
+    "//rs/test_utilities/artifact_pool",
+    "//rs/test_utilities/registry",
+    "//rs/types/types",
+    "@crate_index//:mockall_0_7_2",
+    "@crate_index//:slog",
+]
+
+rust_library(
+    name = "mocks",
+    srcs = glob(["src/**/*.rs"]),
+    crate_features = select({
+        "//conditions:default": [],
+    }),
+    crate_name = "ic_consensus_mocks",
+    proc_macro_deps = [
+        "@crate_index//:strum_macros",
+    ],
+    version = "0.8.0",
+    deps = DEPENDENCIES,
+)

rs/consensus/mocks/BUILD.bazel

@@ -0,0 +1,23 @@
+[package]
+name = "ic-consensus-mocks"
+version = "0.8.0"
+edition = "2021"
+
+[dependencies]
+ic-artifact-pool = { path = "../../artifact_pool" }
+ic-config = { path = "../../config" }
+ic-consensus-utils = { path = "../utils" }
+ic-interfaces = { path = "../../interfaces" }
+ic-interfaces-state-manager = { path = "../../interfaces/state_manager" }
+ic-logger = { path = "../../monitoring/logger" }
+ic-metrics = { path = "../../monitoring/metrics" }
+ic-protobuf = { path = "../../protobuf" }
+ic-registry-client-fake = { path = "../../registry/fake" }
+ic-registry-keys = { path = "../../registry/keys" }
+ic-registry-proto-data-provider = { path = "../../registry/proto_data_provider" }
+ic-test-artifact-pool = { path = "../../test_utilities/artifact_pool" }
+ic-test-utilities = { path = "../../test_utilities" }
+ic-test-utilities-registry = { path = "../../test_utilities/registry" }
+ic-types = { path = "../../types/types" }
+mockall = "0.7.2"
+slog = { version = "2.5.2", features = ["nested-values", "release_max_level_debug"] }

rs/consensus/mocks/Cargo.toml

@@ -1,9 +1,9 @@
 //! Contains mocks for traits internal to consensus
-use crate::consensus::membership::Membership;
 use ic_artifact_pool::{
     canister_http_pool::CanisterHttpPoolImpl, dkg_pool::DkgPoolImpl, ecdsa_pool::EcdsaPoolImpl,
 };
 use ic_config::artifact_pool::ArtifactPoolConfig;
+use ic_consensus_utils::membership::Membership;
 use ic_interfaces::{
     consensus::{PayloadBuilder, PayloadValidationError},
     validation::ValidationResult,

rs/consensus/src/consensus/mocks.rs renamed to rs/consensus/mocks/src/lib.rs

@@ -1,7 +1,7 @@
 //! This module contains the gossip implementation of the canister http feature.
 
 pub use crate::canister_http::pool_manager::CanisterHttpPoolManagerImpl;
-use crate::consensus::utils::registry_version_at_height;
+use ic_consensus_utils::registry_version_at_height;
 use ic_interfaces::{
     artifact_pool::PriorityFnAndFilterProducer, canister_http::CanisterHttpPool,
     consensus_pool::ConsensusPoolCache,

rs/consensus/src/canister_http/gossip.rs

@@ -1,13 +1,13 @@
 //! Implementation of the payload builder of the canister http feature
 
-use crate::{
-    canister_http::{
-        metrics::CanisterHttpPayloadBuilderMetrics,
-        payload_builder::utils::{
-            group_shares_by_callback_id, grouped_shares_meet_divergence_criteria,
-        },
+use crate::canister_http::{
+    metrics::CanisterHttpPayloadBuilderMetrics,
+    payload_builder::utils::{
+        group_shares_by_callback_id, grouped_shares_meet_divergence_criteria,
     },
-    consensus::{utils::registry_version_at_height, ConsensusCrypto, Membership},
+};
+use ic_consensus_utils::{
+    crypto::ConsensusCrypto, membership::Membership, registry_version_at_height,
 };
 use ic_interfaces::{
     canister_http::{

rs/consensus/src/canister_http/payload_builder.rs

@@ -3,8 +3,8 @@
 //!
 //! Some tests are run over a range of subnet configurations to check for corner cases.
 
-use crate::consensus::mocks::{dependencies_with_subnet_params, Dependencies};
 use ic_artifact_pool::canister_http_pool::CanisterHttpPoolImpl;
+use ic_consensus_mocks::{dependencies_with_subnet_params, Dependencies};
 use ic_interfaces::{
     artifact_pool::{MutablePool, UnvalidatedArtifact},
     canister_http::{

rs/consensus/src/canister_http/payload_builder/tests.rs

@@ -2,9 +2,9 @@
 //! responsible for managing the flow of requests from execution to the
 //! networking component, and ensuring that the resulting responses are signed
 //! and eventually make it into consensus.
-use crate::{
-    canister_http::metrics::CanisterHttpPoolManagerMetrics,
-    consensus::{utils::registry_version_at_height, ConsensusCrypto, Membership},
+use crate::canister_http::metrics::CanisterHttpPoolManagerMetrics;
+use ic_consensus_utils::{
+    crypto::ConsensusCrypto, membership::Membership, registry_version_at_height,
 };
 use ic_interfaces::{
     artifact_pool::ChangeSetProducer, canister_http::*, consensus_pool::ConsensusPoolCache,
@@ -397,9 +397,9 @@ impl<T: CanisterHttpPool> ChangeSetProducer<T> for CanisterHttpPoolManagerImpl {
 #[cfg(test)]
 pub mod test {
     use super::*;
-    use crate::consensus::crypto::SignVerify;
-    use crate::consensus::mocks::{dependencies, Dependencies};
     use ic_artifact_pool::canister_http_pool::CanisterHttpPoolImpl;
+    use ic_consensus_mocks::{dependencies, Dependencies};
+    use ic_consensus_utils::crypto::SignVerify;
     use ic_interfaces::artifact_pool::MutablePool;
     use ic_interfaces::time_source::SysTimeSource;
     use ic_interfaces_state_manager::Labeled;

rs/consensus/src/canister_http/pool_manager.rs

@@ -1,7 +1,7 @@
 //! This module defines the certification component, which is responsible for
 //! reaching consensus on parts of the replicated state produced by the upper
 //! layers by signing state hashes.
-use crate::consensus::crypto::{Aggregate, SignVerify};
+use ic_consensus_utils::crypto::{Aggregate, SignVerify};
 use ic_interfaces::crypto::{Crypto, ThresholdSigner};
 use ic_types::signature::*;
 use ic_types::{