From f7052023811965d0610536127093e98dc722123d Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Thu, 1 Mar 2018 16:39:09 -0700 Subject: [PATCH] No need to hash data that's already hashed to create the signature --- src/log.rs | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/log.rs b/src/log.rs index 523a12afa..b38b505cd 100644 --- a/src/log.rs +++ b/src/log.rs @@ -116,24 +116,8 @@ pub fn hash_event(end_hash: &Sha256Hash, event: &Event) -> Sha2 match *event { Event::Tick => *end_hash, Event::Discovery { ref data } => extend_and_hash(end_hash, 1, &serialize(&data).unwrap()), - Event::Claim { key, ref data, sig } => { - let mut event_data = serialize(&data).unwrap(); - event_data.extend_from_slice(&sig); - event_data.extend_from_slice(&key); - extend_and_hash(end_hash, 2, &event_data) - } - Event::Transaction { - from, - to, - ref data, - sig, - } => { - let mut event_data = serialize(&data).unwrap(); - event_data.extend_from_slice(&sig); - event_data.extend_from_slice(&from); - event_data.extend_from_slice(&to); - extend_and_hash(end_hash, 2, &event_data) - } + Event::Claim { sig, .. } => extend_and_hash(end_hash, 2, &sig), + Event::Transaction { sig, .. } => extend_and_hash(end_hash, 3, &sig), } }