From 70ab6576db5e49f7b2a38ea955e75328a6376812 Mon Sep 17 00:00:00 2001
From: Determinant <tederminant@gmail.com>
Date: Wed, 18 Jul 2018 20:15:28 -0400
Subject: improve network impl

---
 include/hotstuff/consensus.h |  2 +-
 include/hotstuff/liveness.h  | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/hotstuff/consensus.h b/include/hotstuff/consensus.h
index 73d47ef..1f1e6ea 100644
--- a/include/hotstuff/consensus.h
+++ b/include/hotstuff/consensus.h
@@ -31,7 +31,7 @@ class HotStuffCore {
     std::unordered_map<block_t, promise_t> qc_waiting;
     promise_t propose_waiting;
 
-    block_t sanity_check_delivered(const uint256_t &blk_hash);
+    block_t get_delivered_blk(const uint256_t &blk_hash);
     void sanity_check_delivered(const block_t &blk);
     void check_commit(const block_t &_bqc);
     bool update(const uint256_t &bqc_hash);
diff --git a/include/hotstuff/liveness.h b/include/hotstuff/liveness.h
index a51c032..a625f0d 100644
--- a/include/hotstuff/liveness.h
+++ b/include/hotstuff/liveness.h
@@ -11,12 +11,18 @@ class PaceMaker {
     HotStuffCore *hsc;
     public:
     virtual ~PaceMaker() = default;
+    /** Initialize the PaceMaker. A derived class should also call the
+     * default implementation to set `hsc`. */
     virtual void init(HotStuffCore *_hsc) { hsc = _hsc; }
     /** Get a promise resolved when the pace maker thinks it is a *good* time
      * to issue new commands. When promise is resolved, the replica should
      * propose the command. */
     virtual promise_t beat() = 0;
+    /** Get the current proposer. */
     virtual ReplicaID get_proposer() = 0;
+    /** Select the parent blocks for a new block.
+     * @return Parent blocks. The block at index 0 is the direct parent, while
+     * the others are uncles/aunts. The returned vector should be non-empty. */
     virtual std::vector<block_t> get_parents() = 0;
     /** Get a promise resolved when the pace maker thinks it is a *good* time
      * to vote for a block. The promise is resolved with the next proposer's ID
@@ -26,6 +32,10 @@ class PaceMaker {
 
 using pacemaker_bt = BoxObj<PaceMaker>;
 
+/** Parent selection implementation for PaceMaker: select all parents.
+ * PaceMakers derived from this class will select the highest block as the
+ * direct parent, while including other tail blocks (up to parent_limit) as
+ * uncles/aunts. */
 class PMAllParents: public virtual PaceMaker {
     const int32_t parent_limit;         /**< maximum number of parents */
     public:
@@ -50,6 +60,9 @@ class PMAllParents: public virtual PaceMaker {
     }
 };
 
+/** Beat implementation for PaceMaker: simply wait for the QC of last proposed
+ * block.  PaceMakers derived from this class will beat only when the last
+ * block proposed by itself gets its QC. */
 class PMWaitQC: public virtual PaceMaker {
     std::queue<promise_t> pending_beats;
     block_t last_proposed;
@@ -102,12 +115,13 @@ class PMWaitQC: public virtual PaceMaker {
     }
 };
 
-/** A pace maker that waits for the qc of the last proposed block. */
+/** Naive PaceMaker where everyone can be a proposer at any moment. */
 struct PaceMakerDummy: public PMAllParents, public PMWaitQC {
     PaceMakerDummy(int32_t parent_limit):
         PMAllParents(parent_limit), PMWaitQC() {}
 };
 
+/** PaceMakerDummy with a fixed proposer. */
 class PaceMakerDummyFixed: public PaceMakerDummy {
     ReplicaID proposer;
 
-- 
cgit v1.2.3