Revert unused changes & minor cleanups

ZcashFoundation · Nov 2, 2022 · 38464e0 · 38464e0
1 parent f26a9eb
commit 38464e0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/zebra-consensus/src/block.rs b/zebra-consensus/src/block.rs
@@ -39,7 +39,6 @@ mod subsidy;
 mod tests;
 
 /// Asynchronous block verification.
-#[cfg_attr(feature = "getblocktemplate-rpcs", derive(Clone))]
 #[derive(Debug)]
 pub struct BlockVerifier<S, V> {
     /// The network to be verified.

diff --git a/zebra-consensus/src/chain.rs b/zebra-consensus/src/chain.rs
@@ -56,7 +56,7 @@ mod tests;
 ///
 /// We deliberately add extra slots, because they only cost a small amount of
 /// memory, but missing slots can significantly slow down Zebra.
-pub const VERIFIER_BUFFER_BOUND: usize = 5;
+const VERIFIER_BUFFER_BOUND: usize = 5;
 
 /// The chain verifier routes requests to either the checkpoint verifier or the
 /// block verifier, depending on the maximum checkpoint height.

diff --git a/zebra-consensus/src/lib.rs b/zebra-consensus/src/lib.rs
@@ -57,8 +57,3 @@ pub use primitives::{ed25519, groth16, halo2, redjubjub, redpallas};
 
 /// A boxed [`std::error::Error`].
 pub type BoxError = Box<dyn std::error::Error + Send + Sync + 'static>;
-
-#[cfg(feature = "getblocktemplate-rpcs")]
-pub use block::BlockVerifier;
-#[cfg(feature = "getblocktemplate-rpcs")]
-pub use transaction::Verifier as TransactionVerifier;
diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml
@@ -9,9 +9,11 @@ edition = "2021"
 
 [features]
 default = []
-proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl", "zebra-state/proptest-impl"]
 getblocktemplate-rpcs = ["zebra-state/getblocktemplate-rpcs", "zebra-consensus/getblocktemplate-rpcs"]
 
+# Test-only features
+proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl", "zebra-state/proptest-impl"]
+
 [dependencies]
 chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }
 futures = "0.3.25"