From 780cfa4ee8faf4c2662f3c739e8a5c9f1c8a1826 Mon Sep 17 00:00:00 2001 From: Determinant Date: Wed, 18 Jul 2018 14:34:43 -0400 Subject: move parent selection to PaceMaker --- include/hotstuff/hotstuff.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'include/hotstuff/hotstuff.h') diff --git a/include/hotstuff/hotstuff.h b/include/hotstuff/hotstuff.h index 9d1a8a8..0aa83de 100644 --- a/include/hotstuff/hotstuff.h +++ b/include/hotstuff/hotstuff.h @@ -157,12 +157,11 @@ class HotStuffBase: public HotStuffCore { public: HotStuffBase(uint32_t blk_size, - int32_t parent_limit, ReplicaID rid, privkey_bt &&priv_key, NetAddr listen_addr, - EventContext eb, - pacemaker_bt pmaker); + pacemaker_bt pmaker, + EventContext eb); ~HotStuffBase(); @@ -220,19 +219,17 @@ class HotStuff: public HotStuffBase { public: HotStuff(uint32_t blk_size, - int32_t parent_limit, ReplicaID rid, const bytearray_t &raw_privkey, NetAddr listen_addr, - EventContext eb = EventContext(), - pacemaker_bt pmaker = new PaceMakerDummy()): + pacemaker_bt pmaker, + EventContext eb = EventContext()): HotStuffBase(blk_size, - parent_limit, rid, new PrivKeyType(raw_privkey), listen_addr, - eb, - std::move(pmaker)) {} + std::move(pmaker), + eb) {} void add_replica(ReplicaID idx, const NetAddr &addr, const bytearray_t &pubkey_raw) { DataStream s(pubkey_raw); -- cgit v1.2.3