From e387ae29b76eb91d62977eba9fff18d4fa59ded7 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 7 Feb 2024 10:01:56 -0700 Subject: [PATCH] zcash_primitives: Move the `memo` module to the `zcash_protocol` crate. --- components/zcash_protocol/src/lib.rs | 1 + {zcash_primitives => components/zcash_protocol}/src/memo.rs | 0 zcash_primitives/CHANGELOG.md | 1 + zcash_primitives/src/lib.rs | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) rename {zcash_primitives => components/zcash_protocol}/src/memo.rs (100%) diff --git a/components/zcash_protocol/src/lib.rs b/components/zcash_protocol/src/lib.rs index b672a5ef3e..a9084e87cc 100644 --- a/components/zcash_protocol/src/lib.rs +++ b/components/zcash_protocol/src/lib.rs @@ -21,6 +21,7 @@ pub mod consensus; pub mod constants; #[cfg(feature = "local-consensus")] pub mod local_consensus; +pub mod memo; pub mod value; /// A Zcash shielded transfer protocol. diff --git a/zcash_primitives/src/memo.rs b/components/zcash_protocol/src/memo.rs similarity index 100% rename from zcash_primitives/src/memo.rs rename to components/zcash_protocol/src/memo.rs diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 6a962f1cb5..0e74211441 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/zcash_primitives/CHANGELOG.md @@ -132,6 +132,7 @@ and this library adheres to Rust's notion of `zcash_protocol::constants` module. - `zcash_primitives::transaction::components::amount` is now a reexport of the `zcash_protocol::value` module. +- `zcash_primitives::memo` is now a reexport of the `zcash_protocol::memo` module. ### Moved - `zcash_primitives::consensus::sapling_zip212_enforcement` has been moved to diff --git a/zcash_primitives/src/lib.rs b/zcash_primitives/src/lib.rs index e539dfeea0..37c37d653a 100644 --- a/zcash_primitives/src/lib.rs +++ b/zcash_primitives/src/lib.rs @@ -21,7 +21,7 @@ pub mod block; pub use zcash_protocol::consensus; pub use zcash_protocol::constants; pub mod legacy; -pub mod memo; +pub use zcash_protocol::memo; pub mod merkle_tree; use sapling; pub mod transaction;