test: using assert_greater_than for edge cases

For the cases which the scripted diff did not make sense these were
manually updated, like if we had multiple operators on one line or if it
was wrapped in () already

Author: kevkevinpal

test/functional/rpc_createmultisig.py

@@ -144,7 +144,8 @@ def checkbalances(self):
         balw = self.wallet.get_balance()
 
         height = node0.getblockchaininfo()["blocks"]
-        assert 150 < height < 350
+        assert_greater_than(350, height)
+        assert_greater_than(height, 150)
         total = 149 * 50 + (height - 149 - 100) * 25
         assert bal1 == 0
         assert bal2 == self.moved

test/functional/test_framework/p2p.py

@@ -745,7 +745,8 @@ def listen(cls, p2p, callback, port=None, addr=None, idx=1):
         for connections, call `callback`."""
 
         if port is None:
-            assert 0 < idx <= MAX_NODES
+            assert_greater_than(idx, 0)
+            assert idx <= MAX_NODES
             port = p2p_port(MAX_NODES - idx)
         if addr is None:
             addr = '127.0.0.1'

test/functional/test_framework/script.py

@@ -12,7 +12,7 @@
 import unittest
 
 from .key import TaggedHash, tweak_add_pubkey, compute_xonly_pubkey
-
+from .util import assert_greater_than
 
 from .messages import (
     CTransaction,
@@ -814,7 +814,7 @@ def BIP341_sha_outputs(txTo):
 
 def TaprootSignatureMsg(txTo, spent_utxos, hash_type, input_index = 0, scriptpath = False, script = CScript(), codeseparator_pos = -1, annex = None, leaf_ver = LEAF_VERSION_TAPSCRIPT):
     assert (len(txTo.vin) == len(spent_utxos))
-    assert (input_index < len(txTo.vin))
+    assert_greater_than(len(txTo.vin), input_index)
     out_type = SIGHASH_ALL if hash_type == 0 else hash_type & 3
     in_type = hash_type & SIGHASH_ANYONECANPAY
     spk = spent_utxos[input_index].scriptPubKey

test/functional/wallet_create_tx.py

@@ -46,7 +46,8 @@ def test_anti_fee_sniping(self):
         self.generate(self.nodes[0], 1)
         txid = self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 1)
         tx = self.nodes[0].gettransaction(txid=txid, verbose=True)['decoded']
-        assert 0 < tx['locktime'] <= 201
+        assert_greater_than(tx['locktime'], 0)
+        assert tx['locktime'] <= 201
 
     def test_tx_size_too_large(self):
         # More than 10kB of outputs, so that we hit -maxtxfee with a high feerate