bug/SKALE-3751-enable-zeromq

BLSSignReqMessage.cpp

@@ -7,8 +7,8 @@
 
 
 Json::Value BLSSignReqMessage::process() {
-    auto keyName = getStringRapid("kn");
-    auto hash = getStringRapid("mh");
+    auto keyName = getStringRapid("keyShareName");
+    auto hash = getStringRapid("messageHash");
     auto t = getUint64Rapid("t");
     auto n = getUint64Rapid("n");
     auto result =  SGXWalletServer::blsSignMessageHashImpl(keyName, hash, t, n);

TestUtils.cpp

@@ -42,6 +42,7 @@
 #include "SGXWalletServer.hpp"
 
 #include "catch.hpp"
+#include "ZMQClient.h"
 #include "BLSSigShare.h"
 #include "BLSSigShareSet.h"
 #include "BLSPublicKeyShare.h"
@@ -403,6 +404,9 @@ void TestUtils::sendRPCRequestZMQ() {
     HttpClient client(RPC_ENDPOINT);
     StubClient c(client, JSONRPC_CLIENT_V2);
 
+
+
+
     int n = 16, t = 16;
     Json::Value ethKeys[n];
     Json::Value verifVects[n];
@@ -775,7 +779,7 @@ void TestUtils::doDKGV2(StubClient &c, int n, int t,
 }
 
 
-void TestUtils::doZMQBLS(StubClient &c, int n, int t,
+void TestUtils::doZMQBLS(shared_ptr<ZMQClient> _zmqClient, StubClient &c, int n, int t,
                         vector<string>& _ecdsaKeyNames, vector<string>& _blsKeyNames,
                         int schainID, int dkgID) {
     Json::Value ethKeys[n];
@@ -894,10 +898,8 @@ void TestUtils::doZMQBLS(StubClient &c, int n, int t,
     for (int i = 0; i < t; i++) {
 
         string blsName = "BLS_KEY" + polyNames[i].substr(4);
-        blsSigShares[i] = c.blsSignMessageHash(blsName, hash, t, n);
-        CHECK_STATE(blsSigShares[i]["status"] == 0);
-        shared_ptr<string> sig_share_ptr = make_shared<string>(blsSigShares[i]["signatureShare"].asString());
-        BLSSigShare sig(sig_share_ptr, i + 1, t, n);
+        auto sigShare =  make_shared<string>(_zmqClient->blsSignMessageHash(blsName, hash, t, n));
+        BLSSigShare sig(sigShare, i + 1, t, n);
         sigShareSet.addSigShare(make_shared<BLSSigShare>(sig));
 
         auto pubKey = pubKeyShares[i+1];

TestUtils.h

@@ -41,6 +41,7 @@
 #include <sgx_tcrypto.h>
 #include "stubclient.h"
 #include <jsonrpccpp/server/connectors/httpserver.h>
+#include "ZMQClient.h"
 #include "abstractstubserver.h"
 
 using namespace std;
@@ -82,7 +83,7 @@ public:
                                  vector<string>& _ecdsaKeyNames, vector<string>& _blsKeyNames,
                                  int schainID, int dkgID);
 
-    static void doZMQBLS(StubClient &c, int n, int t,
+    static void doZMQBLS(shared_ptr<ZMQClient> _zmqClient, StubClient &c, int n, int t,
                         vector<string>& _ecdsaKeyNames, vector<string>& _blsKeyNames,
                         int schainID, int dkgID);
 

ZMQMessage.cpp

@@ -60,6 +60,7 @@ shared_ptr <ZMQMessage> ZMQMessage::parse(const char* _msg,
 
     auto d = make_shared<rapidjson::Document>();
 
+    cerr << _msg << endl;
     d->Parse(_msg);
 
     CHECK_STATE(!d->HasParseError());