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

fixed multiasset test

Browse source
This commit is contained in:
cryptozoidberg 2022-10-05 21:31:21 +02:00
parent 8e0cf0f142
commit 319f295984
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/currency_core/currency_basic.h
View file

@ -412,6 +412,7 @@ namespace currency
FIELD(amount_commitment)
FIELD(encrypted_amount)
FIELD(mix_attr)
FIELD(etc_details)
END_SERIALIZE()
BEGIN_BOOST_SERIALIZATION()
@ -420,6 +421,7 @@ namespace currency
BOOST_SERIALIZE(amount_commitment)
BOOST_SERIALIZE(encrypted_amount)
BOOST_SERIALIZE(mix_attr)
BOOST_SERIALIZE(etc_details)
END_BOOST_SERIALIZATION()
};

10
tests/core_tests/multiassets_test.cpp
View file

@ -74,6 +74,7 @@ bool multiassets_basic_test::c1(currency::core& c, size_t ev_index, const std::v
currency::transaction tx = AUTO_VAL_INIT(tx);
crypto::hash asset_id = currency::null_hash;
miner_wlt->publish_new_asset(adb, destinations, tx, asset_id);
LOG_PRINT_L0("Published new asset: " << asset_id << ", tx_id: " << currency::get_transaction_hash(tx));
//pass over hardfork
r = mine_next_pow_blocks_in_playtime(miner_wlt->get_account().get_public_address(), c, CURRENCY_MINED_MONEY_UNLOCK_WINDOW);
@ -92,7 +93,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 == 0, 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");
balances.clear();
@ -101,10 +102,11 @@ bool multiassets_basic_test::c1(currency::core& c, size_t ev_index, const std::v
it_asset = balances.find(asset_id);
it_native = balances.find(currency::null_hash);
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 != balances.end(), false, "Failed to find needed asset in result balances");
CHECK_AND_ASSERT_MES(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 == 0, false, "Failed to find needed asset in result balances");
//TODO: add transfer of tokens
return true;
}