GH-376 Add constructor to simplify code

AntelopeIO · Jul 23, 2024 · ab607cc · ab607cc
1 parent 91bb585
commit ab607cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/libraries/chain/finality/qc.cpp b/libraries/chain/finality/qc.cpp
@@ -144,6 +144,12 @@ open_qc_sig_t::open_qc_sig_t(size_t num_finalizers, uint64_t quorum, uint64_t ma
    , strong_votes(num_finalizers) {
 }
 
+open_qc_sig_t::open_qc_sig_t(const finalizer_policy_ptr& finalizer_policy)
+   : open_qc_sig_t(finalizer_policy->finalizers.size(),
+                   finalizer_policy->threshold,
+                   finalizer_policy->max_weak_sum_before_weak_final()) {
+}
+
 bool open_qc_sig_t::is_quorum_met() const {
    std::lock_guard g(*_mtx);
    return is_quorum_met_no_lock();

diff --git a/libraries/chain/include/eosio/chain/finality/qc.hpp b/libraries/chain/include/eosio/chain/finality/qc.hpp
@@ -141,8 +141,8 @@ namespace eosio::chain {
       };
 
       open_qc_sig_t();
-
-      explicit open_qc_sig_t(size_t num_finalizers, uint64_t quorum, uint64_t max_weak_sum_before_weak_final);
+      open_qc_sig_t(size_t num_finalizers, uint64_t quorum, uint64_t max_weak_sum_before_weak_final);
+      explicit open_qc_sig_t(const finalizer_policy_ptr& finalizer_policy);
 
       bool is_quorum_met() const;
       static bool is_quorum_met(state_t s) {
@@ -215,15 +215,10 @@ namespace eosio::chain {
                 const finalizer_policy_ptr& pending_finalizer_policy)
          : active_finalizer_policy(active_finalizer_policy)
          , pending_finalizer_policy(pending_finalizer_policy)
-         , active_policy_sig{open_qc_sig_t{active_finalizer_policy->finalizers.size(),
-                                              active_finalizer_policy->threshold,
-                                              active_finalizer_policy->max_weak_sum_before_weak_final()}}
+         , active_policy_sig{active_finalizer_policy}
          , pending_policy_sig{!pending_finalizer_policy
                                  ? std::optional<open_qc_sig_t>{}
-                                 : std::optional<open_qc_sig_t>{std::in_place,
-                                                                   pending_finalizer_policy->finalizers.size(),
-                                                                   pending_finalizer_policy->threshold,
-                                                                   pending_finalizer_policy->max_weak_sum_before_weak_final()}}
+                                 : std::optional<open_qc_sig_t>{pending_finalizer_policy}}
       {}
 
       open_qc_t() = default;