scripted-diff: tests replaced < to use assert_less_than

kevkevinpal · kevkevinpal · commit fd385c380eb3 · 2024-05-01T18:42:39.000-05:00
-BEGIN VERIFY SCRIPT-
git grep -l -E -e "assert .*&lt;{1} [\=\&lt;]{0}" --and --not -e "assert .*!=" --and --not -e "assert .*&lt;=" --and --not -e "assert (.*&lt;" -- ./test/functional | xargs sed -i.bak -E -e "/assert .*&lt; / s/assert /assert_less_than(/g" -e "/assert_less_than$/ s/ &lt;/,/g" -e "/assert_less_than\(/ s/  (#)/) #/g" -e "/assert_less_than\(.*/ s/$/)/g" -e "/assert_less_than\(.*#.*$/ s/\)$//g"
-END VERIFY SCRIPT-
diff --git a/test/functional/feature_block.py b/test/functional/feature_block.py
@@ -799,7 +799,7 @@ def run_test(self):
         self.move_tip(57)
         self.next_block(58, spend=out[17])
         tx = CTransaction()
-        assert len(out[17].vout) < 42
+        assert_less_than(len(out[17].vout), 42)
         tx.vin.append(CTxIn(COutPoint(out[17].sha256, 42), CScript([OP_TRUE]), SEQUENCE_FINAL))
         tx.vout.append(CTxOut(0, b""))
         tx.calc_sha256()
diff --git a/test/functional/feature_coinstatsindex.py b/test/functional/feature_coinstatsindex.py
@@ -227,7 +227,7 @@ def _test_coin_stats_index(self):
 
         self.generate(index_node, 1, sync_fun=self.no_op)
         res10 = index_node.gettxoutsetinfo('muhash')
-        assert res8['txouts'] < res10['txouts']
+        assert_less_than(res8['txouts'], res10['txouts'])
 
         self.log.info("Test that the index works with -reindex")
 
diff --git a/test/functional/feature_rbf.py b/test/functional/feature_rbf.py
@@ -103,7 +103,7 @@ def make_utxo(self, node, amount, *, confirmed=True, scriptPubKey=None):
                 new_size = len(node.getrawmempool())
                 # Error out if we have something stuck in the mempool, as this
                 # would likely be a bug.
-                assert new_size < mempool_size
+                assert_less_than(new_size, mempool_size)
                 mempool_size = new_size
 
         return self.wallet.get_utxo(txid=tx["txid"], vout=tx["sent_vout"])
diff --git a/test/functional/mempool_resurrect.py b/test/functional/mempool_resurrect.py
@@ -41,7 +41,7 @@ def run_test(self):
         assert_equal(set(node.getrawmempool()), set())
         confirmed_txns = set(node.getblock(blocks[0])['tx'] + node.getblock(blocks[1])['tx'])
         # Checks that all spend txns are contained in the mined blocks
-        assert spends_ids < confirmed_txns
+        assert_less_than(spends_ids, confirmed_txns)
 
         # Use invalidateblock to re-org back
         node.invalidateblock(blocks[0])
@@ -54,7 +54,7 @@ def run_test(self):
         # mempool should be empty, all txns confirmed
         assert_equal(set(node.getrawmempool()), set())
         confirmed_txns = set(node.getblock(blocks[0])['tx'])
-        assert spends_ids < confirmed_txns
+        assert_less_than(spends_ids, confirmed_txns)
 
 
 if __name__ == '__main__':
diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py
@@ -114,7 +114,7 @@ def setup_addr_msg(self, num, sequential_ips=True):
             addr.time = self.mocktime + random.randrange(-100, 100)
             addr.nServices = P2P_SERVICES
             if sequential_ips:
-                assert self.counter < 256 ** 2  # Don't allow the returned ip addresses to wrap.
+                assert_less_than(self.counter, 256 ** 2) # Don't allow the returned ip addresses to wrap.
                 addr.ip = f"123.123.{self.counter // 256}.{self.counter % 256}"
                 self.counter += 1
             else:
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py
@@ -847,7 +847,7 @@ def test_block_malleability(self):
         assert self.nodes[0].getbestblockhash() != block.hash
 
         block.vtx[0].wit.vtxinwit[0].scriptWitness.stack.pop()
-        assert block.get_weight() < MAX_BLOCK_WEIGHT
+        assert_less_than(block.get_weight(), MAX_BLOCK_WEIGHT)
         assert_equal(None, self.nodes[0].submitblock(block.serialize().hex()))
 
         assert self.nodes[0].getbestblockhash() == block.hash
@@ -1885,7 +1885,7 @@ def test_witness_sigops(self):
         extra_sigops_available = MAX_SIGOP_COST % sigops_per_script
 
         # We chose the number of checkmultisigs/checksigs to make this work:
-        assert extra_sigops_available < 100  # steer clear of MAX_OPS_PER_SCRIPT
+        assert_less_than(extra_sigops_available, 100) # steer clear of MAX_OPS_PER_SCRIPT
 
         # This script, when spent with the first
         # N(=MAX_SIGOP_COST//sigops_per_script) outputs of our transaction,
