From a2a114cf51922c5ef472ccc3c762b85d506f809c Mon Sep 17 00:00:00 2001
From: marta-lokhova <marta@stellar.org>
Date: Wed, 5 Jul 2023 10:56:42 -0700
Subject: [PATCH] bugfixes, use optional's value for clariry

---
 src/herder/HerderImpl.cpp | 2 +-
 src/herder/TxSetFrame.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/herder/HerderImpl.cpp b/src/herder/HerderImpl.cpp
index 0344005acb..f0aee23053 100644
--- 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
index aa0d696c2a..189edff141 100644
--- 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)