Attempt to future-proof the tie breaking test

XRPLF · Feb 25, 2022 · fdfa7c9 · fdfa7c9
1 parent edcac31
commit fdfa7c9
Show file tree

Hide file tree

Showing 5 changed files with 178 additions and 59 deletions.
diff --git a/src/ripple/app/misc/TxQ.h b/src/ripple/app/misc/TxQ.h
@@ -340,7 +340,7 @@ class TxQ
         in the queue.
     */
     std::vector<TxDetails>
-    getAccountTxs(AccountID const& account, ReadView const& view) const;
+    getAccountTxs(AccountID const& account) const;
 
     /** Returns information about all transactions currently
         in the queue.
@@ -349,7 +349,7 @@ class TxQ
         in the queue.
     */
     std::vector<TxDetails>
-    getTxs(ReadView const& view) const;
+    getTxs() const;
 
     /** Summarize current fee metrics for the `fee` RPC command.
 

diff --git a/src/ripple/app/misc/impl/TxQ.cpp b/src/ripple/app/misc/impl/TxQ.cpp
@@ -1740,7 +1740,7 @@ TxQ::getTxRequiredFeeAndSeq(
 }
 
 std::vector<TxQ::TxDetails>
-TxQ::getAccountTxs(AccountID const& account, ReadView const& view) const
+TxQ::getAccountTxs(AccountID const& account) const
 {
     std::vector<TxDetails> result;
 
@@ -1761,7 +1761,7 @@ TxQ::getAccountTxs(AccountID const& account, ReadView const& view) const
 }
 
 std::vector<TxQ::TxDetails>
-TxQ::getTxs(ReadView const& view) const
+TxQ::getTxs() const
 {
     std::vector<TxDetails> result;
 

diff --git a/src/ripple/rpc/handlers/AccountInfo.cpp b/src/ripple/rpc/handlers/AccountInfo.cpp
@@ -128,8 +128,7 @@ doAccountInfo(RPC::JsonContext& context)
         {
             Json::Value jvQueueData = Json::objectValue;
 
-            auto const txs =
-                context.app.getTxQ().getAccountTxs(accountID, *ledger);
+            auto const txs = context.app.getTxQ().getAccountTxs(accountID);
             if (!txs.empty())
             {
                 jvQueueData[jss::txn_count] =
@@ -298,7 +297,7 @@ doAccountInfoGrpc(
                 return {result, errorStatus};
             }
             std::vector<TxQ::TxDetails> const txs =
-                context.app.getTxQ().getAccountTxs(accountID, *ledger);
+                context.app.getTxQ().getAccountTxs(accountID);
             org::xrpl::rpc::v1::QueueData& queueData =
                 *result.mutable_queue_data();
             RPC::convert(queueData, txs);

diff --git a/src/ripple/rpc/handlers/LedgerHandler.cpp b/src/ripple/rpc/handlers/LedgerHandler.cpp
@@ -94,7 +94,7 @@ LedgerHandler::check()
             return rpcINVALID_PARAMS;
         }
 
-        queueTxs_ = context_.app.getTxQ().getTxs(*ledger_);
+        queueTxs_ = context_.app.getTxQ().getTxs();
     }
 
     return Status::OK;