Merge pull request #885 from MonsieurNicolas/partialValidator

Partially validated slots, improved consensus tracking Reviewed-by: jedmccaleb
stellar · Oct 28, 2015 · 7325ecd · 7325ecd
2 parents a16dddc + da228f1
commit 7325ecd
Show file tree

Hide file tree

Showing 30 changed files with 356 additions and 223 deletions.
diff --git a/src/bucket/BucketTests.cpp b/src/bucket/BucketTests.cpp
@@ -814,7 +814,7 @@ TEST_CASE("bucket persistence over app restart", "[bucket][bucketpersist]")
     // pick up the bucket list correctly.
     cfg1.FORCE_SCP = false;
     {
-        Application::pointer app = Application::create(clock, cfg1,false);
+        Application::pointer app = Application::create(clock, cfg1, false);
         app->start();
         BucketList& bl = app->getBucketManager().getBucketList();
 

diff --git a/src/herder/Herder.cpp b/src/herder/Herder.cpp
@@ -9,6 +9,8 @@ std::chrono::seconds const Herder::MAX_SCP_TIMEOUT_SECONDS(240);
 std::chrono::seconds const Herder::CONSENSUS_STUCK_TIMEOUT_SECONDS(35);
 std::chrono::seconds const Herder::MAX_TIME_SLIP_SECONDS(60);
 std::chrono::seconds const Herder::NODE_EXPIRATION_SECONDS(240);
-uint32 const Herder::LEDGER_VALIDITY_BRACKET = 1000;
+// the value of LEDGER_VALIDITY_BRACKET should be in the order of
+// how many ledgers can close ahead given CONSENSUS_STUCK_TIMEOUT_SECONDS
+uint32 const Herder::LEDGER_VALIDITY_BRACKET = 100;
 uint32 const Herder::MAX_SLOTS_TO_REMEMBER = 4;
 }
diff --git a/src/herder/Herder.h b/src/herder/Herder.h
@@ -81,13 +81,14 @@ class Herder
     // restores SCP state based on the last messages saved on disk
     virtual void restoreSCPState() = 0;
 
-    virtual void recvSCPQuorumSet(Hash hash, SCPQuorumSet const& qset) = 0;
-    virtual void recvTxSet(Hash hash, TxSetFrame const& txset) = 0;
+    virtual void recvSCPQuorumSet(Hash const& hash,
+                                  SCPQuorumSet const& qset) = 0;
+    virtual void recvTxSet(Hash const& hash, TxSetFrame const& txset) = 0;
     // We are learning about a new transaction.
     virtual TransactionSubmitStatus recvTransaction(TransactionFramePtr tx) = 0;
     virtual void peerDoesntHave(stellar::MessageType type,
                                 uint256 const& itemID, PeerPtr peer) = 0;
-    virtual TxSetFramePtr getTxSet(Hash hash) = 0;
+    virtual TxSetFramePtr getTxSet(Hash const& hash) = 0;
     virtual SCPQuorumSetPtr getQSet(Hash const& qSetHash) = 0;
 
     // We are learning about a new envelope.