Avoid unintentional unsigned integer wraparounds in tests

practicalswift · practicalswift · commit 2736c9e05ebd · 2018-02-23T08:10:42.000+01:00
diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp
@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt)
                 test.erase(InsecureRandRange(test.size()));
             }
             if (InsecureRandBits(3) == 2) {
-                int new_size = std::max<int>(0, std::min<int>(30, test.size() + (InsecureRandRange(5)) - 2));
+                int new_size = std::max(0, std::min(30, (int)test.size() + (int)InsecureRandRange(5) - 2));
                 test.resize(new_size);
             }
             if (InsecureRandBits(3) == 3) {
diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
@@ -56,8 +56,8 @@ BOOST_AUTO_TEST_CASE(manythreads)
     int counter[10] = { 0 };
     FastRandomContext rng(42);
     auto zeroToNine = [](FastRandomContext& rc) -> int { return rc.randrange(10); }; // [0, 9]
-    auto randomMsec = [](FastRandomContext& rc) -> int { return -11 + rc.randrange(1012); }; // [-11, 1000]
-    auto randomDelta = [](FastRandomContext& rc) -> int { return -1000 + rc.randrange(2001); }; // [-1000, 1000]
+    auto randomMsec = [](FastRandomContext& rc) -> int { return -11 + (int)rc.randrange(1012); }; // [-11, 1000]
+    auto randomDelta = [](FastRandomContext& rc) -> int { return -1000 + (int)rc.randrange(2001); }; // [-1000, 1000]
 
     boost::chrono::system_clock::time_point start = boost::chrono::system_clock::now();
     boost::chrono::system_clock::time_point now = start;
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     wtx.mapValue["comment"] = "y";
     {
         CMutableTransaction tx(*wtx.tx);
-        --tx.nLockTime;  // Just to change the hash :)
+        ++tx.nLockTime;  // Just to change the hash :)
         wtx.SetTx(MakeTransactionRef(std::move(tx)));
     }
     pwalletMain->AddToWallet(wtx);
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
     wtx.mapValue["comment"] = "x";
     {
         CMutableTransaction tx(*wtx.tx);
-        --tx.nLockTime;  // Just to change the hash :)
+        ++tx.nLockTime;  // Just to change the hash :)
         wtx.SetTx(MakeTransactionRef(std::move(tx)));
     }
     pwalletMain->AddToWallet(wtx);

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE(PrevectorTestInt)`
`206`	`206`	`test.erase(InsecureRandRange(test.size()));`
`207`	`207`	`}`
`208`	`208`	`if (InsecureRandBits(3) == 2) {`
`209`		`- int new_size = std::max<int>(0, std::min<int>(30, test.size() + (InsecureRandRange(5)) - 2));`
	`209`	`+ int new_size = std::max(0, std::min(30, (int)test.size() + (int)InsecureRandRange(5) - 2));`
`210`	`210`	`test.resize(new_size);`
`211`	`211`	`}`
`212`	`212`	`if (InsecureRandBits(3) == 3) {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)`
`82`	`82`	`wtx.mapValue["comment"] = "y";`
`83`	`83`	`{`
`84`	`84`	`CMutableTransaction tx(*wtx.tx);`
`85`		`- --tx.nLockTime; // Just to change the hash :)`
	`85`	`+ ++tx.nLockTime; // Just to change the hash :)`
`86`	`86`	`wtx.SetTx(MakeTransactionRef(std::move(tx)));`
`87`	`87`	`}`
`88`	`88`	`pwalletMain->AddToWallet(wtx);`
`@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)`
`92`	`92`	`wtx.mapValue["comment"] = "x";`
`93`	`93`	`{`
`94`	`94`	`CMutableTransaction tx(*wtx.tx);`
`95`		`- --tx.nLockTime; // Just to change the hash :)`
	`95`	`+ ++tx.nLockTime; // Just to change the hash :)`
`96`	`96`	`wtx.SetTx(MakeTransactionRef(std::move(tx)));`
`97`	`97`	`}`
`98`	`98`	`pwalletMain->AddToWallet(wtx);`