Fix non-deterministic coverage of test DoS_mapOrphans

PIVX-Project · Apr 14, 2021 · 22a7121 · 22a7121
1 parent 79e7fd3
commit 22a7121
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/contrib/devtools/test_deterministic_coverage.sh b/contrib/devtools/test_deterministic_coverage.sh
@@ -14,7 +14,7 @@ GCOV_EXECUTABLE="gcov"
 
 # Disable tests known to cause non-deterministic behaviour and document the source or point of non-determinism.
 NON_DETERMINISTIC_TESTS=(
-    "DoS_tests/DoS_mapOrphans"                        # RandomOrphan()
+    "dummy_tests"                                # We currently don't have any unit tests that have determinism issues
 )
 
 TEST_BITCOIN_BINARY="src/test/test_pivx"

diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
@@ -9,9 +9,11 @@
 
 #include "test/test_pivx.h"
 
+#include "arith_uint256.h"
 #include "keystore.h"
 #include "net_processing.h"
 #include "net.h"
+#include "pubkey.h"
 #include "pow.h"
 #include "script/sign.h"
 #include "serialize.h"
@@ -139,10 +141,26 @@ CTransactionRef RandomOrphan()
     return it->second.tx;
 }
 
+static void MakeNewKeyWithFastRandomContext(CKey& key)
+{
+    std::vector<unsigned char> keydata;
+    keydata = insecure_rand_ctx.randbytes(32);
+    key.Set(keydata.data(), keydata.data() + keydata.size(), /*fCompressedIn*/ true);
+    assert(key.IsValid());
+}
+
 BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
 {
+    // This test had non-deterministic coverage due to
+    // randomly selected seeds.
+    // This seed is chosen so that all branches of the function
+    // ecdsa_signature_parse_der_lax are executed during this test.
+    // Specifically branches that run only when an ECDSA
+    // signature's R and S values have leading zeros.
+    insecure_rand_ctx = FastRandomContext(ArithToUint256(arith_uint256(33)));
+
     CKey key;
-    key.MakeNewKey(true);
+    MakeNewKeyWithFastRandomContext(key);
     CBasicKeyStore keystore;
     keystore.AddKey(key);