diff --git a/test/functional/p2p_sendtxrcncl.py b/test/functional/p2p_sendtxrcncl.py
@@ -85,7 +85,7 @@ def run_test(self):
         peer.wait_for_verack()
         verack_index = [i for i, msg in enumerate(peer.messages) if msg.msgtype == b'verack'][0]
         sendtxrcncl_index = [i for i, msg in enumerate(peer.messages) if msg.msgtype == b'sendtxrcncl'][0]
-        assert sendtxrcncl_index < verack_index
+        assert_less_than(sendtxrcncl_index, verack_index)
         self.nodes[0].disconnect_p2ps()
 
         self.log.info('SENDTXRCNCL on pre-WTXID version should not be sent')
diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -340,7 +340,7 @@ def _test_gettxoutsetinfo(self):
         assert_equal(res['bestblock'], node.getblockhash(HEIGHT))
         size = res['disk_size']
         assert size > 6400
-        assert size < 64000
+        assert_less_than(size, 64000)
         assert_equal(len(res['bestblock']), 64)
         assert_equal(len(res['hash_serialized_3']), 64)
 
@@ -434,7 +434,7 @@ def _test_getdifficulty(self):
         difficulty = self.nodes[0].getdifficulty()
         # 1 hash in 2 should be valid, so difficulty should be 1/2**31
         # binary => decimal => binary math is why we do this check
-        assert abs(difficulty * 2**31 - 1) < 0.0001
+        assert_less_than(abs(difficulty * 2**31 - 1), 0.0001)
 
     def _test_getnetworkhashps(self):
         self.log.info("Test getnetworkhashps")
@@ -476,7 +476,7 @@ def _test_getnetworkhashps(self):
 
         # This should be 2 hashes every 10 minutes or 1/300
         hashes_per_second = self.nodes[0].getnetworkhashps()
-        assert abs(hashes_per_second * 300 - 1) < 0.0001
+        assert_less_than(abs(hashes_per_second * 300 - 1), 0.0001)
 
         # Test setting the first param of getnetworkhashps to -1 returns the average network
         # hashes per second from the last difficulty change.
diff --git a/test/functional/rpc_createmultisig.py b/test/functional/rpc_createmultisig.py
@@ -144,7 +144,7 @@ def checkbalances(self):
         balw = self.wallet.get_balance()
 
         height = node0.getblockchaininfo()["blocks"]
-        assert 150 < height < 350
+        assert_less_than(150, height, 350)
         total = 149 * 50 + (height - 149 - 100) * 25
         assert bal1 == 0
         assert bal2 == self.moved
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
@@ -163,7 +163,7 @@ def create_tx_with_script(prevtx, n, script_sig=b"", *, amount, script_pub_key=C
        Can optionally pass scriptPubKey and scriptSig, default is anyone-can-spend output.
     """
     tx = CTransaction()
-    assert n < len(prevtx.vout)
+    assert_less_than(n, len(prevtx.vout))
     tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), script_sig, SEQUENCE_FINAL))
     tx.vout.append(CTxOut(amount, script_pub_key))
     tx.calc_sha256()
diff --git a/test/functional/test_framework/netutil.py b/test/functional/test_framework/netutil.py
@@ -135,7 +135,7 @@ def addr_to_hex(addr):
                 if i == 0 or i == (len(addr)-1): # skip empty component at beginning or end
                     continue
                 x += 1 # :: skips to suffix
-                assert x < 2
+                assert_less_than(x, 2)
             else: # two bytes per component
                 val = int(comp, 16)
                 sub[x].append(val >> 8)
diff --git a/test/functional/wallet_abandonconflict.py b/test/functional/wallet_abandonconflict.py
@@ -54,7 +54,7 @@ def run_test(self):
         assert_raises_rpc_error(-5, 'Transaction not eligible for abandonment', lambda: alice.abandontransaction(txid=txA))
 
         newbalance = alice.getbalance()
-        assert balance - newbalance < Decimal("0.001")  #no more than fees lost
+        assert_less_than(balance - newbalance, Decimal("0.001")) #no more than fees lost
         balance = newbalance
 
         # Disconnect nodes so node0's transactions don't get into node1's mempool
diff --git a/test/functional/wallet_bumpfee.py b/test/functional/wallet_bumpfee.py
@@ -741,7 +741,7 @@ def test_unconfirmed_not_spendable(self, rbf_node, rbf_node_address):
 
 def test_bumpfee_metadata(self, rbf_node, dest_address):
     self.log.info('Test that bumped txn metadata persists to new txn record')
-    assert rbf_node.getbalance() < 49
+    assert_less_than(rbf_node.getbalance(), 49)
     self.generatetoaddress(rbf_node, 101, rbf_node.getnewaddress())
     rbfid = rbf_node.sendtoaddress(dest_address, 49, "comment value", "to value")
     bumped_tx = rbf_node.bumpfee(rbfid)
diff --git a/test/functional/wallet_conflicts.py b/test/functional/wallet_conflicts.py
@@ -105,7 +105,7 @@ def test_block_conflicts(self):
 
         self.log.info("Verify, after the reorg, that Tx_A was accepted, and tx_AB and its Child_Tx are conflicting now")
         # Tx A was accepted, Tx AB was not.
-        assert conflicted_AB_tx["confirmations"] < 0
+        assert_less_than(conflicted_AB_tx["confirmations"], 0)
         assert conflicted_A_tx["confirmations"] > 0
 
         # Conflicted tx should have confirmations set to the confirmations of the most conflicting tx
