Fixed import

parent bd4f9c28
...@@ -93,8 +93,6 @@ Json::Value importBLSKeyShareImpl(int index, const std::string& _keyShare, cons ...@@ -93,8 +93,6 @@ Json::Value importBLSKeyShareImpl(int index, const std::string& _keyShare, cons
result["errorMessage"] = ""; result["errorMessage"] = "";
result["encryptedKeyShare"] = ""; result["encryptedKeyShare"] = "";
try { try {
...@@ -108,6 +106,8 @@ Json::Value importBLSKeyShareImpl(int index, const std::string& _keyShare, cons ...@@ -108,6 +106,8 @@ Json::Value importBLSKeyShareImpl(int index, const std::string& _keyShare, cons
throw RPCException(errStatus, errMsg); throw RPCException(errStatus, errMsg);
} }
result["encryptedKeyShare"] = encryptedKeyShareHex;
writeKeyShare(_keyShareName, encryptedKeyShareHex); writeKeyShare(_keyShareName, encryptedKeyShareHex);
} catch (RPCException& _e) { } catch (RPCException& _e) {
......
...@@ -67,7 +67,8 @@ int updated; ...@@ -67,7 +67,8 @@ int updated;
#define TEST_KEY "4160780231445160889237664391382223604184857153814275770598791864649971919844" #define TEST_BLS_KEY_SHARE "4160780231445160889237664391382223604184857153814275770598791864649971919844"
#define TEST_BLS_KEY_NAME "SCHAIN:17:INDEX:5:KEY:1"
void reset_db() { void reset_db() {
REQUIRE(system("rm -rf " WALLETDB_NAME) == 0); REQUIRE(system("rm -rf " WALLETDB_NAME) == 0);
...@@ -75,7 +76,7 @@ void reset_db() { ...@@ -75,7 +76,7 @@ void reset_db() {
char* encryptTestKey() { char* encryptTestKey() {
const char *key = TEST_KEY; const char *key = TEST_BLS_KEY_SHARE;
int errStatus = -1; int errStatus = -1;
...@@ -123,7 +124,7 @@ TEST_CASE("BLS key encrypt/decrypt", "[bls-key-encrypt-decrypt]") { ...@@ -123,7 +124,7 @@ TEST_CASE("BLS key encrypt/decrypt", "[bls-key-encrypt-decrypt]") {
REQUIRE(errStatus == 0); REQUIRE(errStatus == 0);
REQUIRE(strcmp(plaintextKey, TEST_KEY) == 0); REQUIRE(strcmp(plaintextKey, TEST_BLS_KEY_SHARE) == 0);
printf("Decrypt key completed with status: %d %s \n", errStatus, errMsg); printf("Decrypt key completed with status: %d %s \n", errStatus, errMsg);
printf("Decrypted key len %d\n", (int) strlen(plaintextKey)); printf("Decrypted key len %d\n", (int) strlen(plaintextKey));
...@@ -134,6 +135,16 @@ TEST_CASE("BLS key encrypt/decrypt", "[bls-key-encrypt-decrypt]") { ...@@ -134,6 +135,16 @@ TEST_CASE("BLS key encrypt/decrypt", "[bls-key-encrypt-decrypt]") {
} }
TEST_CASE("BLS key import", "[bls-key-import]") { TEST_CASE("BLS key import", "[bls-key-import]") {
reset_db();
init_all();
auto result = importBLSKeyShareImpl(1, TEST_BLS_KEY_SHARE, TEST_BLS_KEY_NAME, 2, 2);
REQUIRE(result["status"] == 0);
REQUIRE(result["encryptedKeyShare"] != "");
} }
...@@ -176,8 +187,8 @@ TEST_CASE("KeysDB test", "[keys-db]") { ...@@ -176,8 +187,8 @@ TEST_CASE("KeysDB test", "[keys-db]") {
init_all(); init_all();
string key = "SCHAIN:17:INDEX:5:KEY:1"; string key = TEST_BLS_KEY_SHARE;
string value = TEST_KEY; string value = TEST_BLS_KEY_SHARE;
......
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