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