From d447ded6babebe7c7948e585c9e78bf34dbef226 Mon Sep 17 00:00:00 2001 From: ShubhamPalriwala Date: Tue, 14 Sep 2021 00:55:45 +0530 Subject: [PATCH] replace: self.nodes[0] with node --- test/functional/mempool_limit.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py index f67737f7563ff..6d9b79e116ce9 100755 --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -23,21 +23,22 @@ def set_test_params(self): ]] self.supports_cli = False - def send_large_txs(self, miniwallet, txouts, fee_rate, tx_batch_size): + def send_large_txs(self, node, miniwallet, txouts, fee_rate, tx_batch_size): for _ in range(tx_batch_size): - tx = miniwallet.create_self_transfer(from_node=self.nodes[0], fee_rate=fee_rate)['tx'] + tx = miniwallet.create_self_transfer(from_node=node, fee_rate=fee_rate)['tx'] for txout in txouts: tx.vout.append(txout) - miniwallet.sendrawtransaction(from_node=self.nodes[0], tx_hex=tx.serialize().hex()) + miniwallet.sendrawtransaction(from_node=node, tx_hex=tx.serialize().hex()) def run_test(self): txouts = gen_return_txouts() - miniwallet = MiniWallet(self.nodes[0]) - relayfee = self.nodes[0].getnetworkinfo()['relayfee'] + node=self.nodes[0] + miniwallet = MiniWallet(node) + relayfee = node.getnetworkinfo()['relayfee'] self.log.info('Check that mempoolminfee is minrelytxfee') - assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000')) - assert_equal(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000')) + assert_equal(node.getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000')) + assert_equal(node.getmempoolinfo()['mempoolminfee'], Decimal('0.00001000')) tx_batch_size = 25 num_of_batches = 3 @@ -48,10 +49,10 @@ def run_test(self): self.generate(miniwallet, 1 + (num_of_batches * tx_batch_size) + 1) # Mine 99 blocks so that the UTXOs are allowed to be spent - self.generate(self.nodes[0], COINBASE_MATURITY - 1) + self.generate(node, COINBASE_MATURITY - 1) self.log.info('Create a mempool tx that will be evicted') - tx_to_be_evicted_id = miniwallet.send_self_transfer(from_node=self.nodes[0], fee_rate=relayfee)["txid"] + tx_to_be_evicted_id = miniwallet.send_self_transfer(from_node=node, fee_rate=relayfee)["txid"] # Increase the tx fee rate massively to give the subsequent transactions a higher priority in the mempool base_fee = relayfee * 1000 @@ -59,21 +60,21 @@ def run_test(self): self.log.info("Fill up the mempool with txs with higher fee rate") for batch_of_txid in range(num_of_batches): fee_rate=(batch_of_txid + 1) * base_fee - self.send_large_txs(miniwallet, txouts, fee_rate, tx_batch_size) + self.send_large_txs(node, miniwallet, txouts, fee_rate, tx_batch_size) self.log.info('The tx should be evicted by now') # The number of transactions created should be greater than the ones present in the mempool - assert_greater_than(tx_batch_size * num_of_batches, len(self.nodes[0].getrawmempool())) + assert_greater_than(tx_batch_size * num_of_batches, len(node.getrawmempool())) # Initial tx created should not be present in the mempool anymore as it had a lower fee rate - assert tx_to_be_evicted_id not in self.nodes[0].getrawmempool() + assert tx_to_be_evicted_id not in node.getrawmempool() self.log.info('Check that mempoolminfee is larger than minrelytxfee') - assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000')) - assert_greater_than(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000')) + assert_equal(node.getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000')) + assert_greater_than(node.getmempoolinfo()['mempoolminfee'], Decimal('0.00001000')) # Deliberately try to create a tx with a fee less than the minimum mempool fee to assert that it does not get added to the mempool self.log.info('Create a mempool tx that will not pass mempoolminfee') - assert_raises_rpc_error(-26, "mempool min fee not met", miniwallet.send_self_transfer, from_node=self.nodes[0], fee_rate=relayfee, mempool_valid=False) + assert_raises_rpc_error(-26, "mempool min fee not met", miniwallet.send_self_transfer, from_node=node, fee_rate=relayfee, mempool_valid=False) if __name__ == '__main__':