Cleanup bad usages of READ_ONLY_WITHOUT_SQL_TXN across the codebase

stellar · Oct 16, 2024 · d5150fb · d5150fb
1 parent c46ee76
commit d5150fb
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/src/bucket/test/BucketListTests.cpp b/src/bucket/test/BucketListTests.cpp
@@ -726,8 +726,7 @@ TEST_CASE_VERSIONS("network config snapshots BucketList size", "[bucketlist]")
 
             uint64_t correctAverage = sum / correctWindow.size();
 
-            LedgerTxn ltx(app->getLedgerTxnRoot(), false,
-                          TransactionMode::READ_ONLY_WITHOUT_SQL_TXN);
+            LedgerTxn ltx(app->getLedgerTxnRoot());
             REQUIRE(networkConfig.getAverageBucketListSize() == correctAverage);
 
             // Check on-disk sliding window

diff --git a/src/herder/HerderImpl.cpp b/src/herder/HerderImpl.cpp
@@ -2147,11 +2147,9 @@ HerderImpl::start()
 {
     mMaxTxSize = mApp.getHerder().getMaxClassicTxSize();
     {
-        LedgerTxn ltx(mApp.getLedgerTxnRoot(),
-                      /* shouldUpdateLastModified */ true,
-                      TransactionMode::READ_ONLY_WITHOUT_SQL_TXN);
-
-        uint32_t version = ltx.loadHeader().current().ledgerVersion;
+        uint32_t version = mApp.getLedgerManager()
+                               .getLastClosedLedgerHeader()
+                               .header.ledgerVersion;
         if (protocolVersionStartsFrom(version, SOROBAN_PROTOCOL_VERSION))
         {
             auto const& conf =

diff --git a/src/herder/test/TxSetTests.cpp b/src/herder/test/TxSetTests.cpp
@@ -519,8 +519,7 @@ TEST_CASE("generalized tx set XDR conversion", "[txset]")
         auto txSetFrame = TxSetXDRFrame::makeFromWire(txSetXdr);
         ApplicableTxSetFrameConstPtr applicableFrame;
         {
-            LedgerTxn ltx(app->getLedgerTxnRoot(), false,
-                          TransactionMode::READ_ONLY_WITHOUT_SQL_TXN);
+            LedgerTxn ltx(app->getLedgerTxnRoot());
             applicableFrame = txSetFrame->prepareForApply(*app);
         }
         REQUIRE(applicableFrame->checkValid(*app, 0, 0));

diff --git a/src/ledger/LedgerManagerImpl.cpp b/src/ledger/LedgerManagerImpl.cpp
@@ -1139,8 +1139,7 @@ LedgerManagerImpl::setLastClosedLedger(
 
     mRebuildInMemoryState = false;
     advanceLedgerPointers(lastClosed.header);
-    LedgerTxn ltx2(mApp.getLedgerTxnRoot(), false,
-                   TransactionMode::READ_ONLY_WITHOUT_SQL_TXN);
+    LedgerTxn ltx2(mApp.getLedgerTxnRoot());
     if (protocolVersionStartsFrom(ltx2.loadHeader().current().ledgerVersion,
                                   SOROBAN_PROTOCOL_VERSION))
     {
@@ -1322,12 +1321,7 @@ LedgerManagerImpl::updateNetworkConfig(AbstractLedgerTxn& rootLtx)
 {
     ZoneScoped;
 
-    uint32_t ledgerVersion{};
-    {
-        LedgerTxn ltx(rootLtx, false,
-                      TransactionMode::READ_ONLY_WITHOUT_SQL_TXN);
-        ledgerVersion = ltx.loadHeader().current().ledgerVersion;
-    }
+    uint32_t ledgerVersion = rootLtx.loadHeader().current().ledgerVersion;
 
     if (protocolVersionStartsFrom(ledgerVersion, SOROBAN_PROTOCOL_VERSION))
     {

diff --git a/src/ledger/LedgerTxn.h b/src/ledger/LedgerTxn.h
@@ -262,6 +262,8 @@ enum class LedgerTxnConsistency
     EXTRA_DELETES
 };
 
+// NOTE: Remove READ_ONLY_WITHOUT_SQL_TXN mode when BucketListDB is required
+// and we stop supporting SQL backend for ledger state.
 enum class TransactionMode
 {
     READ_ONLY_WITHOUT_SQL_TXN,

diff --git a/src/ledger/NetworkConfig.cpp b/src/ledger/NetworkConfig.cpp
@@ -1177,7 +1177,7 @@ SorobanNetworkConfig::loadFromLedger(AbstractLedgerTxn& ltxRoot,
 {
     ZoneScoped;
 
-    LedgerTxn ltx(ltxRoot, false, TransactionMode::READ_ONLY_WITHOUT_SQL_TXN);
+    LedgerTxn ltx(ltxRoot);
     loadMaxContractSize(ltx);
     loadMaxContractDataKeySize(ltx);
     loadMaxContractDataEntrySize(ltx);