Move to clang-format-16 (#908)

Fixes #848

src/etl/LoadBalancer.cpp

@@ -47,7 +47,8 @@ LoadBalancer::make_Source(
     std::shared_ptr<BackendInterface> backend,
     std::shared_ptr<feed::SubscriptionManager> subscriptions,
     std::shared_ptr<NetworkValidatedLedgers> validatedLedgers,
-    LoadBalancer& balancer)
+    LoadBalancer& balancer
+)
 {
     auto src = std::make_unique<ProbingSource>(config, ioc, backend, subscriptions, validatedLedgers, balancer);
     src->run();
@@ -61,7 +62,8 @@ LoadBalancer::make_LoadBalancer(
     boost::asio::io_context& ioc,
     std::shared_ptr<BackendInterface> backend,
     std::shared_ptr<feed::SubscriptionManager> subscriptions,
-    std::shared_ptr<NetworkValidatedLedgers> validatedLedgers)
+    std::shared_ptr<NetworkValidatedLedgers> validatedLedgers
+)
 {
     return std::make_shared<LoadBalancer>(config, ioc, backend, subscriptions, validatedLedgers);
 }
@@ -71,34 +73,29 @@ LoadBalancer::LoadBalancer(
     boost::asio::io_context& ioc,
     std::shared_ptr<BackendInterface> backend,
     std::shared_ptr<feed::SubscriptionManager> subscriptions,
-    std::shared_ptr<NetworkValidatedLedgers> validatedLedgers)
+    std::shared_ptr<NetworkValidatedLedgers> validatedLedgers
+)
 {
     static constexpr std::uint32_t MAX_DOWNLOAD = 256;
-    if (auto value = config.maybeValue<uint32_t>("num_markers"); value)
-    {
+    if (auto value = config.maybeValue<uint32_t>("num_markers"); value) {
         downloadRanges_ = std::clamp(*value, 1u, MAX_DOWNLOAD);
-    }
-    else if (backend->fetchLedgerRange())
-    {
+    } else if (backend->fetchLedgerRange()) {
         downloadRanges_ = 4;
     }
 
-    for (auto const& entry : config.array("etl_sources"))
-    {
+    for (auto const& entry : config.array("etl_sources")) {
         std::unique_ptr<Source> source = make_Source(entry, ioc, backend, subscriptions, validatedLedgers, *this);
 
         // checking etl node validity
         auto const state = ETLState::fetchETLStateFromSource(*source);
 
-        if (!state.networkID)
-        {
+        if (!state.networkID) {
             LOG(log_.error()) << "Failed to fetch ETL state from source = " << source->toString()
                               << " Please check the configuration and network";
             throw std::logic_error("ETL node not available");
         }
 
-        if (etlState_ && etlState_->networkID != state.networkID)
-        {
+        if (etlState_ && etlState_->networkID != state.networkID) {
             LOG(log_.error()) << "ETL sources must be on the same network. "
                               << "Source network id = " << *(state.networkID)
                               << " does not match others network id = " << *(etlState_->networkID);
@@ -109,8 +106,7 @@ LoadBalancer::LoadBalancer(
         LOG(log_.info()) << "Added etl source - " << sources_.back()->toString();
     }
 
-    if (sources_.empty())
-    {
+    if (sources_.empty()) {
         LOG(log_.error()) << "No ETL sources configured. Please check the configuration";
         throw std::logic_error("No ETL sources configured");
     }
@@ -129,19 +125,17 @@ LoadBalancer::loadInitialLedger(uint32_t sequence, bool cacheOnly)
         [this, &response, &sequence, cacheOnly](auto& source) {
             auto [data, res] = source->loadInitialLedger(sequence, downloadRanges_, cacheOnly);
 
-            if (!res)
-            {
+            if (!res) {
                 LOG(log_.error()) << "Failed to download initial ledger."
                                   << " Sequence = " << sequence << " source = " << source->toString();
-            }
-            else
-            {
+            } else {
                 response = std::move(data);
             }
 
             return res;
         },
-        sequence);
+        sequence
+    );
     return {std::move(response), success};
 }
 
@@ -153,8 +147,7 @@ LoadBalancer::fetchLedger(uint32_t ledgerSequence, bool getObjects, bool getObje
         [&response, ledgerSequence, getObjects, getObjectNeighbors, log = log_](auto& source) {
             auto [status, data] = source->fetchLedger(ledgerSequence, getObjects, getObjectNeighbors);
             response = std::move(data);
-            if (status.ok() && response.validated())
-            {
+            if (status.ok() && response.validated()) {
                 LOG(log.info()) << "Successfully fetched ledger = " << ledgerSequence
                                 << " from source = " << source->toString();
                 return true;
@@ -165,9 +158,9 @@ LoadBalancer::fetchLedger(uint32_t ledgerSequence, bool getObjects, bool getObje
                             << ", source = " << source->toString();
             return false;
         },
-        ledgerSequence);
-    if (success)
-    {
+        ledgerSequence
+    );
+    if (success) {
         return response;
     }
     return {};
@@ -177,14 +170,14 @@ std::optional<boost::json::object>
 LoadBalancer::forwardToRippled(
     boost::json::object const& request,
     std::optional<std::string> const& clientIp,
-    boost::asio::yield_context yield) const
+    boost::asio::yield_context yield
+) const
 {
     srand(static_cast<unsigned>(time(0)));
     auto sourceIdx = rand() % sources_.size();
     auto numAttempts = 0u;
 
-    while (numAttempts < sources_.size())
-    {
+    while (numAttempts < sources_.size()) {
         if (auto res = sources_[sourceIdx]->forwardToRippled(request, clientIp, yield))
             return res;
 
@@ -198,8 +191,7 @@ LoadBalancer::forwardToRippled(
 bool
 LoadBalancer::shouldPropagateTxnStream(Source* in) const
 {
-    for (auto& src : sources_)
-    {
+    for (auto& src : sources_) {
         assert(src);
 
         // We pick the first Source encountered that is connected
@@ -229,8 +221,7 @@ LoadBalancer::execute(Func f, uint32_t ledgerSequence)
     auto sourceIdx = rand() % sources_.size();
     auto numAttempts = 0;
 
-    while (true)
-    {
+    while (true) {
         auto& source = sources_[sourceIdx];
 
         LOG(log_.debug()) << "Attempting to execute func. ledger sequence = " << ledgerSequence
@@ -239,11 +230,9 @@ LoadBalancer::execute(Func f, uint32_t ledgerSequence)
         /* Sometimes rippled has ledger but doesn't actually know. However,
         but this does NOT happen in the normal case and is safe to remove
         This || true is only needed when loading full history standalone */
-        if (source->hasLedger(ledgerSequence))
-        {
+        if (source->hasLedger(ledgerSequence)) {
             bool const res = f(source);
-            if (res)
-            {
+            if (res) {
                 LOG(log_.debug()) << "Successfully executed func at source = " << source->toString()
                                   << " - ledger sequence = " << ledgerSequence;
                 break;
@@ -251,16 +240,13 @@ LoadBalancer::execute(Func f, uint32_t ledgerSequence)
 
             LOG(log_.warn()) << "Failed to execute func at source = " << source->toString()
                              << " - ledger sequence = " << ledgerSequence;
-        }
-        else
-        {
+        } else {
             LOG(log_.warn()) << "Ledger not present at source = " << source->toString()
                              << " - ledger sequence = " << ledgerSequence;
         }
         sourceIdx = (sourceIdx + 1) % sources_.size();
         numAttempts++;
-        if (numAttempts % sources_.size() == 0)
-        {
+        if (numAttempts % sources_.size() == 0) {
             LOG(log_.info()) << "Ledger sequence " << ledgerSequence
                              << " is not yet available from any configured sources. "
                              << "Sleeping and trying again";