Unverified Commit dcd5da17 authored by svetaro's avatar svetaro

change naming

parent 325db7d6
...@@ -466,7 +466,7 @@ Json::Value getVerificationVectorImpl(const string& polyName, int t, int n) { ...@@ -466,7 +466,7 @@ Json::Value getVerificationVectorImpl(const string& polyName, int t, int n) {
for ( int i = 0; i < t; i++){ for ( int i = 0; i < t; i++){
vector<string> cur_coef = verifVector.at(i); vector<string> cur_coef = verifVector.at(i);
for ( int j = 0; j < 4; j++ ){ for ( int j = 0; j < 4; j++ ){
result["Verification Vector"][i][j] = cur_coef.at(j); result["verificationVector"][i][j] = cur_coef.at(j);
} }
} }
...@@ -474,7 +474,7 @@ Json::Value getVerificationVectorImpl(const string& polyName, int t, int n) { ...@@ -474,7 +474,7 @@ Json::Value getVerificationVectorImpl(const string& polyName, int t, int n) {
cerr << " err str " << _e.errString << endl; cerr << " err str " << _e.errString << endl;
result["status"] = _e.status; result["status"] = _e.status;
result["errorMessage"] = _e.errString; result["errorMessage"] = _e.errString;
result["Verification Vector"] = ""; result["verificationVector"] = "";
} }
return result; return result;
...@@ -640,7 +640,7 @@ Json::Value getBLSPublicKeyShareImpl(const string & blsKeyName){ ...@@ -640,7 +640,7 @@ Json::Value getBLSPublicKeyShareImpl(const string & blsKeyName){
} }
vector<string> public_key_vect = GetBLSPubKey(encryptedKeyHex_ptr->c_str()); vector<string> public_key_vect = GetBLSPubKey(encryptedKeyHex_ptr->c_str());
for ( uint8_t i = 0; i < 4; i++) { for ( uint8_t i = 0; i < 4; i++) {
result["BLSPublicKeyShare"][i] = public_key_vect.at(i); result["blsPublicKeyShare"][i] = public_key_vect.at(i);
} }
} catch (RPCException &_e) { } catch (RPCException &_e) {
...@@ -668,7 +668,7 @@ Json::Value complaintResponseImpl(const string& polyName, int ind){ ...@@ -668,7 +668,7 @@ Json::Value complaintResponseImpl(const string& polyName, int ind){
string DHKey = decrypt_DHKey(polyName, ind); string DHKey = decrypt_DHKey(polyName, ind);
result["share*G2"] = *shareG2_ptr; result["share*G2"] = *shareG2_ptr;
result["DHKey"] = DHKey; result["dhKey"] = DHKey;
} catch (RPCException &_e) { } catch (RPCException &_e) {
cerr << " err str " << _e.errString << endl; cerr << " err str " << _e.errString << endl;
......
...@@ -789,7 +789,7 @@ TEST_CASE("BLS_DKG test", "[bls_dkg]") { ...@@ -789,7 +789,7 @@ TEST_CASE("BLS_DKG test", "[bls_dkg]") {
secretShares[i] = c.getSecretShare(poly_names[i], pubEthKeys, t, n); secretShares[i] = c.getSecretShare(poly_names[i], pubEthKeys, t, n);
for ( uint8_t k = 0; k < t; k++ ) { for ( uint8_t k = 0; k < t; k++ ) {
for (uint8_t j = 0; j < 4; j++) { for (uint8_t j = 0; j < 4; j++) {
string pubShare = VerifVects[i]["Verification Vector"][k][j].asString(); string pubShare = VerifVects[i]["verificationVector"][k][j].asString();
pubShares[i] += ConvertDecToHex(pubShare); pubShares[i] += ConvertDecToHex(pubShare);
} }
} }
...@@ -799,7 +799,7 @@ TEST_CASE("BLS_DKG test", "[bls_dkg]") { ...@@ -799,7 +799,7 @@ TEST_CASE("BLS_DKG test", "[bls_dkg]") {
Json::Value complaintResponse = c.complaintResponse(poly_names[1], 0); Json::Value complaintResponse = c.complaintResponse(poly_names[1], 0);
cerr << "share * G2 is " << complaintResponse["share*G2"].asString(); cerr << "share * G2 is " << complaintResponse["share*G2"].asString();
cerr << "DHKey is " << complaintResponse["DHKey"].asString(); cerr << "DHKey is " << complaintResponse["dhKey"].asString();
int k = 0; int k = 0;
...@@ -856,7 +856,7 @@ TEST_CASE("BLS_DKG test", "[bls_dkg]") { ...@@ -856,7 +856,7 @@ TEST_CASE("BLS_DKG test", "[bls_dkg]") {
vector<string> pubKey_vect; vector<string> pubKey_vect;
for ( uint8_t j = 0; j < 4; j++){ for ( uint8_t j = 0; j < 4; j++){
pubKey_vect.push_back(pubBLSKeys[i]["BLSPublicKeyShare"][j].asString()); pubKey_vect.push_back(pubBLSKeys[i]["blsPublicKeyShare"][j].asString());
} }
BLSPublicKeyShare pubKey(make_shared<vector<string>>(pubKey_vect), t, n); BLSPublicKeyShare pubKey(make_shared<vector<string>>(pubKey_vect), t, n);
REQUIRE( pubKey.VerifySigWithHelper(hash_arr, make_shared<BLSSigShare>(sig) , t, n)); REQUIRE( pubKey.VerifySigWithHelper(hash_arr, make_shared<BLSSigShare>(sig) , t, n));
...@@ -1022,7 +1022,7 @@ void SendRPCRequest(){ ...@@ -1022,7 +1022,7 @@ void SendRPCRequest(){
secretShares[i] = c.getSecretShare(poly_names[i], pubEthKeys, t, n); secretShares[i] = c.getSecretShare(poly_names[i], pubEthKeys, t, n);
for ( uint8_t k = 0; k < t; k++ ) { for ( uint8_t k = 0; k < t; k++ ) {
for (uint8_t j = 0; j < 4; j++) { for (uint8_t j = 0; j < 4; j++) {
string pubShare = VerifVects[i]["Verification Vector"][k][j].asString(); string pubShare = VerifVects[i]["verificationVector"][k][j].asString();
pubShares[i] += ConvertDecToHex(pubShare); pubShares[i] += ConvertDecToHex(pubShare);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment