Simplification

XRPLF · May 23, 2024 · d87bcca · d87bcca
1 parent 063da61
commit d87bcca
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 29 deletions.
diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
@@ -1407,20 +1407,16 @@ ApplicationImp::setup(boost::program_options::variables_map const& cmdline)
             startGenesisLedger();
         }
         else if (
-            startUp == Config::LOAD ||  //
-            startUp == Config::LOAD_FILE || startUp == Config::REPLAY ||
-            startUp == Config::REPLAY_TRAP)
+            startUp == Config::LOAD || startUp == Config::LOAD_FILE ||
+            startUp == Config::REPLAY)
         {
             JLOG(m_journal.info()) << "Loading specified Ledger";
 
             if (!loadOldLedger(
                     config_->START_LEDGER,
-                    (startUp == Config::REPLAY ||
-                     startUp == Config::REPLAY_TRAP),
+                    startUp == Config::REPLAY,
                     startUp == Config::LOAD_FILE,
-                    (startUp == Config::REPLAY_TRAP
-                         ? std::optional<uint256>(config_->TRAP_TX_HASH)
-                         : std::nullopt)))
+                    config_->TRAP_TX_HASH))
             {
                 JLOG(m_journal.error())
                     << "The specified ledger could not be loaded.";

diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
@@ -683,13 +683,13 @@ run(int argc, char** argv)
         config->START_LEDGER = vm["ledger"].as<std::string>();
         if (vm.count("replay"))
         {
+            config->START_UP = Config::REPLAY;
             if (vm.count("trap_tx_hash"))
             {
                 uint256 tmp = {};
                 auto hash = vm["trap_tx_hash"].as<std::string>();
                 if (tmp.parseHex(hash))
                 {
-                    config->START_UP = Config::REPLAY_TRAP;
                     config->TRAP_TX_HASH = tmp;
                 }
                 else
@@ -700,8 +700,6 @@ run(int argc, char** argv)
                     return -1;
                 }
             }
-            else
-                config->START_UP = Config::REPLAY;
         }
         else
             config->START_UP = Config::LOAD;
@@ -726,8 +724,7 @@ run(int argc, char** argv)
     if (vm.count("net") && !config->FAST_LOAD)
     {
         if ((config->START_UP == Config::LOAD) ||
-            (config->START_UP == Config::REPLAY) ||
-            (config->START_UP == Config::REPLAY_TRAP))
+            (config->START_UP == Config::REPLAY))
         {
             std::cerr << "Net and load/replay options are incompatible"
                       << std::endl;

diff --git a/src/ripple/app/rdb/backend/detail/impl/Node.cpp b/src/ripple/app/rdb/backend/detail/impl/Node.cpp
@@ -85,11 +85,9 @@ makeLedgerDBs(
             boost::format("PRAGMA cache_size=-%d;") %
             kilobytes(config.getValueFor(SizedItem::txnDBCache)));
 
-        if (!setup.standAlone ||  //
-            setup.startUp == Config::LOAD ||
+        if (!setup.standAlone || setup.startUp == Config::LOAD ||
             setup.startUp == Config::LOAD_FILE ||
-            setup.startUp == Config::REPLAY ||
-            setup.startUp == Config::REPLAY_TRAP)
+            setup.startUp == Config::REPLAY)
         {
             // Check if AccountTransactions has primary key
             std::string cid, name, type;

diff --git a/src/ripple/core/Config.h b/src/ripple/core/Config.h
@@ -155,22 +155,14 @@ class Config : public BasicConfig
     // Entries from [ips_fixed] config stanza
     std::vector<std::string> IPS_FIXED;
 
-    enum StartUpType {
-        FRESH,
-        NORMAL,
-        LOAD,
-        LOAD_FILE,
-        REPLAY,
-        NETWORK,
-        REPLAY_TRAP
-    };
+    enum StartUpType { FRESH, NORMAL, LOAD, LOAD_FILE, REPLAY, NETWORK };
     StartUpType START_UP = NORMAL;
 
     bool START_VALID = false;
 
     std::string START_LEDGER;
 
-    uint256 TRAP_TX_HASH = {};
+    std::optional<uint256> TRAP_TX_HASH = {};
 
     // Network parameters
     uint32_t NETWORK_ID = 0;

diff --git a/src/ripple/core/DatabaseCon.h b/src/ripple/core/DatabaseCon.h
@@ -122,8 +122,7 @@ class DatabaseCon
                       !setup.reporting &&  //
                       setup.startUp != Config::LOAD &&
                       setup.startUp != Config::LOAD_FILE &&
-                      setup.startUp != Config::REPLAY &&
-                      setup.startUp != Config::REPLAY_TRAP
+                      setup.startUp != Config::REPLAY
                   ? ""
                   : (setup.dataDir / dbName),
               setup.commonPragma(),