From 5b2e30565a0663cf9e84a4ff4a027a6287b637ec Mon Sep 17 00:00:00 2001
From: Daniel Lyubomirov <daniel.lyubomirov@vereign.com>
Date: Mon, 6 Jul 2020 11:30:13 +0300
Subject: [PATCH] [17] Rename kvstore::CryptoStorage::Reset method to Recreate
---
cpp/src/vereign/identity/provider.cc | 4 ++--
cpp/src/vereign/identity/provider.hh | 4 ++--
cpp/src/vereign/kvstore/crypto_storage.cc | 4 ++--
cpp/src/vereign/kvstore/crypto_storage.hh | 4 ++--
cpp/src/vereign/kvstore/detail/linux_crypto_storage.cc | 2 +-
cpp/src/vereign/kvstore/detail/linux_crypto_storage.hh | 2 +-
cpp/src/vereign/kvstore/detail/win_crypto_storage.cc | 2 +-
cpp/src/vereign/kvstore/detail/win_crypto_storage.hh | 2 +-
cpp/src/vereign/service/identity_service.cc | 2 +-
cpp/tests/vereign/identity/provider_test.cc | 4 ++--
cpp/tests/vereign/kvstore/crypto_storage_test.cc | 8 ++++----
11 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/cpp/src/vereign/identity/provider.cc b/cpp/src/vereign/identity/provider.cc
index 94f761b..e69494a 100644
--- a/cpp/src/vereign/identity/provider.cc
+++ b/cpp/src/vereign/identity/provider.cc
@@ -17,10 +17,10 @@ Provider::Provider(kvstore::CryptoStorage& storage)
Provider::~Provider() = default;
-auto Provider::ResetIdentity(const std::string& pin) -> std::string {
+auto Provider::RecreateIdentity(const std::string& pin) -> std::string {
std::lock_guard<std::mutex> l{mu_};
- storage_.Reset(pin);
+ storage_.Recreate(pin);
auto rsa = crypto::rsa::GenerateKey(rsaKeySizeBits);
diff --git a/cpp/src/vereign/identity/provider.hh b/cpp/src/vereign/identity/provider.hh
index 60003b4..c526e41 100644
--- a/cpp/src/vereign/identity/provider.hh
+++ b/cpp/src/vereign/identity/provider.hh
@@ -33,14 +33,14 @@ public:
auto operator=(const kvstore::Storage&) -> Provider& = delete;
/**
- * Replaces the current identity.
+ * Recreates the current identity.
*
* @param pin Required only under Linux. The pin code used for derivation of the crypto storage
* master key.
*
* @returns The base64 encoded PEM encoded identity public key.
*/
- auto ResetIdentity(const std::string& pin) -> std::string;
+ auto RecreateIdentity(const std::string& pin) -> std::string;
/**
* Loads the local identity.
diff --git a/cpp/src/vereign/kvstore/crypto_storage.cc b/cpp/src/vereign/kvstore/crypto_storage.cc
index d4c1bbc..7db1646 100644
--- a/cpp/src/vereign/kvstore/crypto_storage.cc
+++ b/cpp/src/vereign/kvstore/crypto_storage.cc
@@ -14,8 +14,8 @@ CryptoStorage::CryptoStorage(Storage& storage, bool disable_key_protection)
CryptoStorage::~CryptoStorage() = default;
-void CryptoStorage::Reset(const std::string& pin) {
- impl_->Reset(pin);
+void CryptoStorage::Recreate(const std::string& pin) {
+ impl_->Recreate(pin);
}
void CryptoStorage::Open(const std::string& pin) {
diff --git a/cpp/src/vereign/kvstore/crypto_storage.hh b/cpp/src/vereign/kvstore/crypto_storage.hh
index 671e9ab..f0c0364 100644
--- a/cpp/src/vereign/kvstore/crypto_storage.hh
+++ b/cpp/src/vereign/kvstore/crypto_storage.hh
@@ -46,7 +46,7 @@ public:
auto operator=(const CryptoStorage&) -> CryptoStorage& = delete;
/**
- * Reset the storage, by effectively initializing a new empty storage.
+ * Reinitializes the storage, by effectively initializing a new empty storage.
*
* Although the resulting storage is empty it will include some internal data needed for the
* master key management.
@@ -57,7 +57,7 @@ public:
*
* @throws Error on failure.
*/
- void Reset(const std::string& pin);
+ void Recreate(const std::string& pin);
/**
* Open the storage.
diff --git a/cpp/src/vereign/kvstore/detail/linux_crypto_storage.cc b/cpp/src/vereign/kvstore/detail/linux_crypto_storage.cc
index 6a19e57..1d59144 100644
--- a/cpp/src/vereign/kvstore/detail/linux_crypto_storage.cc
+++ b/cpp/src/vereign/kvstore/detail/linux_crypto_storage.cc
@@ -77,7 +77,7 @@ void CryptoStorageImpl::Open(const std::string& pin) {
}
}
-void CryptoStorageImpl::Reset(const std::string& pin) {
+void CryptoStorageImpl::Recreate(const std::string& pin) {
if (pin.empty()) {
throw InvalidPinCodeError{};
}
diff --git a/cpp/src/vereign/kvstore/detail/linux_crypto_storage.hh b/cpp/src/vereign/kvstore/detail/linux_crypto_storage.hh
index e1675e4..fcc3e1f 100644
--- a/cpp/src/vereign/kvstore/detail/linux_crypto_storage.hh
+++ b/cpp/src/vereign/kvstore/detail/linux_crypto_storage.hh
@@ -14,7 +14,7 @@ public:
CryptoStorageImpl(const CryptoStorageImpl&) = delete;
auto operator=(const CryptoStorageImpl&) -> CryptoStorageImpl& = delete;
- void Reset(const std::string& pin);
+ void Recreate(const std::string& pin);
void Open(const std::string& pin);
};
diff --git a/cpp/src/vereign/kvstore/detail/win_crypto_storage.cc b/cpp/src/vereign/kvstore/detail/win_crypto_storage.cc
index 4e910cb..6d8651f 100644
--- a/cpp/src/vereign/kvstore/detail/win_crypto_storage.cc
+++ b/cpp/src/vereign/kvstore/detail/win_crypto_storage.cc
@@ -67,7 +67,7 @@ void CryptoStorageImpl::Open(const std::string& pin) {
}
}
-void CryptoStorageImpl::Reset(const std::string& pin) {
+void CryptoStorageImpl::Recreate(const std::string& pin) {
boost::ignore_unused(pin);
kvstore::Lock l{storage_, lockRetryCount, lockRetrySleep};
diff --git a/cpp/src/vereign/kvstore/detail/win_crypto_storage.hh b/cpp/src/vereign/kvstore/detail/win_crypto_storage.hh
index cc88a31..48150ac 100644
--- a/cpp/src/vereign/kvstore/detail/win_crypto_storage.hh
+++ b/cpp/src/vereign/kvstore/detail/win_crypto_storage.hh
@@ -14,7 +14,7 @@ public:
CryptoStorageImpl(const CryptoStorageImpl&) = delete;
auto operator=(const CryptoStorageImpl&) -> CryptoStorageImpl& = delete;
- void Reset(const std::string& pin);
+ void Recreate(const std::string& pin);
void Open(const std::string& pin);
private:
diff --git a/cpp/src/vereign/service/identity_service.cc b/cpp/src/vereign/service/identity_service.cc
index 488c2f3..fe39c2b 100644
--- a/cpp/src/vereign/service/identity_service.cc
+++ b/cpp/src/vereign/service/identity_service.cc
@@ -35,7 +35,7 @@ void IdentityService::LoginWithNewDevice(
const client_library::LoginFormNewDevice* req,
client_library::LoginFormNewDeviceResponse* resp
) {
- auto public_key = identity_provider_.ResetIdentity(req->pin());
+ auto public_key = identity_provider_.RecreateIdentity(req->pin());
auto result = client_session_.GetClient().Post(
client_session_.BasePath() + gen::IdentityService::ServicePath + loginWithNewDevicePath,
diff --git a/cpp/tests/vereign/identity/provider_test.cc b/cpp/tests/vereign/identity/provider_test.cc
index d090554..f34a845 100644
--- a/cpp/tests/vereign/identity/provider_test.cc
+++ b/cpp/tests/vereign/identity/provider_test.cc
@@ -11,7 +11,7 @@
using namespace vereign;
-TEST_CASE("Provider::ResetIdentity", "[vereign/identity]") {
+TEST_CASE("Provider::RecreateIdentity", "[vereign/identity]") {
auto storage_path = fs::TempFilePath("test_db_");
fs::RemoveFileGuard rm{storage_path};
@@ -23,7 +23,7 @@ TEST_CASE("Provider::ResetIdentity", "[vereign/identity]") {
kvstore::CryptoStorage storage{kvstorage, true};
identity::Provider provider{storage};
- expected = provider.ResetIdentity("foo");
+ expected = provider.RecreateIdentity("foo");
}
{
diff --git a/cpp/tests/vereign/kvstore/crypto_storage_test.cc b/cpp/tests/vereign/kvstore/crypto_storage_test.cc
index 57e3e29..8f9d305 100644
--- a/cpp/tests/vereign/kvstore/crypto_storage_test.cc
+++ b/cpp/tests/vereign/kvstore/crypto_storage_test.cc
@@ -14,7 +14,7 @@
using namespace vereign;
-TEST_CASE("kvstore::CryptoStorage::Reset", "[vereign/kvstore]") {
+TEST_CASE("kvstore::CryptoStorage::Recreate", "[vereign/kvstore]") {
auto storage_path = fs::TempFilePath("test_db_");
fs::RemoveFileGuard rm{storage_path};
@@ -23,7 +23,7 @@ TEST_CASE("kvstore::CryptoStorage::Reset", "[vereign/kvstore]") {
auto kvstorage = kvstore::SqliteStorage(storage_path);
kvstore::CryptoStorage storage{kvstorage, true};
- storage.Reset("foo");
+ storage.Recreate("foo");
std::string v{"test value"};
storage.PutBytes("test", bytes::View(v));
}
@@ -49,7 +49,7 @@ TEST_CASE("kvstore::CryptoStorage::PutBytes", "[vereign/kvstore]") {
auto kvstorage = kvstore::SqliteStorage(storage_path);
kvstore::CryptoStorage storage{kvstorage, true};
- storage.Reset("foo");
+ storage.Recreate("foo");
storage.PutBytes("test", big_value.View());
bytes::Buffer v;
@@ -68,7 +68,7 @@ TEST_CASE("kvstore::CryptoStorage::GetBytes", "[vereign/kvstore]") {
auto kvstorage = kvstore::SqliteStorage(storage_path);
kvstore::CryptoStorage storage{kvstorage, true};
- storage.Reset("foo");
+ storage.Recreate("foo");
SECTION("when the value does not exists, it must throw ValueNotFoundError") {
bytes::Buffer v;
--
GitLab