Add a test that covers transaction set building logic on randomized d…

…ata. (#4507)

# Description

Add a test that covers transaction set building logic on randomized
data.

While this is not comprehensive (and probably can't be), I think that
will add increase our confidence in the upcoming tx set refactoring and
might prevent accidental changes in the future.

# Checklist
- [ ] Reviewed the
[contributing](https://github.com/stellar/stellar-core/blob/master/CONTRIBUTING.md#submitting-changes)
document
- [ ] Rebased on top of master (no merge commits)
- [ ] Ran `clang-format` v8.0.0 (via `make format` or the Visual Studio
extension)
- [ ] Compiles
- [ ] Ran all tests
- [ ] If change impacts performance, include supporting evidence per the
[performance
document](https://github.com/stellar/stellar-core/blob/master/performance-eval/performance-eval.md)

Builds/VisualStudio/stellar-core.vcxproj

@@ -580,6 +580,7 @@ exit /b 0
     <ClCompile Include="..\..\src\historywork\VerifyTxResultsWork.cpp" />
     <ClCompile Include="..\..\src\historywork\WriteSnapshotWork.cpp" />
     <ClCompile Include="..\..\src\historywork\WriteVerifiedCheckpointHashesWork.cpp" />
+    <ClCompile Include="..\..\src\history\CheckpointBuilder.cpp" />
     <ClCompile Include="..\..\src\history\FileTransferInfo.cpp" />
     <ClCompile Include="..\..\src\history\HistoryArchive.cpp" />
     <ClCompile Include="..\..\src\history\HistoryArchiveManager.cpp" />
@@ -640,6 +641,7 @@ exit /b 0
     <ClCompile Include="..\..\src\ledger\test\LiabilitiesTests.cpp" />
     <ClCompile Include="..\..\src\ledger\SorobanMetrics.cpp" />
     <ClCompile Include="..\..\src\ledger\TrustLineWrapper.cpp" />
+    <ClCompile Include="..\..\src\main\AppConnector.cpp" />
     <ClCompile Include="..\..\src\main\Diagnostics.cpp" />
     <ClCompile Include="..\..\src\main\QueryServer.cpp" />
     <ClCompile Include="..\..\src\main\SettingsUpgradeUtils.cpp" />
@@ -654,7 +656,6 @@ exit /b 0
     <ClCompile Include="..\..\src\overlay\FlowControlCapacity.cpp" />
     <ClCompile Include="..\..\src\overlay\Hmac.cpp" />
     <ClCompile Include="..\..\src\overlay\ItemFetcher.cpp" />
-    <ClCompile Include="..\..\src\overlay\OverlayAppConnector.cpp" />
     <ClCompile Include="..\..\src\overlay\OverlayManagerImpl.cpp" />
     <ClCompile Include="..\..\src\overlay\OverlayMetrics.cpp" />
     <ClCompile Include="..\..\src\overlay\Peer.cpp" />
@@ -1032,6 +1033,7 @@ exit /b 0
     <ClInclude Include="..\..\src\historywork\VerifyTxResultsWork.h" />
     <ClInclude Include="..\..\src\historywork\WriteSnapshotWork.h" />
     <ClInclude Include="..\..\src\historywork\WriteVerifiedCheckpointHashesWork.h" />
+    <ClInclude Include="..\..\src\history\CheckpointBuilder.h" />
     <ClInclude Include="..\..\src\history\FileTransferInfo.h" />
     <ClInclude Include="..\..\src\history\HistoryArchive.h" />
     <ClInclude Include="..\..\src\history\HistoryArchiveManager.h" />
@@ -1075,6 +1077,7 @@ exit /b 0
     <ClInclude Include="..\..\src\ledger\test\LedgerTestUtils.h" />
     <ClInclude Include="..\..\src\ledger\SorobanMetrics.h" />
     <ClInclude Include="..\..\src\ledger\TrustLineWrapper.h" />
+    <ClInclude Include="..\..\src\main\AppConnector.h" />
     <ClInclude Include="..\..\src\main\Diagnostics.h" />
     <ClInclude Include="..\..\src\main\QueryServer.h" />
     <ClInclude Include="..\..\src\main\SettingsUpgradeUtils.h" />
@@ -1085,7 +1088,6 @@ exit /b 0
     <ClInclude Include="..\..\src\overlay\FlowControlCapacity.h" />
     <ClInclude Include="..\..\src\overlay\Hmac.h" />
     <ClInclude Include="..\..\src\overlay\ItemFetcher.h" />
-    <ClInclude Include="..\..\src\overlay\OverlayAppConnector.h" />
     <ClInclude Include="..\..\src\overlay\OverlayManager.h" />
     <ClInclude Include="..\..\src\overlay\OverlayManagerImpl.h" />
     <ClInclude Include="..\..\src\overlay\OverlayMetrics.h" />
@@ -1744,4 +1746,4 @@ $(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --cfg test=false --output
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Builds/VisualStudio/stellar-core.vcxproj.filters

@@ -1338,9 +1338,6 @@
     <ClCompile Include="..\..\src\overlay\TxAdverts.cpp">
       <Filter>overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\overlay\OverlayAppConnector.cpp">
-      <Filter>overlay</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\overlay\TxDemandsManager.cpp">
       <Filter>overlay</Filter>
     </ClCompile>
@@ -1377,6 +1374,15 @@
     <ClCompile Include="..\..\src\ledger\LedgerStateSnapshot.cpp">
       <Filter>ledger</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\lib\tracy\public\TracyClient.cpp" />
+    <ClCompile Include="..\..\src\simulation\ApplyLoad.cpp" />
+    <ClCompile Include="..\..\src\simulation\TxGenerator.cpp" />
+    <ClCompile Include="..\..\src\main\AppConnector.cpp">
+      <Filter>main</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\history\CheckpointBuilder.cpp">
+      <Filter>history</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\lib\util\cpptoml.h">
@@ -2363,9 +2369,6 @@
     <ClInclude Include="..\..\src\overlay\TxAdverts.h">
       <Filter>overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\overlay\OverlayAppConnector.h">
-      <Filter>overlay</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\overlay\TxDemandsManager.h">
       <Filter>overlay</Filter>
     </ClInclude>
@@ -2405,6 +2408,14 @@
     <ClInclude Include="..\..\src\ledger\LedgerStateSnapshot.h">
       <Filter>ledger</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\simulation\ApplyLoad.h" />
+    <ClInclude Include="..\..\src\simulation\TxGenerator.h" />
+    <ClInclude Include="..\..\src\main\AppConnector.h">
+      <Filter>main</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\history\CheckpointBuilder.h">
+      <Filter>history</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\AUTHORS" />
@@ -2650,4 +2661,4 @@
     <Text Include="..\..\INSTALL-Windows.md" />
     <Text Include="..\..\LICENSE-APACHE.txt" />
   </ItemGroup>
-</Project>
+</Project>

src/herder/SurgePricingUtils.cpp

@@ -119,9 +119,16 @@ SurgePricingPriorityQueue::TxComparator::txLessThan(
     {
         return cmp3 < 0;
     }
+#ifndef BUILD_TESTS
     // break tie with pointer arithmetic
     auto lx = reinterpret_cast<size_t>(tx1.get()) ^ mSeed;
     auto rx = reinterpret_cast<size_t>(tx2.get()) ^ mSeed;
+#else
+    // Sort transactions deterministically in tests in order to ensure
+    // reproducibility.
+    auto lx = tx1->getFullHash();
+    auto rx = tx2->getFullHash();
+#endif
     return lx < rx;
 }
 

src/herder/test/HerderTests.cpp

@@ -6060,4 +6060,4 @@ TEST_CASE_VERSIONS("Fair nomination win rates", "[herder]")
             testWinProbabilities(sks, validators, 10000);
         }
     }
-}
+}