Remove SNTP code

Fixes: XRPLF#4207 Make SNTPClock a simple wrapper around abstract_clock<system_clock>
HowardHinnant · Aug 18, 2022 · 6c239bd · 6c239bd
1 parent e5275b8
commit 6c239bd
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 505 deletions.
diff --git a/cfg/rippled-example.cfg b/cfg/rippled-example.cfg
@@ -460,20 +460,6 @@
 #   place a space after the public key and then the name.
 #
 #
-#
-# [sntp_servers]
-#
-#   IP address or domain of NTP servers to use for time synchronization.
-#
-#   These NTP servers are suitable for rippled servers located in the United
-#   States:
-#      time.windows.com
-#      time.apple.com
-#      time.nist.gov
-#      pool.ntp.org
-#
-#
-#
 # [max_transactions]
 #
 #   Configure the maximum number of transactions to have in the job queue

diff --git a/cfg/rippled-reporting.cfg b/cfg/rippled-reporting.cfg
@@ -449,20 +449,6 @@
 #   place a space after the public key and then the name.
 #
 #
-#
-# [sntp_servers]
-#
-#   IP address or domain of NTP servers to use for time synchronization.
-#
-#   These NTP servers are suitable for rippled servers located in the United
-#   States:
-#      time.windows.com
-#      time.apple.com
-#      time.nist.gov
-#      pool.ntp.org
-#
-#
-#
 # [max_transactions]
 #
 #   Configure the maximum number of transactions to have in the job queue

diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp
@@ -1158,9 +1158,6 @@ ApplicationImp::setup()
     // Optionally turn off logging to console.
     logs_->silent(config_->silent());
 
-    if (!config_->standalone())
-        timeKeeper_->run(config_->SNTP_SERVERS);
-
     if (!initRelationalDatabase() || !initNodeStore())
         return false;
 

diff --git a/src/ripple/core/Config.h b/src/ripple/core/Config.h
@@ -125,9 +125,8 @@ class Config : public BasicConfig
     bool nodeToShard = false;
     bool ELB_SUPPORT = false;
 
-    std::vector<std::string> IPS;           // Peer IPs from rippled.cfg.
-    std::vector<std::string> IPS_FIXED;     // Fixed Peer IPs from rippled.cfg.
-    std::vector<std::string> SNTP_SERVERS;  // SNTP servers from rippled.cfg.
+    std::vector<std::string> IPS;        // Peer IPs from rippled.cfg.
+    std::vector<std::string> IPS_FIXED;  // Fixed Peer IPs from rippled.cfg.
 
     enum StartUpType { FRESH, NORMAL, LOAD, LOAD_FILE, REPLAY, NETWORK };
     StartUpType START_UP = NORMAL;

diff --git a/src/ripple/core/ConfigSections.h b/src/ripple/core/ConfigSections.h
@@ -81,7 +81,6 @@ struct ConfigSection
 #define SECTION_RELAY_VALIDATIONS "relay_validations"
 #define SECTION_RPC_STARTUP "rpc_startup"
 #define SECTION_SIGNING_SUPPORT "signing_support"
-#define SECTION_SNTP "sntp_servers"
 #define SECTION_SSL_VERIFY "ssl_verify"
 #define SECTION_SSL_VERIFY_FILE "ssl_verify_file"
 #define SECTION_SSL_VERIFY_DIR "ssl_verify_dir"

diff --git a/src/ripple/core/TimeKeeper.h b/src/ripple/core/TimeKeeper.h
@@ -34,14 +34,6 @@ class TimeKeeper : public beast::abstract_clock<NetClock>
 public:
     virtual ~TimeKeeper() = default;
 
-    /** Launch the internal thread.
-
-        The internal thread synchronizes local network time
-        using the provided list of SNTP servers.
-    */
-    virtual void
-    run(std::vector<std::string> const& servers) = 0;
-
     /** Returns the estimate of wall time, in network time.
 
         The network time is wall time adjusted for the Ripple

diff --git a/src/ripple/core/impl/Config.cpp b/src/ripple/core/impl/Config.cpp
@@ -466,9 +466,6 @@ Config::loadFromString(std::string const& fileContents)
     if (auto s = getIniFileSection(secConfig, SECTION_IPS_FIXED))
         IPS_FIXED = *s;
 
-    if (auto s = getIniFileSection(secConfig, SECTION_SNTP))
-        SNTP_SERVERS = *s;
-
     {
         std::string dbPath;
         if (getSingleSection(secConfig, "database_path", dbPath, j_))