aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.h
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-08-17 14:08:59 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-08-17 14:08:59 -0500
commit765db1ae7a3337d085584ab31983fe6b7599dbcb (patch)
tree8ee2064e832103be0890657f15973a15e3619edb /src/wallet/wallet2.h
parentMerge pull request #6736 (diff)
downloadmonero-765db1ae7a3337d085584ab31983fe6b7599dbcb.tar.xz
Revert "Use domain-separated ChaCha20 for in-memory key encryption"
This reverts commit 921dd8dde5d381052d0aa2936304a3541a230c55.
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r--src/wallet/wallet2.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 44ae342c3..4a10e3d23 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -219,15 +219,6 @@ private:
friend class wallet_keys_unlocker;
friend class wallet_device_callback;
public:
- // Contains data on how keys were loaded, primarily for unit test purposes
- struct load_info_t {
- bool is_legacy_key_encryption;
- };
-
- const load_info_t &get_load_info() const {
- return load_info;
- }
-
static constexpr const std::chrono::seconds rpc_timeout = std::chrono::minutes(3) + std::chrono::seconds(30);
enum RefreshType {
@@ -1417,8 +1408,6 @@ private:
static std::string get_default_daemon_address() { CRITICAL_REGION_LOCAL(default_daemon_address_lock); return default_daemon_address; }
private:
- load_info_t load_info;
-
/*!
* \brief Stores wallet information to wallet file.
* \param keys_file_name Name of wallet file