From 0f84a6d38e236586f8e46eba737af0b4e5d322a2 Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Wed, 25 Sep 2019 18:51:29 -0400 Subject: [PATCH] Implement Zcash(De)serialize traits specifically for MerkleTree This is a general placeholder for now. --- zebra-chain/src/block.rs | 12 ++++++++++++ zebra-chain/src/merkle_tree.rs | 15 +-------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/zebra-chain/src/block.rs b/zebra-chain/src/block.rs index d0c45dcd9..9fa7f92a8 100644 --- a/zebra-chain/src/block.rs +++ b/zebra-chain/src/block.rs @@ -28,6 +28,18 @@ impl From for BlockHash { /// hashed transactions in a block. pub struct MerkleRootHash([u8; 32]); +impl ZcashSerialize for MerkleTree { + fn zcash_serialize(&self, writer: W) -> Result<(), SerializationError> { + unimplemented!(); + } +} + +impl ZcashDeserialize for MerkleTree { + fn zcash_deserialize(reader: R) -> Result { + unimplemented!(); + } +} + impl From> for MerkleRootHash { fn from(merkle_tree: MerkleTree) -> Self { let mut hash_writer = Sha256dWriter::default(); diff --git a/zebra-chain/src/merkle_tree.rs b/zebra-chain/src/merkle_tree.rs index bc828f517..85110857f 100644 --- a/zebra-chain/src/merkle_tree.rs +++ b/zebra-chain/src/merkle_tree.rs @@ -2,9 +2,8 @@ //! node values. use std::io; -use std::io::prelude::*; -use sha2::{Digest, Sha256}; +use sha2::Sha256; use crate::serialization::{SerializationError, ZcashDeserialize, ZcashSerialize}; @@ -20,15 +19,3 @@ impl MerkleTree { unimplemented!(); } } - -impl ZcashSerialize for MerkleTree { - fn zcash_serialize(&self, writer: W) -> Result<(), SerializationError> { - unimplemented!(); - } -} - -impl ZcashDeserialize for MerkleTree { - fn zcash_deserialize(reader: R) -> Result { - unimplemented!(); - } -}