rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5529

Browse Source 
de27651 use crypto::rand instead of libc rand in a few tests (moneromooo-monero)
This commit is contained in:
luigi1111 2019-07-24 14:06:11 -05:00
commit 7fc76451a5
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit_tests/mnemonics.cpp
View File

@ -82,7 +82,7 @@ namespace
crypto::secret_key randkey; crypto::secret_key randkey;
for (size_t ii = 0; ii < sizeof(randkey); ++ii) for (size_t ii = 0; ii < sizeof(randkey); ++ii)
{ {
randkey.data[ii] = rand(); randkey.data[ii] = crypto::rand<uint8_t>();
} }
crypto::ElectrumWords::bytes_to_words(randkey, w_seed, language.get_language_name()); crypto::ElectrumWords::bytes_to_words(randkey, w_seed, language.get_language_name());
seed = std::string(w_seed.data(), w_seed.size()); seed = std::string(w_seed.data(), w_seed.size());
@ -256,4 +256,4 @@ TEST(mnemonics, partial_word_tolerance)
res = crypto::ElectrumWords::words_to_bytes(seed_1, key_1, language_name_1); res = crypto::ElectrumWords::words_to_bytes(seed_1, key_1, language_name_1);
ASSERT_EQ(true, res); ASSERT_EQ(true, res);
ASSERT_STREQ(language_name_1.c_str(), "English"); ASSERT_STREQ(language_name_1.c_str(), "English");
} }

4
tests/unit_tests/output_selection.cpp
View File

@ -138,7 +138,7 @@ TEST(select_outputs, density)
static const size_t NPICKS = 1000000; static const size_t NPICKS = 1000000;
std::vector<uint64_t> offsets; std::vector<uint64_t> offsets;
MKOFFSETS(300000, 1 + (rand() & 0x1f)); MKOFFSETS(300000, 1 + (crypto::rand<size_t>() & 0x1f));
tools::gamma_picker picker(offsets); tools::gamma_picker picker(offsets);
std::vector<int> picks(/*n_outs*/offsets.size(), 0); std::vector<int> picks(/*n_outs*/offsets.size(), 0);
@ -181,7 +181,7 @@ TEST(select_outputs, same_distribution)
static const size_t NPICKS = 1000000; static const size_t NPICKS = 1000000;
std::vector<uint64_t> offsets; std::vector<uint64_t> offsets;
MKOFFSETS(300000, 1 + (rand() & 0x1f)); MKOFFSETS(300000, 1 + (crypto::rand<size_t>() & 0x1f));
tools::gamma_picker picker(offsets); tools::gamma_picker picker(offsets);
std::vector<int> chain_picks(offsets.size(), 0); std::vector<int> chain_picks(offsets.size(), 0);

8
tests/unit_tests/rolling_median.cpp
View File

@ -69,7 +69,7 @@ TEST(rolling_median, series)
v.reserve(100); v.reserve(100);
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
{ {
uint64_t r = rand(); uint64_t r = crypto::rand<uint64_t>();
v.push_back(r); v.push_back(r);
if (v.size() > 100) if (v.size() > 100)
v.erase(v.begin()); v.erase(v.begin());
@ -87,7 +87,7 @@ TEST(rolling_median, clear_whole)
median.reserve(10000); median.reserve(10000);
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
{ {
random.push_back(rand()); random.push_back(crypto::rand<uint64_t>());
m.insert(random.back()); m.insert(random.back());
median.push_back(m.median()); median.push_back(m.median());
} }
@ -107,7 +107,7 @@ TEST(rolling_median, clear_partway)
median.reserve(10000); median.reserve(10000);
for (int i = 0; i < 10000; ++i) for (int i = 0; i < 10000; ++i)
{ {
random.push_back(rand()); random.push_back(crypto::rand<uint64_t>());
m.insert(random.back()); m.insert(random.back());
median.push_back(m.median()); median.push_back(m.median());
} }
@ -126,7 +126,7 @@ TEST(rolling_median, order)
random.reserve(1000); random.reserve(1000);
for (int i = 0; i < 1000; ++i) for (int i = 0; i < 1000; ++i)
{ {
random.push_back(rand()); random.push_back(crypto::rand<uint64_t>());
m.insert(random.back()); m.insert(random.back());
} }
const uint64_t med = m.median(); const uint64_t med = m.median();