From 7f647a93da5f0ea8b99d23d6bf971aaa499f13c0 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <garious@gmail.com>
Date: Wed, 23 May 2018 23:16:03 -0600
Subject: [PATCH] Add last_id to Event timestamp/signature constructors

---
 src/entry.rs | 4 ++--
 src/event.rs | 9 +++++----
 src/tvu.rs   | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/entry.rs b/src/entry.rs
index 295fbc442..7ba36e06d 100644
--- a/src/entry.rs
+++ b/src/entry.rs
@@ -154,8 +154,8 @@ mod tests {
 
         // First, verify entries
         let keypair = KeyPair::new();
-        let tr0 = Event::new_timestamp(&keypair, Utc::now());
-        let tr1 = Event::new_signature(&keypair, Default::default());
+        let tr0 = Event::new_timestamp(&keypair, Utc::now(), zero);
+        let tr1 = Event::new_signature(&keypair, Default::default(), zero);
         let mut e0 = Entry::new(&zero, 0, vec![tr0.clone(), tr1.clone()]);
         assert!(e0.verify(&zero));
 
diff --git a/src/event.rs b/src/event.rs
index f657f5c3f..dae4de79b 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -34,7 +34,7 @@ impl Event {
     }
 
     /// Create and sign a new Witness Timestamp. Used for unit-testing.
-    pub fn new_timestamp(from: &KeyPair, dt: DateTime<Utc>) -> Self {
+    pub fn new_timestamp(from: &KeyPair, dt: DateTime<Utc>, _last_id: Hash) -> Self {
         let sign_data = serialize(&dt).expect("serialize 'dt' in pub fn new_timestamp");
         let sig = Signature::clone_from_slice(from.sign(&sign_data).as_ref());
         Event::Timestamp {
@@ -45,7 +45,7 @@ impl Event {
     }
 
     /// Create and sign a new Witness Signature. Used for unit-testing.
-    pub fn new_signature(from: &KeyPair, tx_sig: Signature) -> Self {
+    pub fn new_signature(from: &KeyPair, tx_sig: Signature, _last_id: Hash) -> Self {
         let sig = Signature::clone_from_slice(from.sign(&tx_sig).as_ref());
         Event::Signature {
             from: from.pubkey(),
@@ -75,7 +75,8 @@ mod tests {
 
     #[test]
     fn test_event_verify() {
-        assert!(Event::new_timestamp(&KeyPair::new(), Utc::now()).verify());
-        assert!(Event::new_signature(&KeyPair::new(), Signature::default()).verify());
+        let zero = Hash::default();
+        assert!(Event::new_timestamp(&KeyPair::new(), Utc::now(), zero).verify());
+        assert!(Event::new_signature(&KeyPair::new(), Signature::default(), zero).verify());
     }
 }
diff --git a/src/tvu.rs b/src/tvu.rs
index d8faf3a31..be5a610c5 100644
--- a/src/tvu.rs
+++ b/src/tvu.rs
@@ -249,7 +249,7 @@ pub mod tests {
             w.set_index(i).unwrap();
             w.set_id(leader_id).unwrap();
 
-            let tr0 = Event::new_timestamp(&bob_keypair, Utc::now());
+            let tr0 = Event::new_timestamp(&bob_keypair, Utc::now(), cur_hash);
             let entry0 = Entry::new(&cur_hash, i, vec![tr0]);
             bank.register_entry_id(&cur_hash);
             cur_hash = hash(&cur_hash);