remove feebump special case

stellar · Nov 20, 2024 · a30ae35 · a30ae35
1 parent e7e7b96
commit a30ae35
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/ledger/LedgerManagerImpl.cpp b/src/ledger/LedgerManagerImpl.cpp
@@ -1388,19 +1388,20 @@ LedgerManagerImpl::processFeesSeqNums(
                               tx->getContentsHash());
                 auto expectedResultCode =
                     (*expectedResultsIter)->result.result.code();
-                if (expectedResultCode == TransactionResultCode::txSUCCESS ||
-                    expectedResultCode ==
-                        TransactionResultCode::txFEE_BUMP_INNER_SUCCESS)
+                if (expectedResultCode == TransactionResultCode::txSUCCESS)
                 {
-                    CLOG_DEBUG(Tx, "Replaying successful transaction: tx {}",
+                    CLOG_DEBUG(Tx,
+                               "Skipping signature verification successful "
+                               "transaction: tx {}",
                                binToHex(tx->getContentsHash()));
                     txResults.back()->setReplaySuccessfulTransactionResult(
                         (*expectedResultsIter)->result);
                 }
                 else
                 {
                     CLOG_DEBUG(Tx,
-                               "Skipping replay of failing transaction: tx {}",
+                               "Skipping replay and signature verification of "
+                               "failing transaction: tx {}",
                                binToHex(tx->getContentsHash()));
                     txResults.back()->setReplayFailingTransactionResult(
                         (*expectedResultsIter)->result);

diff --git a/src/transactions/MutableTransactionResult.cpp b/src/transactions/MutableTransactionResult.cpp
@@ -477,26 +477,26 @@ void
 FeeBumpMutableTransactionResult::setReplaySuccessfulTransactionResult(
     TransactionResult const& successful)
 {
-    mInnerTxResult->setReplaySuccessfulTransactionResult(successful);
+    /* NO-OP */
 }
 
 void
 FeeBumpMutableTransactionResult::setReplayFailingTransactionResult(
     TransactionResult const& failing)
 {
-    mInnerTxResult->setReplayFailingTransactionResult(failing);
+    /* NO-OP */
 }
 
 std::optional<TransactionResult> const&
 FeeBumpMutableTransactionResult::getReplaySuccessfulTransactionResult() const
 {
-    return mInnerTxResult->getReplaySuccessfulTransactionResult();
+    return mReplaySuccessfulTransactionResult;
 }
 
 std::optional<TransactionResult> const&
 FeeBumpMutableTransactionResult::getReplayFailingTransactionResult() const
 {
-    return mInnerTxResult->getReplayFailingTransactionResult();
+    return mReplayFailingTransactionResult;
 }
 
 }