From b21b09bf8e77fb7a97031e06833175e4669513a5 Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Fri, 27 Sep 2019 21:08:25 -0400 Subject: [PATCH] Moved stub TxHash into zebra_chain::transaction --- zebra-chain/src/transaction.rs | 4 ++++ zebra-network/src/protocol/inv.rs | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zebra-chain/src/transaction.rs b/zebra-chain/src/transaction.rs index 825ae512..128f73a2 100644 --- a/zebra-chain/src/transaction.rs +++ b/zebra-chain/src/transaction.rs @@ -1,5 +1,9 @@ //! Transaction types. +/// Stub-- delete later. +#[derive(Copy, Clone, Debug, Eq, PartialEq)] +pub struct TxHash(pub [u8; 32]); + /// OutPoint /// /// A particular transaction output reference. diff --git a/zebra-network/src/protocol/inv.rs b/zebra-network/src/protocol/inv.rs index 5e169311..be8758bb 100644 --- a/zebra-network/src/protocol/inv.rs +++ b/zebra-network/src/protocol/inv.rs @@ -12,10 +12,7 @@ use zebra_chain::block::BlockHeaderHash; use zebra_chain::serialization::{ ReadZcashExt, SerializationError, ZcashDeserialize, ZcashSerialize, }; - -/// Stub-- delete later. -#[derive(Copy, Clone, Debug, Eq, PartialEq)] -pub struct TxHash(pub [u8; 32]); +use zebra_chain::transaction::TxHash; /// An inventory hash which refers to some advertised or requested data. ///