From 4254486345167d4800f4a8f2a9b84975f0a4c886 Mon Sep 17 00:00:00 2001 From: dec05eba <0xdec05eba@gmail.com> Date: Wed, 16 May 2018 08:13:26 +0200 Subject: Return stored node users decrypted as hash map instead of vector --- include/odhtdb/Database.hpp | 2 +- include/odhtdb/DatabaseStorage.hpp | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/odhtdb/Database.hpp b/include/odhtdb/Database.hpp index bd7b3f5..87389eb 100644 --- a/include/odhtdb/Database.hpp +++ b/include/odhtdb/Database.hpp @@ -192,7 +192,7 @@ namespace odhtdb // Returns nodes, public key and private key of encrypted user. // Throws DatabaseStorageWrongPassword if password for the stored user is wrong. - std::vector getStoredUserNodeDataDecrypted(const std::string &username, const std::string &password); + MapHash getStoredUserNodeDataDecrypted(const std::string &username, const std::string &password); std::vector getUserGroups(const Hash &nodeHash, const Signature::PublicKey &userPublicKey) const; diff --git a/include/odhtdb/DatabaseStorage.hpp b/include/odhtdb/DatabaseStorage.hpp index 2b1e552..264ab57 100644 --- a/include/odhtdb/DatabaseStorage.hpp +++ b/include/odhtdb/DatabaseStorage.hpp @@ -72,12 +72,6 @@ namespace odhtdb using FetchNodeUserActionGapsCallbackFunc = std::function; using FetchNodeUserLatestActionCounterCallbackFunc = std::function; - struct NodeUserKeyPair - { - const Hash nodeHash; - const Signature::KeyPair keyPair; - }; - class DatabaseStorage { public: @@ -130,7 +124,7 @@ namespace odhtdb // Returns nodes, public key and private key of encrypted user. // Throws DatabaseStorageWrongPassword if password for the stored user is wrong. // Throws DatabaseStorageNoSuchStoredUser if user doesn't exist. - std::vector getStoredUserNodeDataDecrypted(const std::string &username, const std::string &password); + MapHash getStoredUserNodeDataDecrypted(const std::string &username, const std::string &password); // Returns true and node decryption key if node exists and we have the decryption key, // otherwise return false and OwnedMemory with data set to nullptr -- cgit v1.2.3