From 780cfa4ee8faf4c2662f3c739e8a5c9f1c8a1826 Mon Sep 17 00:00:00 2001
From: Determinant <tederminant@gmail.com>
Date: Wed, 18 Jul 2018 14:34:43 -0400
Subject: move parent selection to PaceMaker

---
 src/hotstuff.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/hotstuff.cpp')

diff --git a/src/hotstuff.cpp b/src/hotstuff.cpp
index f4454d4..d0b42c3 100644
--- a/src/hotstuff.cpp
+++ b/src/hotstuff.cpp
@@ -84,7 +84,7 @@ ReplicaID HotStuffBase::add_command(command_t cmd) {
             cmd_pending.pop();
         }
         pmaker->beat().then([this, cmds = std::move(cmds)]() {
-            on_propose(cmds);
+            on_propose(cmds, pmaker->get_parents());
         });
     }
     return proposer;
@@ -383,13 +383,12 @@ promise_t HotStuffBase::async_decide(const uint256_t &cmd_hash) {
 }
 
 HotStuffBase::HotStuffBase(uint32_t blk_size,
-                    int32_t parent_limit,
                     ReplicaID rid,
                     privkey_bt &&priv_key,
                     NetAddr listen_addr,
-                    EventContext eb,
-                    pacemaker_bt pmaker):
-        HotStuffCore(rid, std::move(priv_key), parent_limit),
+                    pacemaker_bt pmaker,
+                    EventContext eb):
+        HotStuffCore(rid, std::move(priv_key)),
         listen_addr(listen_addr),
         blk_size(blk_size),
         eb(eb),
-- 
cgit v1.2.3-70-g09d2