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

coretests: minor refactoring

Browse source
This commit is contained in:
sowle 2020-05-18 17:20:23 +03:00
parent a9336724aa
commit c1e3b80191
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
3 changed files with 72 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
tests/core_tests/alias_tests.cpp
View file

@ -18,72 +18,20 @@ using namespace currency;
#define FIFTH_NAME "fifth--01234567890"
#define SIX_NAME "sixsix-double--01234567890"
std::string gen_random_alias(size_t len)
{
const char allowed_chars[] = "abcdefghijklmnopqrstuvwxyz0123456789";
char buffer[2048] = "";
if (len >= sizeof buffer)
return "";
crypto::generate_random_bytes(len, buffer);
buffer[len] = 0;
for(size_t i = 0; i < len; ++i)
buffer[i] = allowed_chars[buffer[i] % (sizeof allowed_chars - 1)];
return buffer;
}
bool put_alias_via_tx_to_list(std::vector<test_event_entry>& events,
std::list<currency::transaction>& tx_set,
const block& head_block,
const account_base& miner_acc,
currency::extra_alias_entry ai2,
test_generator& generator)
{
std::vector<currency::extra_v> ex;
ex.push_back(ai2);
account_base reward_acc;
account_keys& ak = const_cast<account_keys&>(reward_acc.get_keys());
currency::get_aliases_reward_account(ak.account_address, ak.view_secret_key);
uint64_t fee_median = generator.get_last_n_blocks_fee_median(get_block_hash(head_block));
uint64_t reward = currency::get_alias_coast_from_fee(ai2.m_alias, fee_median);
MAKE_TX_MIX_LIST_EXTRA_MIX_ATTR(events,
tx_set,
miner_acc,
reward_acc,
reward,
0,
head_block,
CURRENCY_TO_KEY_OUT_RELAXED,
ex,
std::vector<currency::attachment_v>());
uint64_t found_alias_reward = get_amount_for_zero_pubkeys(tx_set.back());
if (found_alias_reward != reward)
{
LOCAL_ASSERT(false);
CHECK_AND_ASSERT_MES(false, false, "wrong transaction constructed, first input value not match alias amount or account");
return false;
}
return true;
std::list<currency::transaction>& tx_set,
const block& head_block,
const std::string& alias_name,
const account_base& miner_acc,
const account_base& alias_acc,
test_generator& generator)
{
currency::extra_alias_entry ai2 = AUTO_VAL_INIT(ai2);
ai2.m_alias = alias_name;
ai2.m_address = alias_acc.get_keys().account_address;
ai2.m_text_comment = "ssdss";
return put_alias_via_tx_to_list(events, tx_set, head_block, miner_acc, ai2, generator);
}
bool put_alias_via_tx_to_list(std::vector<test_event_entry>& events,
std::list<currency::transaction>& tx_set,
const block& head_block,
const std::string& alias_name,
const account_base& miner_acc,
const account_base& alias_acc,
test_generator& generator)
{
currency::extra_alias_entry ai2 = AUTO_VAL_INIT(ai2);
ai2.m_alias = alias_name;
ai2.m_address = alias_acc.get_keys().account_address;
ai2.m_text_comment = "ssdss";
return put_alias_via_tx_to_list(events, tx_set, head_block, miner_acc, ai2, generator);
}
bool put_next_block_with_alias_in_tx(std::vector<test_event_entry>& events,
block& b,
@ -92,13 +40,13 @@ bool put_next_block_with_alias_in_tx(std::vector<test_event_entry>& events,
const currency::extra_alias_entry& ai,
test_generator& generator)
{
std::list<currency::transaction> txs_0;
if (!put_alias_via_tx_to_list(events, txs_0, head_block, miner_acc, ai, generator))
return false;
std::list<currency::transaction> txs_0;
if (!put_alias_via_tx_to_list(events, txs_0, head_block, miner_acc, ai, generator))
return false;
MAKE_NEXT_BLOCK_TX_LIST(events, blk, head_block, miner_acc, txs_0);
b = blk;
return true;
MAKE_NEXT_BLOCK_TX_LIST(events, blk, head_block, miner_acc, txs_0);
b = blk;
return true;
}

2
tests/core_tests/chaingen.h
View file

@ -15,7 +15,6 @@
#include "currency_core/currency_core.h"
#include "wallet/wallet2.h"
#include "test_core_time.h"
#include "chaingen_helpers.h"
#define TESTS_DEFAULT_FEE ((uint64_t)TX_DEFAULT_FEE)
#define MK_TEST_COINS(amount) (static_cast<uint64_t>(amount) * TX_DEFAULT_FEE)
@ -1205,3 +1204,4 @@ void append_vector_by_another_vector(U& dst, const V& src)
// --- end of gentime wallet helpers -----------------------------------------------------------------------
#include "chaingen_helpers.h"

53
tests/core_tests/chaingen_helpers.h
View file

@ -228,3 +228,56 @@ inline bool resign_tx(const currency::account_keys& sender_keys, const std::vect
return true;
}
inline std::string gen_random_alias(size_t len)
{
const char allowed_chars[] = "abcdefghijklmnopqrstuvwxyz0123456789";
char buffer[2048] = "";
if (len >= sizeof buffer)
return "";
crypto::generate_random_bytes(len, buffer);
buffer[len] = 0;
for(size_t i = 0; i < len; ++i)
buffer[i] = allowed_chars[buffer[i] % (sizeof allowed_chars - 1)];
return buffer;
}
inline bool put_alias_via_tx_to_list(std::vector<test_event_entry>& events,
std::list<currency::transaction>& tx_set,
const currency::block& head_block,
const currency::account_base& miner_acc,
currency::extra_alias_entry ai2,
test_generator& generator)
{
std::vector<currency::extra_v> ex;
ex.push_back(ai2);
currency::account_base reward_acc;
currency::account_keys& ak = const_cast<currency::account_keys&>(reward_acc.get_keys());
currency::get_aliases_reward_account(ak.account_address, ak.view_secret_key);
uint64_t fee_median = generator.get_last_n_blocks_fee_median(get_block_hash(head_block));
uint64_t reward = currency::get_alias_coast_from_fee(ai2.m_alias, fee_median);
MAKE_TX_MIX_LIST_EXTRA_MIX_ATTR(events,
tx_set,
miner_acc,
reward_acc,
reward,
0,
head_block,
CURRENCY_TO_KEY_OUT_RELAXED,
ex,
std::vector<currency::attachment_v>());
uint64_t found_alias_reward = get_amount_for_zero_pubkeys(tx_set.back());
if (found_alias_reward != reward)
{
LOCAL_ASSERT(false);
CHECK_AND_ASSERT_MES(false, false, "wrong transaction constructed, first input value not match alias amount or account");
return false;
}
return true;
}