From 23991c99c31ed93ee875a077c7b8312a3ee7f53d Mon Sep 17 00:00:00 2001
From: Ed Hennis <ed@ripple.com>
Date: Wed, 11 Sep 2024 11:29:06 +0100
Subject: [PATCH] test: Retry RPC commands to try to fix MacOS CI jobs (#5120)

* Retry some failed RPC connections / commands in unit tests
* Remove orphaned `getAccounts` function

Co-authored-by: John Freeman <jfreeman08@gmail.com>
---
 src/test/jtx/impl/Env.cpp         | 26 +++++++++++++++++---------
 src/xrpld/app/misc/NetworkOPs.cpp | 18 ------------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/test/jtx/impl/Env.cpp b/src/test/jtx/impl/Env.cpp
index 6f0f9e3fc7..ef5a2124e2 100644
--- a/src/test/jtx/impl/Env.cpp
+++ b/src/test/jtx/impl/Env.cpp
@@ -317,16 +317,24 @@ Env::submit(JTx const& jt)
     auto const jr = [&]() {
         if (jt.stx)
         {
-            txid_ = jt.stx->getTransactionID();
-            Serializer s;
-            jt.stx->add(s);
-            auto const jr = rpc("submit", strHex(s.slice()));
+            // We shouldn't need to retry, but it fixes the test on macOS for
+            // the moment.
+            int retries = 3;
+            do
+            {
+                txid_ = jt.stx->getTransactionID();
+                Serializer s;
+                jt.stx->add(s);
+                auto const jr = rpc("submit", strHex(s.slice()));
 
-            parsedResult = parseResult(jr);
-            test.expect(parsedResult.ter, "ter uninitialized!");
-            ter_ = parsedResult.ter.value_or(telENV_RPC_FAILED);
-
-            return jr;
+                parsedResult = parseResult(jr);
+                test.expect(parsedResult.ter, "ter uninitialized!");
+                ter_ = parsedResult.ter.value_or(telENV_RPC_FAILED);
+                if (ter_ != telENV_RPC_FAILED ||
+                    parsedResult.rpcCode != rpcINTERNAL ||
+                    jt.ter == telENV_RPC_FAILED || --retries <= 0)
+                    return jr;
+            } while (true);
         }
         else
         {
diff --git a/src/xrpld/app/misc/NetworkOPs.cpp b/src/xrpld/app/misc/NetworkOPs.cpp
index 01906d306c..02eb0435b5 100644
--- a/src/xrpld/app/misc/NetworkOPs.cpp
+++ b/src/xrpld/app/misc/NetworkOPs.cpp
@@ -2783,24 +2783,6 @@ NetworkOPsImp::pubProposedTransaction(
     pubProposedAccountTransaction(ledger, transaction, result);
 }
 
-static void
-getAccounts(Json::Value const& jvObj, std::vector<AccountID>& accounts)
-{
-    for (auto& jv : jvObj)
-    {
-        if (jv.isObject())
-        {
-            getAccounts(jv, accounts);
-        }
-        else if (jv.isString())
-        {
-            auto account = RPC::accountFromStringStrict(jv.asString());
-            if (account)
-                accounts.push_back(*account);
-        }
-    }
-}
-
 void
 NetworkOPsImp::pubLedger(std::shared_ptr<ReadView const> const& lpAccepted)
 {