fix: revert consensus error changes, fix tests instead

Author: UdjinM6

src/test/txvalidation_tests.cpp

@@ -15,6 +15,12 @@
 #include <boost/test/unit_test.hpp>
 
 
+struct TestChain100NoDIP0001Setup : public TestChain100Setup {
+    TestChain100NoDIP0001Setup()
+        : TestChain100Setup{{"-testactivationheight=dip0001@2000"}} {}
+};
+
+
 BOOST_AUTO_TEST_SUITE(txvalidation_tests)
 
 /**
@@ -69,7 +75,7 @@ inline CTransactionRef create_placeholder_tx(size_t num_inputs, size_t num_outpu
     return MakeTransactionRef(mtx);
 }
 
-BOOST_FIXTURE_TEST_CASE(package_tests, TestChain100Setup)
+BOOST_FIXTURE_TEST_CASE(package_tests, TestChain100NoDIP0001Setup)
 {
     LOCK(cs_main);
     unsigned int initialPoolSize = m_node.mempool->size();

src/validation.cpp

@@ -318,7 +318,7 @@ static bool ContextualCheckTransaction(const CTransaction& tx, TxValidationState
 
     // Size limits
     if (fDIP0001Active_context && ::GetSerializeSize(tx, PROTOCOL_VERSION) > MAX_STANDARD_TX_SIZE)
-        return state.Invalid(TxValidationResult::TX_CONSENSUS, "tx-size");
+        return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-oversize");
 
     return true;
 }

test/functional/mempool_accept.py

@@ -41,7 +41,7 @@ class MempoolAcceptanceTest(BitcoinTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.extra_args = [[
-            '-txindex','-permitbaremultisig=0',
+            '-txindex','-permitbaremultisig=0', '-testactivationheight=dip0001@2000',
         ]] * self.num_nodes
         self.supports_cli = False