[Trivial] bls_worker: Fix members initialization order in Aggregators

Also fix review nits:

- replace hardware_concurrency() with GetNumCores()
- remove code duplication for (Async)VerifyContributionShare

Author: random-zebra

src/bls/bls_worker.cpp

@@ -6,6 +6,7 @@
 #include "bls/bls_worker.h"
 #include "hash.h"
 #include "serialize.h"
+#include "util/system.h"
 #include "util/threadnames.h"
 
 
@@ -61,7 +62,7 @@ CBLSWorker::~CBLSWorker()
 
 void CBLSWorker::Start()
 {
-    int workerCount = std::thread::hardware_concurrency() / 2;
+    int workerCount = GetNumCores() / 2;
     workerCount = std::max(std::min(1, workerCount), 4);
     workerPool.resize(workerCount);
 
@@ -86,7 +87,7 @@ bool CBLSWorker::GenerateContributions(int quorumThreshold, const BLSIdVector& i
     std::list<std::future<bool> > futures;
     size_t batchSize = 8;
 
-    for (size_t i = 0; i < quorumThreshold; i += batchSize) {
+    for (size_t i = 0; i < (size_t)quorumThreshold; i += batchSize) {
         size_t start = i;
         size_t count = std::min(batchSize, quorumThreshold - start);
         auto f = [&, start, count](int threadId) {
@@ -133,23 +134,23 @@ struct Aggregator {
     typedef T ElementType;
 
     size_t batchSize{16};
-    std::shared_ptr<std::vector<const T*> > inputVec;
-
-    bool parallel;
     ctpl::thread_pool& workerPool;
+    bool parallel;
+
+    std::shared_ptr<std::vector<const T*> > inputVec;
 
     std::mutex m;
     // items in the queue are all intermediate aggregation results of finished batches.
     // The intermediate results must be deleted by us again (which we do in SyncAggregateAndPushAggQueue)
     boost::lockfree::queue<T*> aggQueue;
     std::atomic<size_t> aggQueueSize{0};
 
-    // keeps track of currently queued/in-progress batches. If it reaches 0, we are done
-    std::atomic<size_t> waitCount{0};
-
     typedef std::function<void(const T& agg)> DoneCallback;
     DoneCallback doneCallback;
 
+    // keeps track of currently queued/in-progress batches. If it reaches 0, we are done
+    std::atomic<size_t> waitCount{0};
+
     // TP can either be a pointer or a reference
     template <typename TP>
     Aggregator(const std::vector<TP>& _inputVec,
@@ -338,14 +339,15 @@ struct VectorAggregator {
     typedef std::shared_ptr<VectorType> VectorPtrType;
     typedef std::vector<VectorPtrType> VectorVectorType;
     typedef std::function<void(const VectorPtrType& agg)> DoneCallback;
-    DoneCallback doneCallback;
 
     const VectorVectorType& vecs;
+    bool parallel;
     size_t start;
     size_t count;
-    bool parallel;
+
     ctpl::thread_pool& workerPool;
 
+    DoneCallback doneCallback;
     std::atomic<size_t> doneCount;
 
     VectorPtrType result;
@@ -764,13 +766,7 @@ std::future<bool> CBLSWorker::AsyncVerifyContributionShare(const CBLSId& forId,
     }
 
     auto f = [this, &forId, &vvec, &skContribution](int threadId) {
-        CBLSPublicKey pk1;
-        if (!pk1.PublicKeyShare(*vvec, forId)) {
-            return false;
-        }
-
-        CBLSPublicKey pk2 = skContribution.GetPublicKey();
-        return pk1 == pk2;
+         return VerifyContributionShare(forId, vvec, skContribution);
     };
     return workerPool.push(f);
 }