bugfixes, use optional's value for clariry

stellar · Jul 5, 2023 · a2a114c · a2a114c · latobarita · Jul 5, 2023
1 parent 5c20260
commit a2a114c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/herder/HerderImpl.cpp b/src/herder/HerderImpl.cpp
@@ -2065,7 +2065,7 @@ HerderImpl::updateTransactionQueue(TxSetFrameConstPtr txSet)
                 txSet->getTxsForPhase(TxSetFrame::Phase::CLASSIC));
 #ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
     updateQueue(mSorobanTransactionQueue,
-                txSet->getTxsForPhase(TxSetFrame::Phase::CLASSIC));
+                txSet->getTxsForPhase(TxSetFrame::Phase::SOROBAN));
 #endif
 }
 

diff --git a/src/herder/TxSetFrame.cpp b/src/herder/TxSetFrame.cpp
@@ -705,12 +705,12 @@ TxSetFrame::size(LedgerHeader const& lh, std::optional<Phase> phase) const
 {
     size_t sz = 0;
 #ifdef ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
-    if (!phase && phase == Phase::SOROBAN)
+    if (!phase || phase.value() == Phase::SOROBAN)
     {
         sz += sizeOp(Phase::SOROBAN);
     }
 #endif
-    if (!phase || phase == Phase::CLASSIC)
+    if (!phase || phase.value() == Phase::CLASSIC)
     {
         sz += protocolVersionStartsFrom(lh.ledgerVersion, ProtocolVersion::V_11)
                   ? sizeOp(Phase::CLASSIC)