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

Merge pull request #5727

Browse Source 
7b9a420 Replace std::random_shuffle with std::shuffle (tomsmeding)
This commit is contained in:
luigi1111 2019-08-19 17:31:39 -05:00
commit f205d28e96
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptonote_core/cryptonote_tx_utils.cpp
View File

@ -354,7 +354,7 @@ namespace cryptonote
if (shuffle_outs) if (shuffle_outs)
{ {
std::shuffle(destinations.begin(), destinations.end(), std::default_random_engine(crypto::rand<unsigned int>())); std::shuffle(destinations.begin(), destinations.end(), crypto::random_device{});
} }
// sort ins by their key image // sort ins by their key image

2
src/p2p/net_peerlist.h
View File

@ -293,7 +293,7 @@ namespace nodetool
if (anonymize) if (anonymize)
{ {
std::random_shuffle(bs_head.begin(), bs_head.end()); std::shuffle(bs_head.begin(), bs_head.end(), crypto::random_device{});
if (bs_head.size() > depth) if (bs_head.size() > depth)
bs_head.resize(depth); bs_head.resize(depth);
for (auto &e: bs_head) for (auto &e: bs_head)

4
src/wallet/wallet2.cpp
View File

@ -7450,7 +7450,7 @@ void wallet2::light_wallet_get_outs(std::vector<std::vector<tools::wallet2::get_
order.resize(light_wallet_requested_outputs_count); order.resize(light_wallet_requested_outputs_count);
for (size_t n = 0; n < order.size(); ++n) for (size_t n = 0; n < order.size(); ++n)
order[n] = n; order[n] = n;
std::shuffle(order.begin(), order.end(), std::default_random_engine(crypto::rand<unsigned>())); std::shuffle(order.begin(), order.end(), crypto::random_device{});
LOG_PRINT_L2("Looking for " << (fake_outputs_count+1) << " outputs with amounts " << print_money(td.is_rct() ? 0 : td.amount())); LOG_PRINT_L2("Looking for " << (fake_outputs_count+1) << " outputs with amounts " << print_money(td.is_rct() ? 0 : td.amount()));
@ -8025,7 +8025,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
order.resize(requested_outputs_count); order.resize(requested_outputs_count);
for (size_t n = 0; n < order.size(); ++n) for (size_t n = 0; n < order.size(); ++n)
order[n] = n; order[n] = n;
std::shuffle(order.begin(), order.end(), std::default_random_engine(crypto::rand<unsigned>())); std::shuffle(order.begin(), order.end(), crypto::random_device{});
LOG_PRINT_L2("Looking for " << (fake_outputs_count+1) << " outputs of size " << print_money(td.is_rct() ? 0 : td.amount())); LOG_PRINT_L2("Looking for " << (fake_outputs_count+1) << " outputs of size " << print_money(td.is_rct() ? 0 : td.amount()));
for (size_t o = 0; o < requested_outputs_count && outs.back().size() < fake_outputs_count + 1; ++o) for (size_t o = 0; o < requested_outputs_count && outs.back().size() < fake_outputs_count + 1; ++o)

4
tests/unit_tests/ringct.cpp
View File

@ -779,8 +779,8 @@ TEST(ringct, range_proofs_accept_very_long_simple)
inputs[n] = n; inputs[n] = n;
outputs[n] = n; outputs[n] = n;
} }
std::random_shuffle(inputs, inputs + N); std::shuffle(inputs, inputs + N, crypto::random_device{});
std::random_shuffle(outputs, outputs + N); std::shuffle(outputs, outputs + N, crypto::random_device{});
EXPECT_TRUE(range_proof_test(true, NELTS(inputs), inputs, NELTS(outputs), outputs, false, true)); EXPECT_TRUE(range_proof_test(true, NELTS(inputs), inputs, NELTS(outputs), outputs, false, true));
} }

2
tests/unit_tests/rolling_median.cpp
View File

@ -143,7 +143,7 @@ TEST(rolling_median, order)
m.insert(random[i]); m.insert(random[i]);
ASSERT_EQ(med, m.median()); ASSERT_EQ(med, m.median());
std::shuffle(random.begin(), random.end(), std::default_random_engine(crypto::rand<unsigned>())); std::shuffle(random.begin(), random.end(), crypto::random_device{});
m.clear(); m.clear();
for (int i = 0; i < 1000; ++i) for (int i = 0; i < 1000; ++i)
m.insert(random[i]); m.insert(random[i]);