From 361df780b94b8c9ef28f564a8aed3c56bf0a94b6 Mon Sep 17 00:00:00 2001
From: Bushstar <bushsolo@gmail.com>
Date: Mon, 12 Aug 2024 11:06:29 +0100
Subject: [PATCH] Fix failing tests

---
 test/functional/feature_evm.py                |  2 +-
 test/functional/feature_evm_fee.py            | 10 +++++-----
 test/functional/feature_evm_miner.py          |  2 +-
 test/functional/feature_evm_transferdomain.py |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/functional/feature_evm.py b/test/functional/feature_evm.py
index dbf6fe8f3e..e202883a93 100755
--- a/test/functional/feature_evm.py
+++ b/test/functional/feature_evm.py
@@ -967,7 +967,7 @@ def nonce_order_and_rbf(self):
         # Try and send an already sent transaction
         assert_raises_rpc_error(
             -26,
-            "evm tx failed to pre-validate invalid nonce. Account nonce 6, signed_tx nonce 5",
+            "invalid nonce. Account nonce 6, signed_tx nonce 5",
             self.nodes[0].sendrawtransaction,
             raw_tx,
         )
diff --git a/test/functional/feature_evm_fee.py b/test/functional/feature_evm_fee.py
index 2c1bd90d0e..677a2f3cf7 100755
--- a/test/functional/feature_evm_fee.py
+++ b/test/functional/feature_evm_fee.py
@@ -131,7 +131,7 @@ def test_low_gas_price(self):
 
         assert_raises_rpc_error(
             -32001,
-            "evm tx failed to pre-validate tx gas price is lower than initial block base fee",
+            "tx gas price is lower than initial block base fee",
             self.nodes[0].eth_sendTransaction,
             {
                 "from": self.ethAddress,
@@ -200,7 +200,7 @@ def test_max_gas_price(self):
         # Test insufficient balance due to high gas fees
         assert_raises_rpc_error(
             -32001,
-            "evm tx failed to pre-validate insufficient balance to pay fees",
+            "insufficient balance to pay fees",
             self.nodes[0].eth_sendTransaction,
             {
                 "from": self.ethAddress,
@@ -221,7 +221,7 @@ def test_low_gas_limit(self):
 
         assert_raises_rpc_error(
             -32001,
-            "evm tx failed to pre-validate gas limit is below the minimum gas per tx",
+            "gas limit is below the minimum gas per tx",
             self.nodes[0].eth_sendTransaction,
             {
                 "from": self.ethAddress,
@@ -242,7 +242,7 @@ def test_gas_limit_higher_than_block_limit(self):
 
         assert_raises_rpc_error(
             -32001,
-            "evm tx failed to pre-validate gas limit higher than max_gas_per_block",
+            "gas limit higher than max_gas_per_block",
             self.nodes[0].eth_sendTransaction,
             {
                 "from": self.ethAddress,
@@ -263,7 +263,7 @@ def test_fee_deduction_empty_balance(self):
         assert_equal(int(balance[2:], 16), 000000000000000000000)
         assert_raises_rpc_error(
             -32001,
-            "evm tx failed to pre-validate insufficient balance to pay fees",
+            "insufficient balance to pay fees",
             self.nodes[0].eth_sendTransaction,
             {
                 "from": emptyAddress,
diff --git a/test/functional/feature_evm_miner.py b/test/functional/feature_evm_miner.py
index af3e92a7d5..6ce01cba99 100755
--- a/test/functional/feature_evm_miner.py
+++ b/test/functional/feature_evm_miner.py
@@ -1065,7 +1065,7 @@ def multiple_transferdomain_txs(self):
         for i in range(10):
             assert_raises_rpc_error(
                 -32600,
-                "transferdomain evm tx failed to pre-validate : Invalid nonce. Account nonce 11, signed_tx nonce {}".format(
+                "Invalid nonce. Account nonce 11, signed_tx nonce {}".format(
                     start_nonce_erc55 + i
                 ),
                 self.nodes[0].transferdomain,
diff --git a/test/functional/feature_evm_transferdomain.py b/test/functional/feature_evm_transferdomain.py
index 47a7b2076a..c208cee600 100755
--- a/test/functional/feature_evm_transferdomain.py
+++ b/test/functional/feature_evm_transferdomain.py
@@ -1525,7 +1525,7 @@ def invalid_transfer_invalid_nonce(self):
 
         assert_raises_rpc_error(
             -32600,
-            "transferdomain evm tx failed to pre-validate : Invalid nonce. Account nonce 1, signed_tx nonce 0",
+            "Invalid nonce. Account nonce 1, signed_tx nonce 0",
             self.nodes[0].transferdomain,
             [
                 {