From b8e3c48c26413af8ca1b6a600617d0e32ddfe6b0 Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Tue, 29 Sep 2015 16:28:06 +0300
Subject: [PATCH] Review fixes.

---
 coding/coding_tests/succinct_trie_test.cpp | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/coding/coding_tests/succinct_trie_test.cpp b/coding/coding_tests/succinct_trie_test.cpp
index d757ce2dc8..4eeae0f9cf 100644
--- a/coding/coding_tests/succinct_trie_test.cpp
+++ b/coding/coding_tests/succinct_trie_test.cpp
@@ -100,15 +100,15 @@ struct SimpleValueList
   vector<uint8_t> m_valueList;
 };
 
-void ReadAllValues(trie::SuccinctTrieIterator<MemReader, SimpleValueReader> & root,
-    vector<uint8_t> & values)
+using TSimpleIterator = trie::SuccinctTrieIterator<MemReader, SimpleValueReader>;
+
+void ReadAllValues(TSimpleIterator & root, vector<uint8_t> & values)
 {
   for (size_t i = 0; i < root.NumValues(); ++i)
     values.push_back(root.GetValue(i));
 }
 
-void CollectInSubtree(trie::SuccinctTrieIterator<MemReader, SimpleValueReader> & root,
-                      vector<uint8_t> & collectedValues)
+void CollectInSubtree(TSimpleIterator & root, vector<uint8_t> & collectedValues)
 {
   ReadAllValues(root, collectedValues);
 
@@ -117,6 +117,13 @@ void CollectInSubtree(trie::SuccinctTrieIterator<MemReader, SimpleValueReader> &
   if (auto r = root.GoToEdge(1))
     CollectInSubtree(*r, collectedValues);
 }
+
+template <typename TWriter>
+void BuildFromSimpleValueList(TWriter & writer, vector<StringsFileEntryMock> & data)
+{
+  trie::BuildSuccinctTrie<TWriter, vector<StringsFileEntryMock>::iterator,
+                          SimpleValueList<TWriter>>(writer, data.begin(), data.end());
+}
 }  // namespace
 
 namespace trie
@@ -156,8 +163,7 @@ UNIT_TEST(SuccinctTrie_Serialization_Smoke2)
 
   vector<StringsFileEntryMock> data = {StringsFileEntryMock("abacaba", 1)};
 
-  trie::BuildSuccinctTrie<TWriter, vector<StringsFileEntryMock>::iterator,
-                          SimpleValueList<TWriter>>(memWriter, data.begin(), data.end());
+  BuildFromSimpleValueList(memWriter, data);
 
   MemReader memReader(buf.data(), buf.size());
 
@@ -179,8 +185,7 @@ UNIT_TEST(SuccinctTrie_Iterator)
                                        StringsFileEntryMock("abc", 5)};
   sort(data.begin(), data.end());
 
-  trie::BuildSuccinctTrie<TWriter, vector<StringsFileEntryMock>::iterator,
-                          SimpleValueList<TWriter>>(memWriter, data.begin(), data.end());
+  BuildFromSimpleValueList(memWriter, data);
 
   MemReader memReader(buf.data(), buf.size());
 
@@ -209,8 +214,7 @@ UNIT_TEST(SuccinctTrie_MoveToString)
       StringsFileEntryMock("aaa", 3), StringsFileEntryMock("aaa", 4)};
   sort(data.begin(), data.end());
 
-  trie::BuildSuccinctTrie<TWriter, vector<StringsFileEntryMock>::iterator,
-                          SimpleValueList<TWriter>>(memWriter, data.begin(), data.end());
+  BuildFromSimpleValueList(memWriter, data);
   MemReader memReader(buf.data(), buf.size());
 
   using TEmptyValue = trie::EmptyValueReader::ValueType;