From f9f493ee7a2c8e97be6435e1865064bcf634707c Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Mon, 25 Feb 2019 20:23:15 -0700
Subject: [PATCH] Tighten up storage_stage changes

---
 src/entry.rs         |  6 +++---
 src/storage_stage.rs | 16 +++-------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/entry.rs b/src/entry.rs
index 4d75bcb9f..ed38d3ad9 100644
--- a/src/entry.rs
+++ b/src/entry.rs
@@ -35,14 +35,14 @@ pub struct EntryMeta {
 }
 
 impl EntryMeta {
-    pub fn default_with_entry(entry: &Entry) -> Self {
-        EntryMeta {
+    pub fn new(entry: Entry) -> Self {
+        Self {
             tick_height: 0,
             slot: 0,
             slot_leader: Pubkey::default(),
             num_ticks_left_in_slot: 0,
             parent_slot: None,
-            entry: entry.clone(),
+            entry,
         }
     }
 }
diff --git a/src/storage_stage.rs b/src/storage_stage.rs
index 06f5451c4..9c45066c4 100644
--- a/src/storage_stage.rs
+++ b/src/storage_stage.rs
@@ -532,10 +532,7 @@ mod tests {
             STORAGE_ROTATE_TEST_COUNT,
             &cluster_info,
         );
-        let entries_meta: Vec<EntryMeta> = entries
-            .iter()
-            .map(|entry| EntryMeta::default_with_entry(entry))
-            .collect();
+        let entries_meta: Vec<EntryMeta> = entries.into_iter().map(EntryMeta::new).collect();
         storage_entry_sender.send(entries_meta.clone()).unwrap();
 
         let keypair = Keypair::new();
@@ -601,10 +598,7 @@ mod tests {
             STORAGE_ROTATE_TEST_COUNT,
             &cluster_info,
         );
-        let entries_meta: Vec<EntryMeta> = entries
-            .iter()
-            .map(|entry| EntryMeta::default_with_entry(entry))
-            .collect();
+        let entries_meta: Vec<EntryMeta> = entries.into_iter().map(EntryMeta::new).collect();
         storage_entry_sender.send(entries_meta.clone()).unwrap();
 
         let mut reference_keys;
@@ -617,11 +611,7 @@ mod tests {
         let keypair = Keypair::new();
         let vote_tx = VoteTransaction::new_vote(&keypair, 123456, Hash::default(), 1);
         vote_txs.push(vote_tx);
-        let vote_entries = vec![EntryMeta::default_with_entry(&Entry::new(
-            &Hash::default(),
-            1,
-            vote_txs,
-        ))];
+        let vote_entries = vec![EntryMeta::new(Entry::new(&Hash::default(), 1, vote_txs))];
         storage_entry_sender.send(vote_entries).unwrap();
 
         for _ in 0..5 {