From 124d13a58cdcd9f66eeffc7e6281e3eb129e3398 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Tue, 23 May 2017 15:09:30 -0700 Subject: Merge test_random.h into test_bitcoin.h --- src/test/prevector_tests.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/test/prevector_tests.cpp') diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index cfed5e347..45bcac683 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -9,7 +9,6 @@ #include "streams.h" #include "test/test_bitcoin.h" -#include "test/test_random.h" #include -- cgit v1.2.3 From efee1db21a652019e0ab18fffc233d91bb7f1816 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Tue, 23 May 2017 15:28:45 -0700 Subject: scripted-diff: use insecure_rand256/randrange more -BEGIN VERIFY SCRIPT- sed -i "s/\> 4) % 8) == 2) { - int new_size = std::max(0, std::min(30, test.size() + (insecure_rand() % 5) - 2)); + int new_size = std::max(0, std::min(30, test.size() + (insecure_randrange(5)) - 2)); test.resize(new_size); } if (((r >> 7) % 8) == 3) { - test.insert(insecure_rand() % (test.size() + 1), 1 + (insecure_rand() % 2), insecure_rand()); + test.insert(insecure_rand() % (test.size() + 1), 1 + (insecure_randrange(2)), insecure_rand()); } if (((r >> 10) % 8) == 4) { - int del = std::min(test.size(), 1 + (insecure_rand() % 2)); + int del = std::min(test.size(), 1 + (insecure_randrange(2))); int beg = insecure_rand() % (test.size() + 1 - del); test.erase(beg, beg + del); } @@ -225,20 +225,20 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) } if (((r >> 21) % 32) == 7) { int values[4]; - int num = 1 + (insecure_rand() % 4); + int num = 1 + (insecure_randrange(4)); for (int k = 0; k < num; k++) { values[k] = insecure_rand(); } test.insert_range(insecure_rand() % (test.size() + 1), values, values + num); } if (((r >> 26) % 32) == 8) { - int del = std::min(test.size(), 1 + (insecure_rand() % 4)); + int del = std::min(test.size(), 1 + (insecure_randrange(4))); int beg = insecure_rand() % (test.size() + 1 - del); test.erase(beg, beg + del); } r = insecure_rand(); if (r % 32 == 9) { - test.reserve(insecure_rand() % 32); + test.reserve(insecure_randrange(32)); } if ((r >> 5) % 64 == 10) { test.shrink_to_fit(); @@ -250,7 +250,7 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) test.clear(); } if (((r >> 21) % 512) == 12) { - test.assign(insecure_rand() % 32, insecure_rand()); + test.assign(insecure_randrange(32), insecure_rand()); } if (((r >> 15) % 8) == 3) { test.swap(); -- cgit v1.2.3 From 3ecabae36364e905e7821fba3e60aa7f8418de6c Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Wed, 7 Jun 2017 11:34:55 -0700 Subject: Replace more rand() % NUM by randranges --- src/test/prevector_tests.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/test/prevector_tests.cpp') diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index 28f72a9b9..d951a6c3c 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -200,21 +200,21 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) for (int i = 0; i < 2048; i++) { int r = insecure_rand(); if ((r % 4) == 0) { - test.insert(insecure_rand() % (test.size() + 1), insecure_rand()); + test.insert(insecure_randrange(test.size() + 1), insecure_rand()); } if (test.size() > 0 && ((r >> 2) % 4) == 1) { - test.erase(insecure_rand() % test.size()); + test.erase(insecure_randrange(test.size())); } if (((r >> 4) % 8) == 2) { int new_size = std::max(0, std::min(30, test.size() + (insecure_randrange(5)) - 2)); test.resize(new_size); } if (((r >> 7) % 8) == 3) { - test.insert(insecure_rand() % (test.size() + 1), 1 + (insecure_randrange(2)), insecure_rand()); + test.insert(insecure_randrange(test.size() + 1), 1 + insecure_randrange(2), insecure_rand()); } if (((r >> 10) % 8) == 4) { int del = std::min(test.size(), 1 + (insecure_randrange(2))); - int beg = insecure_rand() % (test.size() + 1 - del); + int beg = insecure_randrange(test.size() + 1 - del); test.erase(beg, beg + del); } if (((r >> 13) % 16) == 5) { @@ -229,11 +229,11 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) for (int k = 0; k < num; k++) { values[k] = insecure_rand(); } - test.insert_range(insecure_rand() % (test.size() + 1), values, values + num); + test.insert_range(insecure_randrange(test.size() + 1), values, values + num); } if (((r >> 26) % 32) == 8) { int del = std::min(test.size(), 1 + (insecure_randrange(4))); - int beg = insecure_rand() % (test.size() + 1 - del); + int beg = insecure_randrange(test.size() + 1 - del); test.erase(beg, beg + del); } r = insecure_rand(); @@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) test.shrink_to_fit(); } if (test.size() > 0) { - test.update(insecure_rand() % test.size(), insecure_rand()); + test.update(insecure_randrange(test.size()), insecure_rand()); } if (((r >> 11) % 1024) == 11) { test.clear(); -- cgit v1.2.3 From 2ada67852174a76753080d65a7adbe27241a9caa Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Tue, 23 May 2017 16:14:51 -0700 Subject: Use randbits instead of ad-hoc emulation in prevector tests --- src/test/prevector_tests.cpp | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'src/test/prevector_tests.cpp') diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index d951a6c3c..674221e00 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -198,32 +198,31 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) for (int j = 0; j < 64; j++) { prevector_tester<8, int> test; for (int i = 0; i < 2048; i++) { - int r = insecure_rand(); - if ((r % 4) == 0) { + if (insecure_randbits(2) == 0) { test.insert(insecure_randrange(test.size() + 1), insecure_rand()); } - if (test.size() > 0 && ((r >> 2) % 4) == 1) { + if (test.size() > 0 && insecure_randbits(2) == 1) { test.erase(insecure_randrange(test.size())); } - if (((r >> 4) % 8) == 2) { + if (insecure_randbits(3) == 2) { int new_size = std::max(0, std::min(30, test.size() + (insecure_randrange(5)) - 2)); test.resize(new_size); } - if (((r >> 7) % 8) == 3) { + if (insecure_randbits(3) == 3) { test.insert(insecure_randrange(test.size() + 1), 1 + insecure_randrange(2), insecure_rand()); } - if (((r >> 10) % 8) == 4) { + if (insecure_randbits(3) == 4) { int del = std::min(test.size(), 1 + (insecure_randrange(2))); int beg = insecure_randrange(test.size() + 1 - del); test.erase(beg, beg + del); } - if (((r >> 13) % 16) == 5) { + if (insecure_randbits(4) == 5) { test.push_back(insecure_rand()); } - if (test.size() > 0 && ((r >> 17) % 16) == 6) { + if (test.size() > 0 && insecure_randbits(4) == 6) { test.pop_back(); } - if (((r >> 21) % 32) == 7) { + if (insecure_randbits(5) == 7) { int values[4]; int num = 1 + (insecure_randrange(4)); for (int k = 0; k < num; k++) { @@ -231,34 +230,33 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) } test.insert_range(insecure_randrange(test.size() + 1), values, values + num); } - if (((r >> 26) % 32) == 8) { + if (insecure_randbits(5) == 8) { int del = std::min(test.size(), 1 + (insecure_randrange(4))); int beg = insecure_randrange(test.size() + 1 - del); test.erase(beg, beg + del); } - r = insecure_rand(); - if (r % 32 == 9) { + if (insecure_randbits(5) == 9) { test.reserve(insecure_randrange(32)); } - if ((r >> 5) % 64 == 10) { + if (insecure_randbits(6) == 10) { test.shrink_to_fit(); } if (test.size() > 0) { test.update(insecure_randrange(test.size()), insecure_rand()); } - if (((r >> 11) % 1024) == 11) { + if (insecure_randbits(10) == 11) { test.clear(); } - if (((r >> 21) % 512) == 12) { + if (insecure_randbits(9) == 12) { test.assign(insecure_randrange(32), insecure_rand()); } - if (((r >> 15) % 8) == 3) { + if (insecure_randbits(3) == 3) { test.swap(); } - if (((r >> 15) % 16) == 8) { + if (insecure_randbits(4) == 8) { test.copy(); } - if (((r >> 15) % 32) == 18) { + if (insecure_randbits(5) == 18) { test.move(); } } -- cgit v1.2.3 From 2fcd9cc86bfce944e3312e9a24685403250f3bdc Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Tue, 23 May 2017 16:18:06 -0700 Subject: scripted-diff: Use randbits/bool instead of randrange where possible -BEGIN VERIFY SCRIPT- sed -i 's/insecure_randbits(1)/insecure_randbool()/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(2)/insecure_randbool()/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(4)/insecure_randbits(2)/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(32)/insecure_randbits(5)/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(256)/insecure_randbits(8)/g' src/test/*_tests.cpp -END VERIFY SCRIPT- --- src/test/prevector_tests.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test/prevector_tests.cpp') diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index 674221e00..5d9d18726 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -209,10 +209,10 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) test.resize(new_size); } if (insecure_randbits(3) == 3) { - test.insert(insecure_randrange(test.size() + 1), 1 + insecure_randrange(2), insecure_rand()); + test.insert(insecure_randrange(test.size() + 1), 1 + insecure_randbool(), insecure_rand()); } if (insecure_randbits(3) == 4) { - int del = std::min(test.size(), 1 + (insecure_randrange(2))); + int del = std::min(test.size(), 1 + (insecure_randbool())); int beg = insecure_randrange(test.size() + 1 - del); test.erase(beg, beg + del); } @@ -224,19 +224,19 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) } if (insecure_randbits(5) == 7) { int values[4]; - int num = 1 + (insecure_randrange(4)); + int num = 1 + (insecure_randbits(2)); for (int k = 0; k < num; k++) { values[k] = insecure_rand(); } test.insert_range(insecure_randrange(test.size() + 1), values, values + num); } if (insecure_randbits(5) == 8) { - int del = std::min(test.size(), 1 + (insecure_randrange(4))); + int del = std::min(test.size(), 1 + (insecure_randbits(2))); int beg = insecure_randrange(test.size() + 1 - del); test.erase(beg, beg + del); } if (insecure_randbits(5) == 9) { - test.reserve(insecure_randrange(32)); + test.reserve(insecure_randbits(5)); } if (insecure_randbits(6) == 10) { test.shrink_to_fit(); @@ -248,7 +248,7 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt) test.clear(); } if (insecure_randbits(9) == 12) { - test.assign(insecure_randrange(32), insecure_rand()); + test.assign(insecure_randbits(5), insecure_rand()); } if (insecure_randbits(3) == 3) { test.swap(); -- cgit v1.2.3 From e945848582160b23fa0bc6f797e2bd8ac676ee0e Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Wed, 7 Jun 2017 12:03:17 -0700 Subject: scripted-diff: Use new naming style for insecure_rand* functions -BEGIN VERIFY SCRIPT- sed -i 's/\ test; for (int i = 0; i < 2048; i++) { - if (insecure_randbits(2) == 0) { - test.insert(insecure_randrange(test.size() + 1), insecure_rand()); + if (InsecureRandBits(2) == 0) { + test.insert(InsecureRandRange(test.size() + 1), InsecureRand32()); } - if (test.size() > 0 && insecure_randbits(2) == 1) { - test.erase(insecure_randrange(test.size())); + if (test.size() > 0 && InsecureRandBits(2) == 1) { + test.erase(InsecureRandRange(test.size())); } - if (insecure_randbits(3) == 2) { - int new_size = std::max(0, std::min(30, test.size() + (insecure_randrange(5)) - 2)); + if (InsecureRandBits(3) == 2) { + int new_size = std::max(0, std::min(30, test.size() + (InsecureRandRange(5)) - 2)); test.resize(new_size); } - if (insecure_randbits(3) == 3) { - test.insert(insecure_randrange(test.size() + 1), 1 + insecure_randbool(), insecure_rand()); + if (InsecureRandBits(3) == 3) { + test.insert(InsecureRandRange(test.size() + 1), 1 + InsecureRandBool(), InsecureRand32()); } - if (insecure_randbits(3) == 4) { - int del = std::min(test.size(), 1 + (insecure_randbool())); - int beg = insecure_randrange(test.size() + 1 - del); + if (InsecureRandBits(3) == 4) { + int del = std::min(test.size(), 1 + (InsecureRandBool())); + int beg = InsecureRandRange(test.size() + 1 - del); test.erase(beg, beg + del); } - if (insecure_randbits(4) == 5) { - test.push_back(insecure_rand()); + if (InsecureRandBits(4) == 5) { + test.push_back(InsecureRand32()); } - if (test.size() > 0 && insecure_randbits(4) == 6) { + if (test.size() > 0 && InsecureRandBits(4) == 6) { test.pop_back(); } - if (insecure_randbits(5) == 7) { + if (InsecureRandBits(5) == 7) { int values[4]; - int num = 1 + (insecure_randbits(2)); + int num = 1 + (InsecureRandBits(2)); for (int k = 0; k < num; k++) { - values[k] = insecure_rand(); + values[k] = InsecureRand32(); } - test.insert_range(insecure_randrange(test.size() + 1), values, values + num); + test.insert_range(InsecureRandRange(test.size() + 1), values, values + num); } - if (insecure_randbits(5) == 8) { - int del = std::min(test.size(), 1 + (insecure_randbits(2))); - int beg = insecure_randrange(test.size() + 1 - del); + if (InsecureRandBits(5) == 8) { + int del = std::min(test.size(), 1 + (InsecureRandBits(2))); + int beg = InsecureRandRange(test.size() + 1 - del); test.erase(beg, beg + del); } - if (insecure_randbits(5) == 9) { - test.reserve(insecure_randbits(5)); + if (InsecureRandBits(5) == 9) { + test.reserve(InsecureRandBits(5)); } - if (insecure_randbits(6) == 10) { + if (InsecureRandBits(6) == 10) { test.shrink_to_fit(); } if (test.size() > 0) { - test.update(insecure_randrange(test.size()), insecure_rand()); + test.update(InsecureRandRange(test.size()), InsecureRand32()); } - if (insecure_randbits(10) == 11) { + if (InsecureRandBits(10) == 11) { test.clear(); } - if (insecure_randbits(9) == 12) { - test.assign(insecure_randbits(5), insecure_rand()); + if (InsecureRandBits(9) == 12) { + test.assign(InsecureRandBits(5), InsecureRand32()); } - if (insecure_randbits(3) == 3) { + if (InsecureRandBits(3) == 3) { test.swap(); } - if (insecure_randbits(4) == 8) { + if (InsecureRandBits(4) == 8) { test.copy(); } - if (insecure_randbits(5) == 18) { + if (InsecureRandBits(5) == 18) { test.move(); } } -- cgit v1.2.3