Make quorum unreachable if validator list expires (RIPD-1539)

XRPLF · Oct 23, 2017 · b7aa316 · b7aa316
1 parent cafe18c
commit b7aa316
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/src/ripple/app/misc/ValidatorList.h b/src/ripple/app/misc/ValidatorList.h
@@ -377,7 +377,8 @@ ValidatorList::onConsensusStart (
                 list.second.expiration <=
                 timeKeeper_.now().time_since_epoch().count())
             removePublisherList (list.first);
-        else if (! list.second.available)
+
+        if (! list.second.available)
             allListsAvailable = false;
     }
 

diff --git a/src/ripple/app/misc/impl/ValidatorList.cpp b/src/ripple/app/misc/impl/ValidatorList.cpp
@@ -235,7 +235,7 @@ ValidatorList::applyList (
             (iOld != oldList.end () && *iOld < *iNew))
         {
             // Decrement list count for removed keys
-            if (keyListings_[*iOld] == 1)
+            if (keyListings_[*iOld] <= 1)
                 keyListings_.erase (*iOld);
             else
                 --keyListings_[*iOld];
@@ -395,6 +395,9 @@ ValidatorList::removePublisherList (PublicKey const& publisherKey)
             --iVal->second;
     }
 
+    iList->second.list.clear();
+    iList->second.available = false;
+
     return true;
 }
 

diff --git a/src/test/app/ValidatorList_test.cpp b/src/test/app/ValidatorList_test.cpp
@@ -723,10 +723,9 @@ class ValidatorList_test : public beast::unit_test::suite
             BEAST_EXPECT(trustedKeys->load (
                 emptyLocalKey, emptyCfgKeys, cfgKeys));
 
-            std::vector<PublicKey> list ({randomNode()});
-            hash_set<PublicKey> activeValidators ({ list[0] });
+            std::vector<PublicKey> list ({randomNode(), randomNode()});
+            hash_set<PublicKey> activeValidators ({ list[0], list[1] });
 
-            // do not apply expired list
             auto const version = 1;
             auto const sequence = 1;
             NetClock::time_point const expiration =
@@ -741,10 +740,35 @@ class ValidatorList_test : public beast::unit_test::suite
 
             trustedKeys->onConsensusStart (activeValidators);
             BEAST_EXPECT(trustedKeys->trusted (list[0]));
+            BEAST_EXPECT(trustedKeys->trusted (list[1]));
+            BEAST_EXPECT(trustedKeys->quorum () == 2);
 
             env.timeKeeper().set(expiration);
             trustedKeys->onConsensusStart (activeValidators);
             BEAST_EXPECT(! trustedKeys->trusted (list[0]));
+            BEAST_EXPECT(! trustedKeys->trusted (list[1]));
+            BEAST_EXPECT(trustedKeys->quorum () ==
+                std::numeric_limits<std::size_t>::max());
+
+            // (Re)trust validators from new valid list
+            std::vector<PublicKey> list2 ({list[0], randomNode()});
+            activeValidators.insert(list2[1]);
+            auto const sequence2 = 2;
+            NetClock::time_point const expiration2 =
+                env.timeKeeper().now() + 60s;
+            auto const blob2 = makeList (
+                list2, sequence2, expiration2.time_since_epoch().count());
+            auto const sig2 = signList (blob2, pubSigningKeys);
+
+            BEAST_EXPECT(ListDisposition::accepted ==
+                trustedKeys->applyList (
+                    manifest, blob2, sig2, version));
+
+            trustedKeys->onConsensusStart (activeValidators);
+            BEAST_EXPECT(trustedKeys->trusted (list[0]));
+            BEAST_EXPECT(trustedKeys->trusted (list2[1]));
+            BEAST_EXPECT(! trustedKeys->trusted (list[1]));
+            BEAST_EXPECT(trustedKeys->quorum () == 2);
         }
         {
             // Test 1-9 configured validators