Merge branch 'main' into regtest-allow-transparent-coinbase-spends

ZcashFoundation · Dec 18, 2024 · c489d2f · c489d2f
2 parents 2ba1e3f + 543f066
commit c489d2f
Show file tree

Hide file tree

Showing 35 changed files with 868 additions and 902 deletions.
diff --git a/zebra-chain/src/transaction/hash.rs b/zebra-chain/src/transaction/hash.rs
@@ -34,7 +34,6 @@ use std::{fmt, sync::Arc};
 use proptest_derive::Arbitrary;
 
 use hex::{FromHex, ToHex};
-use serde::{Deserialize, Serialize};
 
 use crate::serialization::{
     ReadZcashExt, SerializationError, WriteZcashExt, ZcashDeserialize, ZcashSerialize,
@@ -56,7 +55,7 @@ use super::{txid::TxIdBuilder, AuthDigest, Transaction};
 ///
 /// [ZIP-244]: https://zips.z.cash/zip-0244
 /// [Spec: Transaction Identifiers]: https://zips.z.cash/protocol/protocol.pdf#txnidentifiers
-#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, Hash)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[cfg_attr(any(test, feature = "proptest-impl"), derive(Arbitrary))]
 pub struct Hash(pub [u8; 32]);
 

diff --git a/zebra-rpc/src/constants.rs b/zebra-rpc/src/constants.rs
diff --git a/zebra-rpc/src/lib.rs b/zebra-rpc/src/lib.rs
@@ -5,7 +5,6 @@
 #![doc(html_root_url = "https://docs.rs/zebra_rpc")]
 
 pub mod config;
-pub mod constants;
 pub mod methods;
 pub mod queue;
 pub mod server;