From ccfd94a112075a450bec40e0d05fcacf5813e2ea Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Mon, 29 Jan 2024 16:44:32 -0700 Subject: [PATCH] zcash_primitives: Move the `local-consensus` module to the `zcash_protocol` crate. --- components/zcash_protocol/Cargo.toml | 3 +++ components/zcash_protocol/src/lib.rs | 2 ++ .../zcash_protocol}/src/local_consensus.rs | 0 zcash_primitives/Cargo.toml | 3 --- zcash_primitives/src/lib.rs | 2 -- 5 files changed, 5 insertions(+), 5 deletions(-) rename {zcash_primitives => components/zcash_protocol}/src/local_consensus.rs (100%) diff --git a/components/zcash_protocol/Cargo.toml b/components/zcash_protocol/Cargo.toml index f4ea79fc13..03cc53b3b8 100644 --- a/components/zcash_protocol/Cargo.toml +++ b/components/zcash_protocol/Cargo.toml @@ -46,3 +46,6 @@ unstable-nu6 = [] ## Exposes early in-development features that are not yet planned for any network upgrade. zfuture = [] + +## Exposes support for working with a local consensus (e.g. regtest +local-consensus = [] diff --git a/components/zcash_protocol/src/lib.rs b/components/zcash_protocol/src/lib.rs index a15d5e5881..f15901ae58 100644 --- a/components/zcash_protocol/src/lib.rs +++ b/components/zcash_protocol/src/lib.rs @@ -16,5 +16,7 @@ #![allow(clippy::result_unit_err)] pub mod consensus; +#[cfg(feature = "local-consensus")] +pub mod local_consensus; pub mod constants; pub mod value; diff --git a/zcash_primitives/src/local_consensus.rs b/components/zcash_protocol/src/local_consensus.rs similarity index 100% rename from zcash_primitives/src/local_consensus.rs rename to components/zcash_protocol/src/local_consensus.rs diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index f409c1a633..8bf62e7286 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -133,9 +133,6 @@ unstable-nu6 = ["zcash_protocol/unstable-nu6"] ## Exposes early in-development features that are not yet planned for any network upgrade. zfuture = ["zcash_protocol/zfuture"] - -## Exposes support for working with a local consensus (e.g. regtest -local-consensus = [] [lib] bench = false diff --git a/zcash_primitives/src/lib.rs b/zcash_primitives/src/lib.rs index bd77312a80..e539dfeea0 100644 --- a/zcash_primitives/src/lib.rs +++ b/zcash_primitives/src/lib.rs @@ -28,6 +28,4 @@ pub mod transaction; pub use zip32; #[cfg(feature = "zfuture")] pub mod extensions; -#[cfg(feature = "local-consensus")] -pub mod local_consensus; pub mod zip339;