From 086e37788e16ddf62c0676a223002a3ea1b6d2e0 Mon Sep 17 00:00:00 2001 From: Determinant Date: Fri, 3 Aug 2018 20:14:42 -0400 Subject: ... --- include/hotstuff/entity.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'include/hotstuff/entity.h') diff --git a/include/hotstuff/entity.h b/include/hotstuff/entity.h index dc77c81..ce7d9bf 100644 --- a/include/hotstuff/entity.h +++ b/include/hotstuff/entity.h @@ -102,14 +102,12 @@ get_hashes(const std::vector &plist) { return std::move(hashes); } -using serializable_bt = BoxObj; - class Block { friend HotStuffCore; std::vector parent_hashes; std::vector cmds; quorum_cert_bt qc; - serializable_bt extra; + bytearray_t extra; /* the following fields can be derived from above */ uint256_t hash; @@ -125,14 +123,12 @@ class Block { public: Block(): qc(nullptr), - extra(nullptr), qc_ref(nullptr), self_qc(nullptr), height(0), delivered(false), decision(0) {} Block(bool delivered, int8_t decision): qc(nullptr), - extra(nullptr), hash(salticidae::get_hash(*this)), qc_ref(nullptr), self_qc(nullptr), height(0), @@ -141,7 +137,7 @@ class Block { Block(const std::vector &parents, const std::vector &cmds, quorum_cert_bt &&qc, - serializable_bt &&extra, + bytearray_t &&extra, uint32_t height, const block_t &qc_ref, quorum_cert_bt &&self_qc, @@ -193,7 +189,7 @@ class Block { const block_t &get_qc_ref() const { return qc_ref; } - const serializable_bt &get_extra() const { return extra; } + const bytearray_t &get_extra() const { return extra; } operator std::string () const { DataStream s; -- cgit v1.2.3-70-g09d2