Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fixed all core tests

Browse source
This commit is contained in:
cryptozoidberg 2022-06-26 01:13:19 +02:00
parent e94e5c0a97
commit dfac17daeb
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/currency_core/currency_format_utils.cpp
View file

@ -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)

2
src/currency_core/currency_format_utils_transactions.cpp
View file

@ -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<true>::variant_tag_type); //tools::get_varint_packed_size(variant_serialization_traits<binary_archive<true>, currency::NLSAG_sig>::get_tag()); // sizeof variant tag
//tx_blob_size += sizeof(binary_archive<true>::variant_tag_type); //tools::get_varint_packed_size(variant_serialization_traits<binary_archive<true>, 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)

2
tests/core_tests/chaingen_main.cpp
View file

@ -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<const currency::transaction_prefix&>(tx));
currency::blobdata prefix_blob = t_serializable_object_to_blob(static_cast<const currency::transaction_prefix&>(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 <<