LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

changed unit test to deterministic rand

Browse source
This commit is contained in:
Brannon King 2019-07-02 00:15:27 -06:00
parent cce0fde619
commit 3d9e8f595f
2 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/test/claimtriebranching_tests.cpp
View file

@ -12,6 +12,7 @@
#include <policy/policy.h> #include <policy/policy.h>
#include <pow.h> #include <pow.h>
#include <primitives/transaction.h> #include <primitives/transaction.h>
#include <random.h>
#include <rpc/server.h> #include <rpc/server.h>
#include <streams.h> #include <streams.h>
#include <test/test_bitcoin.h> #include <test/test_bitcoin.h>
@ -20,7 +21,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <iostream> #include <iostream>
#include <random>
extern ::CChainState g_chainstate; extern ::CChainState g_chainstate;
extern ::ArgsManager gArgs; extern ::ArgsManager gArgs;
@ -447,9 +447,7 @@ BOOST_AUTO_TEST_CASE(triehash_fuzzer_test)
auto names = random_strings(blocks * claimsPerBlock); auto names = random_strings(blocks * claimsPerBlock);
std::mt19937 rg(42); FastRandomContext frc(true);
std::uniform_int_distribution<int> pick4(0, 4);
std::uniform_int_distribution<std::size_t> pick;
std::unordered_map<std::string, std::vector<CMutableTransaction>> existingClaims; std::unordered_map<std::string, std::vector<CMutableTransaction>> existingClaims;
std::vector<CMutableTransaction> existingSupports; std::vector<CMutableTransaction> existingSupports;
std::string value(1024, 'c'); std::string value(1024, 'c');
@ -458,18 +456,18 @@ BOOST_AUTO_TEST_CASE(triehash_fuzzer_test)
for (int i = 0; i < blocks; ++i) { for (int i = 0; i < blocks; ++i) {
for (int j = 0; j < claimsPerBlock; ++j) { for (int j = 0; j < claimsPerBlock; ++j) {
auto name = names[i * claimsPerBlock + j]; auto name = names[i * claimsPerBlock + j];
auto supportFront = pick4(rg) == 0; auto supportFront = frc.randrange(4) == 0;
auto supportBack = pick4(rg) == 0; auto supportBack = frc.randrange(4) == 0;
auto removeClaim = pick4(rg) == 0; auto removeClaim = frc.randrange(4) == 0;
auto removeSupport = pick4(rg) == 0; auto removeSupport = frc.randrange(4) == 0;
auto hit = existingClaims.find(name); auto hit = existingClaims.find(name);
if (supportFront && hit != existingClaims.end() && hit->second.size()) { if (supportFront && hit != existingClaims.end() && hit->second.size()) {
auto tx = fixture.MakeSupport(cb.back(), hit->second[pick(rg) % hit->second.size()], name, 2); auto tx = fixture.MakeSupport(cb.back(), hit->second[frc.rand64() % hit->second.size()], name, 2);
existingSupports.push_back(tx); existingSupports.push_back(tx);
cb.emplace_back(std::move(tx)); cb.emplace_back(std::move(tx));
} }
if (removeClaim && hit != existingClaims.end() && hit->second.size()) { if (removeClaim && hit != existingClaims.end() && hit->second.size()) {
auto idx = pick(rg) % hit->second.size(); auto idx = frc.rand64() % hit->second.size();
fixture.Spend(hit->second[idx]); fixture.Spend(hit->second[idx]);
hit->second.erase(hit->second.begin() + idx); hit->second.erase(hit->second.begin() + idx);
} }
@ -480,12 +478,12 @@ BOOST_AUTO_TEST_CASE(triehash_fuzzer_test)
cb.emplace_back(std::move(tx)); cb.emplace_back(std::move(tx));
} }
if (supportBack && hit != existingClaims.end() && hit->second.size()) { if (supportBack && hit != existingClaims.end() && hit->second.size()) {
auto tx = fixture.MakeSupport(cb.back(), hit->second[pick(rg) % hit->second.size()], name, 2); auto tx = fixture.MakeSupport(cb.back(), hit->second[frc.rand64() % hit->second.size()], name, 2);
existingSupports.push_back(tx); existingSupports.push_back(tx);
cb.emplace_back(std::move(tx)); cb.emplace_back(std::move(tx));
} }
if (removeSupport && (i & 7) == 7 && !existingSupports.empty()) { if (removeSupport && (i & 7) == 7 && !existingSupports.empty()) {
const auto tidx = pick(rg) % existingSupports.size(); const auto tidx = frc.rand64() % existingSupports.size();
const auto tx = existingSupports[tidx]; const auto tx = existingSupports[tidx];
fixture.Spend(tx); fixture.Spend(tx);
existingSupports.erase(existingSupports.begin() + tidx); existingSupports.erase(existingSupports.begin() + tidx);
@ -499,9 +497,9 @@ BOOST_AUTO_TEST_CASE(triehash_fuzzer_test)
} }
if (blocks == 1000 && claimsPerBlock == 100) if (blocks == 1000 && claimsPerBlock == 100)
BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "2fa882317f6ce4a083d4a933c090f280294b13d772a340e3e4b53b77e313f4a6"); BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "c5df693adbe6b386a5d1e494e83a8f5745f32f6917a32b4f429e7c20b47171dd");
else if (blocks == 13 && claimsPerBlock == 100) else if (blocks == 13 && claimsPerBlock == 100)
BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "f487872e1aa9df2b1b94e16c98c93045f49edd274b355a4d5d2ce7c6e4fe183d"); BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "4e5984d6984f5f05d50e821e6228d56bcfbd16ca2093cd0308f6ff1c2bc8689a");
else else
std::cerr << "Hash: " << fixture.getMerkleHash().GetHex() << std::endl; std::cerr << "Hash: " << fixture.getMerkleHash().GetHex() << std::endl;
} }

11
src/test/prefixtrie_tests.cpp
View file

@ -1,11 +1,11 @@
#include <claimtrie.h> #include <claimtrie.h>
#include <prefixtrie.h> #include <prefixtrie.h>
#include <random.h>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <test/test_bitcoin.h> #include <test/test_bitcoin.h>
#include <chrono> #include <chrono>
#include <random>
std::vector<std::string> random_strings(std::size_t count) std::vector<std::string> random_strings(std::size_t count)
{ {
@ -13,26 +13,25 @@ std::vector<std::string> random_strings(std::size_t count)
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"; "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
std::mt19937 rg(42); FastRandomContext frc(true);
std::uniform_int_distribution<std::string::size_type> pick(1, sizeof(chrs) - 2);
std::unordered_set<std::string> strings; std::unordered_set<std::string> strings;
strings.reserve(count); strings.reserve(count);
while(strings.size() < count) { while(strings.size() < count) {
auto length = pick(rg); auto length = frc.randrange(sizeof(chrs) - 2) + 1;
std::string s; std::string s;
s.reserve(length); s.reserve(length);
while (length--) while (length--)
s += chrs[pick(rg)]; s += chrs[frc.randrange(sizeof(chrs) - 1)];
strings.emplace(s); strings.emplace(s);
} }
std::vector<std::string> ret(strings.begin(), strings.end()); std::vector<std::string> ret(strings.begin(), strings.end());
std::shuffle(ret.begin(), ret.end(), rg); std::random_shuffle(ret.begin(), ret.end(), [&frc](std::size_t n) { return frc.randrange(n); });
return ret; return ret;
} }