Browse Source

[tests] Avoid redundant assignments. Remove unused variables.

0.16
practicalswift 7 years ago
parent
commit
49eb0916da
  1. 6
      src/test/scriptnum_tests.cpp
  2. 6
      src/test/sighash_tests.cpp

6
src/test/scriptnum_tests.cpp

@ -29,10 +29,7 @@ static void CheckCreateVch(const int64_t& num)
CScriptNum scriptnum(num); CScriptNum scriptnum(num);
BOOST_CHECK(verify(bignum, scriptnum)); BOOST_CHECK(verify(bignum, scriptnum));
std::vector<unsigned char> vch = bignum.getvch();
CScriptNum10 bignum2(bignum.getvch(), false); CScriptNum10 bignum2(bignum.getvch(), false);
vch = scriptnum.getvch();
CScriptNum scriptnum2(scriptnum.getvch(), false); CScriptNum scriptnum2(scriptnum.getvch(), false);
BOOST_CHECK(verify(bignum2, scriptnum2)); BOOST_CHECK(verify(bignum2, scriptnum2));
@ -90,10 +87,9 @@ static void CheckSubtract(const int64_t& num1, const int64_t& num2)
const CScriptNum10 bignum2(num2); const CScriptNum10 bignum2(num2);
const CScriptNum scriptnum1(num1); const CScriptNum scriptnum1(num1);
const CScriptNum scriptnum2(num2); const CScriptNum scriptnum2(num2);
bool invalid = false;
// int64_t overflow is undefined. // int64_t overflow is undefined.
invalid = ((num2 > 0 && num1 < std::numeric_limits<int64_t>::min() + num2) || bool invalid = ((num2 > 0 && num1 < std::numeric_limits<int64_t>::min() + num2) ||
(num2 < 0 && num1 > std::numeric_limits<int64_t>::max() + num2)); (num2 < 0 && num1 > std::numeric_limits<int64_t>::max() + num2));
if (!invalid) if (!invalid)
{ {

6
src/test/sighash_tests.cpp

@ -124,11 +124,9 @@ BOOST_AUTO_TEST_CASE(sighash_test)
#if defined(PRINT_SIGHASH_JSON) #if defined(PRINT_SIGHASH_JSON)
std::cout << "[\n"; std::cout << "[\n";
std::cout << "\t[\"raw_transaction, script, input_index, hashType, signature_hash (result)\"],\n"; std::cout << "\t[\"raw_transaction, script, input_index, hashType, signature_hash (result)\"],\n";
#endif int nRandomTests = 500;
#else
int nRandomTests = 50000; int nRandomTests = 50000;
#if defined(PRINT_SIGHASH_JSON)
nRandomTests = 500;
#endif #endif
for (int i=0; i<nRandomTests; i++) { for (int i=0; i<nRandomTests; i++) {
int nHashType = InsecureRand32(); int nHashType = InsecureRand32();

Loading…
Cancel
Save