From a41d73cf8e1c75f26d3cb9d681c985fea6b36a4f Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 7 May 2020 14:57:45 +0300 Subject: [PATCH] serialization fixes from predevelop --- src/currency_core/account.h | 6 +++--- src/currency_core/currency_basic.h | 9 ++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/currency_core/account.h b/src/currency_core/account.h index 64e9340e..01134418 100644 --- a/src/currency_core/account.h +++ b/src/currency_core/account.h @@ -35,9 +35,9 @@ namespace currency crypto::secret_key view_secret_key; BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE(account_address) - KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(spend_secret_key) - KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(view_secret_key) + KV_SERIALIZE_N(account_address, "m_account_address") + KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(spend_secret_key, "m_spend_secret_key") + KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(view_secret_key, "m_view_secret_key") END_KV_SERIALIZE_MAP() }; diff --git a/src/currency_core/currency_basic.h b/src/currency_core/currency_basic.h index 93d5f63d..8c7c9b2e 100644 --- a/src/currency_core/currency_basic.h +++ b/src/currency_core/currency_basic.h @@ -71,8 +71,8 @@ namespace currency END_SERIALIZE() BEGIN_KV_SERIALIZE_MAP() - KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(spend_public_key) - KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(view_public_key) + KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(spend_public_key, "m_spend_public_key") + KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE_N(view_public_key, "m_view_public_key") END_KV_SERIALIZE_MAP() }; #pragma pack(pop) @@ -88,23 +88,18 @@ namespace currency { crypto::public_key spend_public_key; crypto::public_key view_public_key; - //uint8_t version; uint8_t flags; DEFINE_SERIALIZATION_VERSION(ACCOUNT_PUBLIC_ADDRESS_SERIZALIZATION_VER) BEGIN_SERIALIZE_OBJECT() FIELD(spend_public_key) FIELD(view_public_key) - //VERSION_ENTRY(version) FIELD(flags) - //if (version > ACCOUNT_PUBLIC_ADDRESS_SERIZALIZATION_VER) - // return true; // backward compartibility END_SERIALIZE() BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(spend_public_key) KV_SERIALIZE_VAL_POD_AS_BLOB_FORCE(view_public_key) - //KV_SERIALIZE(version) // is it necessary? KV_SERIALIZE(flags) END_KV_SERIALIZE_MAP()