increase maximim nesting level to allow for HIGH -> LOW validators

src/scp/QuorumSetUtils.cpp

@@ -46,7 +46,7 @@ QuorumSetSanityChecker::QuorumSetSanityChecker(SCPQuorumSet const& qSet,
 bool
 QuorumSetSanityChecker::checkSanity(SCPQuorumSet const& qSet, int depth)
 {
-    if (depth > 2)
+    if (depth > 3)
         return false;
 
     if (qSet.threshold < 1)

src/scp/test/QuorumSetTests.cpp

@@ -151,49 +151,46 @@ TEST_CASE("sane quorum set", "[scp][quorumset]")
         check(containingSet, true, validMultipleNodesNormalized);
     }
 
-    SECTION("{ t: 1, v0, { t: 1, v1, { t: 1, v2 } } } -> { t: 1, v0, { t: 1, "
-            "v1, v2 } }")
+    SECTION("{ t: 1, v0, { t: 1, v1, { t: 1, v2 , {t: 1, v3} } } } -> { t: 1, "
+            "v0, { t: 1, "
+            "v1, { t:1, v2, v3} } }")
     {
         auto qSet = makeSingleton(keys[0]);
         auto qSet1 = makeSingleton(keys[1]);
         auto qSet2 = makeSingleton(keys[2]);
+        auto qSet3 = makeSingleton(keys[3]);
+        qSet2.innerSets.push_back(qSet3);
         qSet1.innerSets.push_back(qSet2);
         qSet.innerSets.push_back(qSet1);
 
-        auto qSelfSet = SCPQuorumSet{};
-        qSelfSet.threshold = 1;
-        qSelfSet.validators.push_back(keys[0]);
-        qSelfSet.innerSets.push_back({});
-        qSelfSet.innerSets.back().threshold = 1;
-        qSelfSet.innerSets.back().validators.push_back(keys[1]);
-        qSelfSet.innerSets.back().validators.push_back(keys[2]);
+        // normalized: v3 gets moved next to v2
+        auto qSelfSet = qSet;
+        auto& qSet2b = qSelfSet.innerSets.back().innerSets.back();
+        qSet2b.validators.emplace_back(keys[3]);
+        qSet2b.innerSets.clear();
 
         check(qSet, true, qSelfSet);
     }
 
-    SECTION(
-        "{ t: 1, v0, { t: 1, v1, { t: 1, v2, { t: 1, v3 } } } } -> too deep")
+    SECTION("{ t: 1, v0, { t: 1, v1, { t: 1, v2, { t: 1, v3 , { t: 1, v4} } } "
+            "} } -> too deep")
     {
         auto qSet = makeSingleton(keys[0]);
         auto qSet1 = makeSingleton(keys[1]);
         auto qSet2 = makeSingleton(keys[2]);
         auto qSet3 = makeSingleton(keys[3]);
+        auto qSet4 = makeSingleton(keys[4]);
+        qSet3.innerSets.push_back(qSet4);
         qSet2.innerSets.push_back(qSet3);
         qSet1.innerSets.push_back(qSet2);
         qSet.innerSets.push_back(qSet1);
 
-        auto qSelfSet = SCPQuorumSet{};
-        qSelfSet.threshold = 1;
-        qSelfSet.validators.push_back(keys[0]);
-        qSelfSet.innerSets.push_back({});
-        qSelfSet.innerSets.back().threshold = 1;
-        qSelfSet.innerSets.back().validators.push_back(keys[1]);
-        qSelfSet.innerSets.back().innerSets.push_back({});
-        qSelfSet.innerSets.back().innerSets.back().threshold = 1;
-        qSelfSet.innerSets.back().innerSets.back().validators.push_back(
-            keys[2]);
-        qSelfSet.innerSets.back().innerSets.back().validators.push_back(
-            keys[3]);
+        // normalized: v4 gets moved next to v3
+        auto qSelfSet = qSet;
+        auto& qSet3b =
+            qSelfSet.innerSets.back().innerSets.back().innerSets.back();
+        qSet3b.validators.emplace_back(keys[4]);
+        qSet3b.innerSets.clear();
 
         check(qSet, false, qSelfSet);
     }