From dfac17daeb01759b3124e2254cecd5698162640a Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Sun, 26 Jun 2022 01:13:19 +0200 Subject: [PATCH] fixed all core tests --- src/currency_core/currency_format_utils.cpp | 1 + src/currency_core/currency_format_utils_transactions.cpp | 2 +- tests/core_tests/chaingen_main.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 97b6a90e..162849c6 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -1284,6 +1284,7 @@ namespace currency tx.vin.clear(); tx.vout.clear(); tx.extra = extra; + tx.signatures.clear(); tx.version = ftp.tx_version; if (unlock_time != 0) diff --git a/src/currency_core/currency_format_utils_transactions.cpp b/src/currency_core/currency_format_utils_transactions.cpp index 6e31904d..46130401 100644 --- a/src/currency_core/currency_format_utils_transactions.cpp +++ b/src/currency_core/currency_format_utils_transactions.cpp @@ -237,7 +237,7 @@ namespace currency ++sig_count; // count in one more signature for the last input in a complete separately signed tx tx_blob_size += tools::get_varint_packed_size(sig_count); // size of transaction::signatures[i] tx_blob_size += sizeof(crypto::signature) * sig_count; // size of signatures' data itself - tx_blob_size += sizeof(binary_archive::variant_tag_type); //tools::get_varint_packed_size(variant_serialization_traits, currency::NLSAG_sig>::get_tag()); // sizeof variant tag + //tx_blob_size += sizeof(binary_archive::variant_tag_type); //tools::get_varint_packed_size(variant_serialization_traits, currency::NLSAG_sig>::get_tag()); // sizeof variant tag } // 2. attachments (try to find extra_attachment_info in tx prefix and count it in if succeed) diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp index d09d1558..439d8482 100644 --- a/tests/core_tests/chaingen_main.cpp +++ b/tests/core_tests/chaingen_main.cpp @@ -314,8 +314,10 @@ public: size_t tx_expected_blob_size = get_object_blobsize(tx); if (!b_cp && tx_expected_blob_size != blob.size()) { + size_t prefix_blobsize = currency::get_object_blobsize(static_cast(tx)); currency::blobdata prefix_blob = t_serializable_object_to_blob(static_cast(tx)); + currency::blobdata full_blob_test = t_serializable_object_to_blob(tx); std::stringstream s; s << "CP zone: " << b_cp << ", transaction: " << get_transaction_hash(tx) << ENDL <<