diff --git a/src/currency_core/currency_basic.h b/src/currency_core/currency_basic.h index ea09da90..43a5749a 100644 --- a/src/currency_core/currency_basic.h +++ b/src/currency_core/currency_basic.h @@ -443,7 +443,7 @@ namespace currency struct zc_outs_range_proof { crypto::bpp_signature_serialized bpp; - uint8_t outputs_count; // how many outputs are included in the proof + uint8_t outputs_count = 0; // how many outputs are included in the proof BEGIN_SERIALIZE_OBJECT() FIELD(bpp) @@ -459,7 +459,7 @@ namespace currency // Zarcanum-aware CLSAG signature struct ZC_sig { - crypto::public_key pseudo_out_amount_commitment; // premultiplied by 1/8 + crypto::public_key pseudo_out_amount_commitment = null_pkey; // premultiplied by 1/8 crypto::CLSAG_GG_signature_serialized clsags_gg; BEGIN_SERIALIZE_OBJECT() @@ -475,7 +475,7 @@ namespace currency struct zc_balance_proof { - crypto::signature s; + crypto::signature s = null_sig; BEGIN_SERIALIZE_OBJECT() FIELD(s) diff --git a/tests/core_tests/chaingen_pch.cpp b/tests/core_tests/chaingen_pch.cpp index 11878762..4f86d7c7 100644 --- a/tests/core_tests/chaingen_pch.cpp +++ b/tests/core_tests/chaingen_pch.cpp @@ -1,5 +1,4 @@ // Copyright (c) 2022 Zano Project // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#pragma once #include "chaingen.h" diff --git a/tests/core_tests/multiassets_test.cpp b/tests/core_tests/multiassets_test.cpp index 333c714c..64e501a8 100644 --- a/tests/core_tests/multiassets_test.cpp +++ b/tests/core_tests/multiassets_test.cpp @@ -100,7 +100,7 @@ bool multiassets_basic_test::c1(currency::core& c, size_t ev_index, const std::v CHECK_AND_ASSERT_MES(it_asset != balances.end() && it_native != balances.end(), false, "Failed to find needed asset in result balances"); CHECK_AND_ASSERT_MES(it_asset->second.total == AMOUNT_ASSETS_TO_TRANSFER_MULTIASSETS_BASIC, false, "Failed to find needed asset in result balances"); - CHECK_AND_ASSERT_MES(it_native->second.total == 17517226000000000000, false, "Failed to find needed asset in result balances"); + CHECK_AND_ASSERT_MES(it_native->second.total == uint64_t(17517226)*COIN, false, "Failed to find needed asset in result balances"); balances.clear();