Merge bitcoin/bitcoin#32591: test: fix and augment block tests of invalid_txs

8fcd684 test: ensure reason is checked for invalid blocks rejection (Greg Sanders)
1a689a2 test: fix block tests of invalid_txs (Greg Sanders)

Pull request description:

  We are not actually testing some cases accidentally, for block inclusion.

  Issue discovered while reviewing bitcoin/bitcoin#32533

ACKs for top commit:
  maflcko:
    review ACK 8fcd684 🔶
  theStack:
    ACK 8fcd684
  BrandonOdiwuor:
    Code Review ACK 8fcd684
  TheCharlatan:
    ACK 8fcd684

Tree-SHA512: 7e79ea35b64f56b29811b29df5752945cb10ec62465b385be5e4e2d295c3237b15d5dacf9e99661346967e84899da6fc82e3d2bd0ef6e5c51da85247da31e26a

Author: fanquake

test/functional/data/invalid_txs.py

@@ -138,6 +138,8 @@ class BadInputOutpointIndex(BadTxTemplate):
     # Won't be rejected - nonexistent outpoint index is treated as an orphan since the coins
     # database can't distinguish between spent outpoints and outpoints which never existed.
     reject_reason = None
+    # But fails in block
+    block_reject_reason = "bad-txns-inputs-missingorspent"
     expect_disconnect = False
 
     def get_tx(self):
@@ -180,6 +182,8 @@ def get_tx(self):
 class NonexistentInput(BadTxTemplate):
     reject_reason = None  # Added as an orphan tx.
     expect_disconnect = False
+    # But fails in block
+    block_reject_reason = "bad-txns-inputs-missingorspent"
 
     def get_tx(self):
         tx = CTransaction()
@@ -229,7 +233,6 @@ def get_tx(self):
 class InvalidOPIFConstruction(BadTxTemplate):
     reject_reason = "mandatory-script-verify-flag-failed (Invalid OP_IF construction)"
     expect_disconnect = True
-    valid_in_block = True
 
     def get_tx(self):
         return create_tx_with_script(
@@ -278,7 +281,7 @@ def get_tx(self):
         'reject_reason': "disabled opcode",
         'expect_disconnect': True,
         'get_tx': get_tx,
-        'valid_in_block' : True
+        'valid_in_block' : False
         })
 
 class NonStandardAndInvalid(BadTxTemplate):

test/functional/feature_block.py

@@ -153,9 +153,16 @@ def run_test(self):
         for TxTemplate in invalid_txs.iter_all_templates():
             template = TxTemplate(spend_tx=attempt_spend_tx)
 
+            # belt-and-suspenders checking we won't pass up validating something
+            # we expect a disconnect from
+            if template.expect_disconnect:
+                assert not template.valid_in_block
+
             if template.valid_in_block:
                 continue
 
+            assert template.block_reject_reason or template.reject_reason
+
             self.log.info(f"Reject block with invalid tx: {TxTemplate.__name__}")
             blockname = f"for_invalid.{TxTemplate.__name__}"
             self.next_block(blockname)