From 38f0d60b007384da08acbb7319aa1aa04ca6e42c Mon Sep 17 00:00:00 2001
From: steviez <steven@solana.com>
Date: Mon, 18 Apr 2022 00:16:06 -0500
Subject: [PATCH] Move repeated logic into common function (#24373)

---
 core/src/serve_repair.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/src/serve_repair.rs b/core/src/serve_repair.rs
index 6a02fe1897..137cdbaa0c 100644
--- a/core/src/serve_repair.rs
+++ b/core/src/serve_repair.rs
@@ -1148,6 +1148,10 @@ mod tests {
 
     #[test]
     fn test_run_ancestor_hashes() {
+        fn deserialize_ancestor_hashes_response(packet: &Packet) -> AncestorHashesResponseVersion {
+            limited_deserialize(&packet.data[..packet.meta.size - SIZE_OF_NONCE]).unwrap()
+        }
+
         solana_logger::setup();
         let recycler = PacketBatchRecycler::default();
         let ledger_path = get_tmp_ledger_path!();
@@ -1177,8 +1181,7 @@ mod tests {
             .packets;
             assert_eq!(rv.len(), 1);
             let packet = &rv[0];
-            let ancestor_hashes_response: AncestorHashesResponseVersion =
-                limited_deserialize(&packet.data[..packet.meta.size - SIZE_OF_NONCE]).unwrap();
+            let ancestor_hashes_response = deserialize_ancestor_hashes_response(packet);
             assert!(ancestor_hashes_response.into_slot_hashes().is_empty());
 
             // `slot + num_slots - 1` is not marked duplicate confirmed so nothing should return
@@ -1194,8 +1197,7 @@ mod tests {
             .packets;
             assert_eq!(rv.len(), 1);
             let packet = &rv[0];
-            let ancestor_hashes_response: AncestorHashesResponseVersion =
-                limited_deserialize(&packet.data[..packet.meta.size - SIZE_OF_NONCE]).unwrap();
+            let ancestor_hashes_response = deserialize_ancestor_hashes_response(packet);
             assert!(ancestor_hashes_response.into_slot_hashes().is_empty());
 
             // Set duplicate confirmed
@@ -1218,8 +1220,7 @@ mod tests {
             .packets;
             assert_eq!(rv.len(), 1);
             let packet = &rv[0];
-            let ancestor_hashes_response: AncestorHashesResponseVersion =
-                limited_deserialize(&packet.data[..packet.meta.size - SIZE_OF_NONCE]).unwrap();
+            let ancestor_hashes_response = deserialize_ancestor_hashes_response(packet);
             assert_eq!(
                 ancestor_hashes_response.into_slot_hashes(),
                 expected_ancestors