Unit tests

Author: panleone

src/test/test_pivx.cpp

@@ -201,15 +201,16 @@ CBlock TestChainSetup::CreateBlock(const std::vector<CMutableTransaction>& txns,
                                    CBlockIndex* customPrevBlock)
 {
     std::unique_ptr<CBlockTemplate> pblocktemplate = BlockAssembler(
-            Params(), DEFAULT_PRINTPRIORITY).CreateNewBlock(scriptPubKey,
-                                                            nullptr,       // wallet
-                                                            false,   // fProofOfStake
-                                                            nullptr, // availableCoins
-                                                            fNoMempoolTx,
-                                                            fTestBlockValidity,
-                                                            customPrevBlock,
-                                                            true,
-                                                            fIncludeQfc);
+        Params(), DEFAULT_PRINTPRIORITY)
+                                                         .CreateNewBlock(scriptPubKey,
+                                                             nullptr, // wallet
+                                                             false,   // fProofOfStake
+                                                             {},      // availableCoins
+                                                             fNoMempoolTx,
+                                                             fTestBlockValidity,
+                                                             customPrevBlock,
+                                                             true,
+                                                             fIncludeQfc);
     std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>(pblocktemplate->block);
 
     // Add passed-in txns:

src/test/validation_tests.cpp

@@ -77,7 +77,7 @@ BOOST_FIXTURE_TEST_CASE(test_simple_shielded_invalid, TestingSetup)
         CMutableTransaction newTx(tx);
         CValidationState state;
 
-        // Create a coinstake transaction
+        // Create a mixed transaction with an empty vout and sapling data (so it isn't neither coinstake nor coinshieldstake)
         CTxIn vin;
         vin.prevout = COutPoint(UINT256_ZERO, 0);
         newTx.vin.emplace_back(vin);
@@ -90,7 +90,7 @@ BOOST_FIXTURE_TEST_CASE(test_simple_shielded_invalid, TestingSetup)
         newTx.sapData->vShieldedSpend.emplace_back();
 
         BOOST_CHECK(!CheckTransaction(newTx, state, false));
-        BOOST_CHECK(state.GetRejectReason() == "bad-txns-invalid-sapling");
+        BOOST_CHECK(state.GetRejectReason() == "bad-txns-vout-empty");
     }
 }