fix: use extraShare flag to guard extra share info in CQuorumRotationInfo, don't use std::optional

Author: UdjinM6

src/llmq/snapshot.cpp

@@ -45,8 +45,8 @@ UniValue CQuorumRotationInfo::ToJson() const
     obj.pushKV("quorumSnapshotAtHMinus2C", quorumSnapshotAtHMinus2C.ToJson());
     obj.pushKV("quorumSnapshotAtHMinus3C", quorumSnapshotAtHMinus3C.ToJson());
 
-    if (extraShare && quorumSnapshotAtHMinus4C.has_value()) {
-        obj.pushKV("quorumSnapshotAtHMinus4C", quorumSnapshotAtHMinus4C->ToJson());
+    if (extraShare) {
+        obj.pushKV("quorumSnapshotAtHMinus4C", quorumSnapshotAtHMinus4C.ToJson());
     }
 
     obj.pushKV("mnListDiffTip", mnListDiffTip.ToJson());
@@ -55,8 +55,8 @@ UniValue CQuorumRotationInfo::ToJson() const
     obj.pushKV("mnListDiffAtHMinus2C", mnListDiffAtHMinus2C.ToJson());
     obj.pushKV("mnListDiffAtHMinus3C", mnListDiffAtHMinus3C.ToJson());
 
-    if (extraShare && mnListDiffAtHMinus4C.has_value()) {
-        obj.pushKV("mnListDiffAtHMinus4C", mnListDiffAtHMinus4C->ToJson());
+    if (extraShare) {
+        obj.pushKV("mnListDiffAtHMinus4C", mnListDiffAtHMinus4C.ToJson());
     }
     UniValue hqclists(UniValue::VARR);
     for (const auto& qc : lastCommitmentPerIndex) {
@@ -267,7 +267,7 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
             errorRet = strprintf("Can not find quorum snapshot at H-4C");
             return false;
         } else {
-            response.quorumSnapshotAtHMinus4C = std::move(snapshotHMinus4C);
+            response.quorumSnapshotAtHMinus4C = std::move(snapshotHMinus4C.value());
         }
 
         CSimplifiedMNListDiff mn4c;
@@ -283,8 +283,6 @@ bool BuildQuorumRotationInfo(CDeterministicMNManager& dmnman, CQuorumSnapshotMan
         response.mnListDiffAtHMinus4C = std::move(mn4c);
     } else {
         response.extraShare = false;
-        response.quorumSnapshotAtHMinus4C.reset();
-        response.mnListDiffAtHMinus4C.reset();
     }
 
     std::set<int> snapshotHeightsNeeded;

src/llmq/snapshot.h

@@ -116,8 +116,8 @@ class CQuorumRotationInfo
     CSimplifiedMNListDiff mnListDiffAtHMinus3C;
 
     bool extraShare{false};
-    std::optional<CQuorumSnapshot> quorumSnapshotAtHMinus4C;
-    std::optional<CSimplifiedMNListDiff> mnListDiffAtHMinus4C;
+    CQuorumSnapshot quorumSnapshotAtHMinus4C;
+    CSimplifiedMNListDiff mnListDiffAtHMinus4C;
 
     std::vector<llmq::CFinalCommitment> lastCommitmentPerIndex;
     std::vector<CQuorumSnapshot> quorumSnapshotList;
@@ -142,12 +142,9 @@ class CQuorumRotationInfo
     {
         const_cast<CQuorumRotationInfo*>(this)->SerializationOpBase(s, CSerActionSerialize());
 
-        if (extraShare && quorumSnapshotAtHMinus4C.has_value()) {
-            ::Serialize(s, quorumSnapshotAtHMinus4C.value());
-        }
-
-        if (extraShare && mnListDiffAtHMinus4C.has_value()) {
-            ::Serialize(s, mnListDiffAtHMinus4C.value());
+        if (extraShare) {
+            ::Serialize(s, quorumSnapshotAtHMinus4C);
+            ::Serialize(s, mnListDiffAtHMinus4C);
         }
 
         WriteCompactSize(s, lastCommitmentPerIndex.size());
@@ -171,12 +168,9 @@ class CQuorumRotationInfo
     {
         SerializationOpBase(s, CSerActionUnserialize());
 
-        if (extraShare && quorumSnapshotAtHMinus4C.has_value()) {
-            ::Unserialize(s, quorumSnapshotAtHMinus4C.value());
-        }
-
-        if (extraShare && mnListDiffAtHMinus4C.has_value()) {
-            ::Unserialize(s, mnListDiffAtHMinus4C.value());
+        if (extraShare) {
+            ::Unserialize(s, quorumSnapshotAtHMinus4C);
+            ::Unserialize(s, mnListDiffAtHMinus4C);
         }
 
         size_t cnt = ReadCompactSize(s);

src/test/llmq_snapshot_tests.cpp

@@ -162,8 +162,8 @@ BOOST_AUTO_TEST_CASE(quorum_rotation_info_construction_test)
 
     // Test default state
     BOOST_CHECK(!rotInfo.extraShare);
-    BOOST_CHECK(!rotInfo.quorumSnapshotAtHMinus4C.has_value());
-    BOOST_CHECK(!rotInfo.mnListDiffAtHMinus4C.has_value());
+    BOOST_CHECK_EQUAL(::SerializeHash(rotInfo.quorumSnapshotAtHMinus4C), ::SerializeHash(CQuorumSnapshot()));
+    BOOST_CHECK_EQUAL(::SerializeHash(rotInfo.mnListDiffAtHMinus4C), ::SerializeHash(CSimplifiedMNListDiff()));
     BOOST_CHECK(rotInfo.lastCommitmentPerIndex.empty());
     BOOST_CHECK(rotInfo.quorumSnapshotList.empty());
     BOOST_CHECK(rotInfo.mnListDiffList.empty());