changes for next

Author: sisuresh

.github/copilot-instructions.md

@@ -50,12 +50,12 @@ $ NUM_PARTITIONS=$(nproc) STELLAR_CORE_TEST_PARAMS='--ll fatal -r simple --abort
 
 When you make a protocol change
 (including `#ifdef`-gated vnext code) and add tests for that change, you MUST regenerate the captured
-`LedgerCloseMeta` golden data and commit the resulting `test-lcm/` changes.
+`LedgerCloseMeta` golden data and commit the resulting `test-lcm-current/` or `test-lcm-next/` changes.
 For vnext tests, configure with
 `--enable-next-protocol-version-unsafe-for-production` and rebuild first.
 
 ```sh
-# regenerate captured LedgerCloseMeta golden data, then commit test-lcm/
+# regenerate captured LedgerCloseMeta golden data for the current build's tier, then commit it
 $ ./src/stellar-core test --ll fatal -r simple --abort --disable-dots --rng-seed 12345 --capture-lcm "[tx]"
 ```
 

docs/software/commands.md

@@ -204,7 +204,12 @@ Command options can only by placed after command.
       * `--capture-lcm` : capture `LedgerCloseMeta` XDR from every
       `closeLedger`/`closeLedgerOn` call during tests. Files are written
       automatically at leaf-section boundaries (or test-case boundaries for
-      tests without sections) to `test-lcm/<TestFileBaseName>/`. Each file
+      tests without sections) to a protocol-tiered directory:
+      `test-lcm-next/<TestFileBaseName>/` when the binary was built with
+      `--enable-next-protocol-version-unsafe-for-production`, otherwise
+      `test-lcm-current/<TestFileBaseName>/`. The two tiers are kept separate
+      so a current build never reads back meta containing feature-gated XDR
+      it cannot decode. Each file
       is named with a truncated SHA-256 hash of the test/section path
       (e.g. `a1b2c3d4e5f67890.xdr`), and an `index.json` in each
       directory maps hashes back to human-readable names. Each file contains
@@ -218,7 +223,10 @@ Command options can only by placed after command.
   * For example this will run just the tests tagged with `[tx]` using protocol
     versions 9 and 10 and stop after the first failure:
     `stellar-core test -a --version 9 --version 10 "[tx]"`
-  * The checked-in files under `test-lcm/` were generated with:
+  * The checked-in files under `test-lcm-current/` and `test-lcm-next/` are
+    generated by running the capture under each build configuration (the
+    `next` tier requires a binary built with
+    `--enable-next-protocol-version-unsafe-for-production`):
     `stellar-core test --rng-seed 12345 '[tx]' --capture-lcm`
 * **upgrade-db**: Upgrades local database to current schema version. This is
   usually done automatically during stellar-core run or other command.

src/herder/test/HerderTests.cpp

@@ -8513,7 +8513,7 @@ TEST_CASE_VERSIONS("Herder properly validates when tx set is missing",
 #ifdef CAP_0083
 // This tests that the network externalizes an empty-tx-set value when a
 // voted-for value is not available on the network.
-TEST_CASE("network externalizes empty-tx-set on missing value", "[herder]")
+TEST_CASE("network externalizes empty-tx-set on missing value", "[herder][tx]")
 {
     auto networkID = sha256(getTestConfig().NETWORK_PASSPHRASE);
     auto simulation = Topologies::core(

src/test/test.cpp

@@ -148,7 +148,19 @@ std::string
 buildLcmOutputDir(Catch::TestCaseInfo const& tc)
 {
     std::filesystem::path file(tc.lineInfo.file);
-    return "test-lcm/" + file.filename().stem().string();
+    // Partition golden data by protocol tier so that a build only ever reads,
+    // writes, and diffs files it can deserialize. A "current" (released) build
+    // must not touch meta captured by a "next" build, which can contain
+    // feature-gated XDR (e.g. cap83) whose discriminants the current build does
+    // not understand. This mirrors the test-tx-meta-baseline-{current,next}
+    // convention. The tier is fixed per binary by the compile-time define.
+#ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
+    char const* tier = "next";
+#else
+    char const* tier = "current";
+#endif
+    return std::string("test-lcm-") + tier + "/" +
+           file.filename().stem().string();
 }
 
 int32_t
@@ -715,8 +727,9 @@ runTest(CommandLineArgs const& args)
     parser |= Catch::clara::Opt(
         Catch::SimpleTestReporter::gDisableDots)["--disable-dots"];
     parser |= Catch::clara::Opt(gLcmCaptureEnabled)["--capture-lcm"](
-        "automatically capture LedgerCloseMeta to binary XDR files "
-        "in test-lcm/ at leaf section boundaries");
+        "automatically capture LedgerCloseMeta to binary XDR files in "
+        "test-lcm-current/ (or test-lcm-next/ for vnext builds) at leaf "
+        "section boundaries");
 
     session.cli(parser);
 

src/test/test.h

@@ -37,11 +37,13 @@ extern bool force_sqlite;
 
 // Returns true if --capture-lcm was passed to the test command.
 // When enabled, LedgerCloseMeta from closeLedger/closeLedgerOn is
-// automatically written to binary XDR files in test-lcm/<TestFile>/
-// at leaf section boundaries (or test case end for tests without
-// sections). File names are SHA-256 hashes of the human-readable test
-// name; each directory also contains an index.json mapping hashes to
-// test names.
+// automatically written to binary XDR files under a protocol-tiered
+// directory: test-lcm-next/<TestFile>/ when the binary is built with
+// --enable-next-protocol-version-unsafe-for-production, otherwise
+// test-lcm-current/<TestFile>/. Files are written at leaf section
+// boundaries (or test case end for tests without sections). File names
+// are SHA-256 hashes of the human-readable test name; each directory
+// also contains an index.json mapping hashes to test names.
 bool isLcmCaptureEnabled();
 
 void test_versions_wrapper(std::function<void(void)> f);