fix tests and one error message

Tofel · Tofel · commit 90fa726a723b · 2025-10-23T17:31:19.000+02:00
diff --git a/seth/.tool-versions b/seth/.tool-versions
@@ -0,0 +1 @@
+golangci-lint 1.64.5
diff --git a/seth/client.go b/seth/client.go
@@ -28,25 +28,7 @@ import (
 
 const (
 	ErrEmptyConfigPath          = "toml config path is empty, set SETH_CONFIG_PATH"
-	ErrCreateABIStore           = "failed to create ABI store"
-	ErrReadingKeys              = "failed to read keys"
-	ErrCreateNonceManager       = "failed to create nonce manager"
-	ErrCreateTracer             = "failed to create tracer"
-	ErrReadContractMap          = "failed to read deployed contract map"
-	ErrRpcHealthCheckFailed     = "RPC health check failed ¯\\_(ツ)_/¯"
 	ErrContractDeploymentFailed = "contract deployment failed"
-	ErrNoPksEphemeralMode       = "no private keys loaded, cannot fund ephemeral addresses"
-	// unused by Seth, but used by upstream
-	ErrNoKeyLoaded = "failed to load private key"
-
-	ErrSethConfigIsNil         = "seth config is nil"
-	ErrNetworkIsNil            = "no Network is set in the Seth config"
-	ErrNonceManagerConfigIsNil = "nonce manager config is nil"
-	ErrReadOnlyWithPrivateKeys = "read-only mode is enabled, but you tried to load private keys"
-	ErrReadOnlyEphemeralKeys   = "ephemeral mode is not supported in read-only mode"
-	ErrReadOnlyGasBumping      = "gas bumping is not supported in read-only mode"
-	ErrReadOnlyRpcHealth       = "RPC health check is not supported in read-only mode"
-	ErrReadOnlyPendingNonce    = "pending nonce protection is not supported in read-only mode"
 
 	ContractMapFilePattern          = "deployed_contracts_%s_%s.toml"
 	RevertedTransactionsFilePattern = "reverted_transactions_%s_%s.json"
@@ -89,7 +71,7 @@ func NewClientWithConfig(cfg *Config) (*Client, error) {
 	initDefaultLogging()
 
 	if cfg == nil {
-		return nil, fmt.Errorf("Seth configuration is nil. " +
+		return nil, fmt.Errorf("seth configuration is nil. " +
 			"Ensure you're calling NewClientWithConfig() with a valid config, or use NewClient() to load from SETH_CONFIG_PATH environment variable. " +
 			"See documentation for configuration examples")
 	}
diff --git a/seth/client_builder_test.go b/seth/client_builder_test.go
@@ -339,7 +339,7 @@ func TestConfig_NoPrivateKeys_TxOpts(t *testing.T) {
 
 	_ = client.NewTXOpts()
 	require.Equal(t, 1, len(client.Errors), "expected 1 error")
-	require.Equal(t, "no private keys were loaded, but keyNum 0 was requested", client.Errors[0].Error(), "expected error message")
+	require.Contains(t, client.Errors[0].Error(), "no private keys loaded, but tried to use key #0.", "expected error message")
 }
 
 func TestConfig_NoPrivateKeys_Tracing(t *testing.T) {
diff --git a/seth/client_contract_map_test.go b/seth/client_contract_map_test.go
@@ -142,7 +142,7 @@ func TestContractMapNewClientIsNotCreatedWhenCorruptedContractMapFileExists(t *t
 	cfg.ContractMapFile = file.Name()
 	newClient, err := seth.NewClientRaw(cfg, addresses, pks)
 	require.Error(t, err, "succeeded in creation of new client")
-	require.Contains(t, err.Error(), seth.ErrReadContractMap, "expected error reading invalid toml")
+	require.Contains(t, err.Error(), "failed to load deployed contracts map from", "expected error reading invalid toml")
 	require.Nil(t, newClient, "expected new client to be nil")
 }
 
@@ -162,6 +162,6 @@ func TestContractMapNewClientIsNotCreatedWhenCorruptedContractMapFileExists_Inva
 	cfg.ContractMapFile = file.Name()
 	newClient, err := seth.NewClientRaw(cfg, addresses, pks)
 	require.Error(t, err, "succeeded in creation of new client")
-	require.Contains(t, err.Error(), seth.ErrReadContractMap, "expected error reading invalid contract address")
+	require.Contains(t, err.Error(), "failed to load deployed contracts map from", "expected error reading invalid contract address")
 	require.Nil(t, newClient, "expected new client to be nil")
 }
diff --git a/seth/client_decode_test.go b/seth/client_decode_test.go
@@ -39,7 +39,7 @@ func TestSmokeDebugReverts(t *testing.T) {
 			name:   "revert with a custom err",
 			method: "alwaysRevertsCustomError",
 			output: map[string]string{
-				seth.GETH: "error type: CustomErr, error values: [12 21]",
+				seth.GETH: "transaction reverted with custom error: error type: CustomErr, error values: [12 21]",
 			},
 		},
 	}
@@ -57,7 +57,7 @@ func TestSmokeDebugReverts(t *testing.T) {
 					expectedOutput = eo
 				}
 			}
-			require.Equal(t, expectedOutput, err.Error())
+			require.Contains(t, err.Error(), expectedOutput, "expected error message to contain the reverted error type and values")
 		})
 	}
 }
diff --git a/seth/client_test.go b/seth/client_test.go
@@ -40,7 +40,7 @@ func TestRPCHealthCheckEnabled_Node_Unhealthy(t *testing.T) {
 
 	_, err = seth.NewClientWithConfig(cfg)
 	require.Error(t, err, "expected error when connecting to unhealthy node")
-	require.Contains(t, err.Error(), seth.ErrRpcHealthCheckFailed, "expected error message when connecting to dead node")
+	require.Contains(t, err.Error(), "RPC health check failed: failed to send transaction to network: insufficient funds for gas * price + value:", "expected error message when connecting to dead node")
 }
 
 func TestRPCHealthCheckDisabled_Node_Unhealthy(t *testing.T) {
diff --git a/seth/client_trace_test.go b/seth/client_trace_test.go
@@ -1229,7 +1229,7 @@ func TestTraceContractAll(t *testing.T) {
 	require.NoError(t, txErr, "transaction sending should not fail")
 	_, decodeErr := c.Decode(revertedTx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 
 	okTx, txErr := TestEnv.DebugContract.AddCounter(c.NewTXOpts(), big.NewInt(1), big.NewInt(2))
 	require.NoError(t, txErr, "transaction should not have reverted")
@@ -1282,7 +1282,7 @@ func TestTraceContractOnlyReverted(t *testing.T) {
 	require.NoError(t, txErr, "transaction sending should not fail")
 	_, decodeErr := c.Decode(revertedTx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 
 	okTx, txErr := TestEnv.DebugContract.AddCounter(c.NewTXOpts(), big.NewInt(1), big.NewInt(2))
 	require.NoError(t, txErr, "transaction should not have reverted")
@@ -1320,7 +1320,7 @@ func TestTraceContractNone(t *testing.T) {
 	require.NoError(t, txErr, "transaction sending should not fail")
 	_, decodeErr := c.Decode(revertedTx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 
 	okTx, txErr := TestEnv.DebugContract.AddCounter(c.NewTXOpts(), big.NewInt(1), big.NewInt(2))
 	require.NoError(t, txErr, "transaction should not have reverted")
@@ -1341,7 +1341,7 @@ func TestTraceContractRevertedErrNoValues(t *testing.T) {
 	require.NoError(t, txErr, "transaction should have reverted")
 	_, decodeErr := c.Decode(tx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErrNoValues, error values: []", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErrNoValues, error values: []", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 	require.Equal(t, 1, len(c.Tracer.GetAllDecodedCalls()), "expected 1 decoded transacton")
 
 	expectedCall := &seth.DecodedCall{
@@ -1373,7 +1373,7 @@ func TestTraceCallRevertFunctionInTheContract(t *testing.T) {
 	require.NoError(t, txErr, "transaction should have reverted")
 	_, decodeErr := c.Decode(tx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErr, error values: [12 21]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 	require.Equal(t, 1, len(c.Tracer.GetAllDecodedCalls()), "expected 1 decoded transacton")
 
 	expectedCall := &seth.DecodedCall{
@@ -1407,7 +1407,7 @@ func TestTraceCallRevertFunctionInSubContract(t *testing.T) {
 	require.NoError(t, txErr, "transaction should have reverted")
 	_, decodeErr := c.Decode(tx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErr, error values: [1001 2]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErr, error values: [1001 2]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 	require.Equal(t, 1, len(c.Tracer.GetAllDecodedCalls()), "expected 1 decoded transaction")
 
 	expectedCall := &seth.DecodedCall{
@@ -1446,7 +1446,7 @@ func TestTraceCallRevertInCallback(t *testing.T) {
 	require.NoError(t, txErr, "transaction should have reverted")
 	_, decodeErr := c.Decode(tx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErr, error values: [99 101]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErr, error values: [99 101]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 }
 
 func TestTraceOldPragmaNoRevertReason(t *testing.T) {
@@ -1493,7 +1493,7 @@ func TestTraceeRevertReasonNonRootSender(t *testing.T) {
 	require.NoError(t, txErr, "transaction should have reverted")
 	_, decodeErr := c.Decode(tx, txErr)
 	require.Error(t, decodeErr, "transaction should have reverted")
-	require.Equal(t, "error type: CustomErr, error values: [1001 2]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
+	require.Equal(t, "transaction reverted with custom error: error type: CustomErr, error values: [1001 2]", decodeErr.Error(), "expected error message to contain the reverted error type and values")
 	require.Equal(t, 1, len(c.Tracer.GetAllDecodedCalls()), "expected 1 decoded transaction")
 
 	expectedCall := &seth.DecodedCall{
diff --git a/seth/config_test.go b/seth/config_test.go
@@ -131,19 +131,19 @@ func TestConfig_ReadOnly_WithPk(t *testing.T) {
 
 	_, err := seth.NewClientRaw(&cfg, addrs, nil)
 	require.Error(t, err, "succeeded in creating client")
-	require.Equal(t, seth.ErrReadOnlyWithPrivateKeys, err.Error(), "expected different error message")
+	require.Contains(t, err.Error(), "configuration conflict: read-only mode is enabled, but private keys were provided.", "expected different error message")
 
 	privateKey, err := crypto.HexToECDSA("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80")
 	require.NoError(t, err, "failed to parse private key")
 
 	pks := []*ecdsa.PrivateKey{privateKey}
 	_, err = seth.NewClientRaw(&cfg, nil, pks)
 	require.Error(t, err, "succeeded in creating client")
-	require.Equal(t, seth.ErrReadOnlyWithPrivateKeys, err.Error(), "expected different error message")
+	require.Contains(t, err.Error(), "configuration conflict: read-only mode is enabled, but private keys were provided.", "expected different error message")
 
 	_, err = seth.NewClientRaw(&cfg, addrs, pks)
 	require.Error(t, err, "succeeded in creating client")
-	require.Equal(t, seth.ErrReadOnlyWithPrivateKeys, err.Error(), "expected different error message")
+	require.Contains(t, err.Error(), "configuration conflict: read-only mode is enabled, but private keys were provided.", "expected different error message")
 }
 
 func TestConfig_ReadOnly_GasBumping(t *testing.T) {
@@ -161,7 +161,7 @@ func TestConfig_ReadOnly_GasBumping(t *testing.T) {
 
 	_, err := seth.NewClientRaw(&cfg, nil, nil)
 	require.Error(t, err, "succeeded in creating client")
-	require.Equal(t, seth.ErrReadOnlyGasBumping, err.Error(), "expected different error message")
+	require.Contains(t, err.Error(), "gas bumping is not supported in read-only mode because it requires sending replacement transactions.", "expected different error message")
 }
 
 func TestConfig_ReadOnly_RpcHealth(t *testing.T) {
@@ -177,7 +177,7 @@ func TestConfig_ReadOnly_RpcHealth(t *testing.T) {
 
 	_, err := seth.NewClientRaw(&cfg, nil, nil)
 	require.Error(t, err, "succeeded in creating client")
-	require.Equal(t, seth.ErrReadOnlyRpcHealth, err.Error(), "expected different error message")
+	require.Contains(t, err.Error(), "RPC health check is not supported in read-only mode", "expected different error message")
 }
 
 func TestConfig_ReadOnly_PendingNonce(t *testing.T) {
@@ -193,7 +193,7 @@ func TestConfig_ReadOnly_PendingNonce(t *testing.T) {
 
 	_, err := seth.NewClientRaw(&cfg, nil, nil)
 	require.Error(t, err, "succeeded in creating client")
-	require.Equal(t, seth.ErrReadOnlyPendingNonce, err.Error(), "expected different error message")
+	require.Contains(t, err.Error(), "pending nonce protection is not supported in read-only mode because it requires transaction monitoring.", "expected different error message")
 }
 
 func TestConfig_ReadOnly_EphemeralKeys(t *testing.T) {
@@ -210,5 +210,5 @@ func TestConfig_ReadOnly_EphemeralKeys(t *testing.T) {
 
 	_, err := seth.NewClientRaw(&cfg, nil, nil)
 	require.Error(t, err, "succeeded in creating client")
-	require.Equal(t, seth.ErrNoPksEphemeralMode, err.Error(), "expected different error message")
+	require.Contains(t, err.Error(), "ephemeral mode requires exactly one root private key to fund ephemeral addresses, but no keys were loaded.", "expected different error message")
 }
diff --git a/seth/contract_store_test.go b/seth/contract_store_test.go
@@ -63,18 +63,18 @@ func TestSmokeContractABIStore(t *testing.T) {
 		{
 			name:    "empty ABI dir",
 			abiPath: "./contracts/emptyContractDir",
-			err:     "no ABI files found in './contracts/emptyContractDir'. Fix the path or comment out 'abi_dir' setting",
+			err:     "no ABI files (*.abi) found in directory './contracts/emptyContractDir'.",
 		},
 		{
 			name:              "empty gethwrappers dir",
 			gethWrappersPaths: []string{"./contracts/emptyContractDir"},
-			err:               "failed to load geth wrappers from [./contracts/emptyContractDir]: no geth wrappers found in '[./contracts/emptyContractDir]'. Fix the path or comment out 'geth_wrappers_dirs' setting",
+			err:               "failed to load geth wrappers from [./contracts/emptyContractDir]: no geth wrapper files found in directories: [./contracts/emptyContractDir]",
 		},
 		{
 			name:              "empty ABI and gethwrappers dir",
 			abiPath:           "./contracts/emptyContractDir",
 			gethWrappersPaths: []string{"./contracts/emptyContractDir"},
-			err:               "no ABI files found in './contracts/emptyContractDir'. Fix the path or comment out 'abi_dir' setting",
+			err:               "no ABI files (*.abi) found in directory './contracts/emptyContractDir'.",
 		},
 		{
 			name:              "no MetaData in one of gethwrappers",
@@ -84,7 +84,7 @@ func TestSmokeContractABIStore(t *testing.T) {
 		{
 			name:              "empty MetaData in one of gethwrappers",
 			gethWrappersPaths: []string{"./contracts/emptyMetaDataContractDir"},
-			err:               "failed to load geth wrappers from [./contracts/emptyMetaDataContractDir]: failed to parse ABI content: EOF",
+			err:               "failed to load geth wrappers from [./contracts/emptyMetaDataContractDir]: failed to parse ABI content from 'contracts/emptyMetaDataContractDir/NetworkDebugContract_Broken.go': EOF",
 		},
 		{
 			name:              "gethwrappers dir mixes regular go files and gethwrappers",
@@ -94,12 +94,12 @@ func TestSmokeContractABIStore(t *testing.T) {
 		{
 			name:    "invalid ABI inside ABI dir",
 			abiPath: "./contracts/invalidContractDir",
-			err:     "failed to parse ABI file: invalid character ':' after array element",
+			err:     "failed to parse ABI file 'NetworkDebugContract.abi': invalid character ':' after array element",
 		},
 		{
 			name:              "invalid ABI in gethwrappers inside dir",
 			gethWrappersPaths: []string{"./contracts/invalidContractDir"},
-			err:               "failed to load geth wrappers from [./contracts/invalidContractDir]: failed to parse ABI content: invalid character 'i' looking for beginning of value",
+			err:               "failed to load geth wrappers from [./contracts/invalidContractDir]: failed to parse ABI content from 'contracts/invalidContractDir/NetworkDebugContract_Broken.go': invalid character 'i' looking for beginning of value",
 		},
 	}
 
@@ -114,7 +114,7 @@ func TestSmokeContractABIStore(t *testing.T) {
 				require.Equal(t, make(map[string][]uint8), cs.BINs)
 				err = errors.New("")
 			}
-			require.Equal(t, tc.err, err.Error())
+			require.Contains(t, err.Error(), tc.err, "error should match")
 		})
 	}
 }
@@ -152,7 +152,7 @@ func TestSmokeContractBINStore(t *testing.T) {
 			name:    "empty BIN dir",
 			abiPath: "./contracts/abi",
 			binPath: "./contracts/emptyContractDir",
-			err:     "no BIN files found in './contracts/emptyContractDir'. Fix the path or comment out 'bin_dir' setting",
+			err:     "no BIN files (*.bin) found in directory './contracts/emptyContractDir'.",
 		},
 	}
 
@@ -171,7 +171,7 @@ func TestSmokeContractBINStore(t *testing.T) {
 			} else {
 				require.Nil(t, cs, "ContractStore should be nil")
 			}
-			require.Equal(t, tc.err, err.Error(), "error should match")
+			require.Contains(t, err.Error(), tc.err, "error should match")
 		})
 	}
 }
diff --git a/seth/decode.go b/seth/decode.go
@@ -617,13 +617,7 @@ func (m *Client) callAndGetRevertReason(tx *types.Transaction, rc *types.Receipt
 		return err
 	}
 	if decodedABIErrString != "" {
-		return fmt.Errorf("failed to decode ABI from contract code: %s\n"+
-			"This happens when:\n"+
-			"  1. Contract bytecode doesn't contain valid ABI metadata\n"+
-			"  2. Contract wasn't compiled with metadata (--metadata-hash none)\n"+
-			"  3. Contract code at the address is not a valid contract\n"+
-			"For third-party contracts, manually load the ABI instead of relying on auto-detection",
-			decodedABIErrString)
+		return fmt.Errorf("transaction reverted with custom error: %s", decodedABIErrString)
 	}
 
 	if plainStringErr != nil {
diff --git a/seth/tracing.go b/seth/tracing.go
@@ -709,7 +709,7 @@ func (t *Tracer) printDecodedCallData(l zerolog.Logger, calls []*DecodedCall, re
 		l.Debug().Str(fmt.Sprintf("%s- Method name", indentation), dc.Method).Send()
 		l.Debug().Str(fmt.Sprintf("%s- Gas used/limit", indentation), fmt.Sprintf("%d/%d", dc.GasUsed, dc.GasLimit)).Send()
 
-		gasLeft := int64(dc.GasLimit) - int64(dc.GasUsed)
+		gasLeft := mustSafeInt64(dc.GasLimit) - mustSafeInt64(dc.GasUsed)
 		if gasLeft < 0 {
 			l.Debug().Str(fmt.Sprintf("%s- Gas left", indentation), fmt.Sprintf("%d (negative due to gas refunds or stipends)", gasLeft)).Send()
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ func TestConfig_NoPrivateKeys_TxOpts(t *testing.T) {`
`339`	`339`
`340`	`340`	`_ = client.NewTXOpts()`
`341`	`341`	`require.Equal(t, 1, len(client.Errors), "expected 1 error")`
`342`		`- require.Equal(t, "no private keys were loaded, but keyNum 0 was requested", client.Errors[0].Error(), "expected error message")`
	`342`	`+ require.Contains(t, client.Errors[0].Error(), "no private keys loaded, but tried to use key #0.", "expected error message")`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`func TestConfig_NoPrivateKeys_Tracing(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func TestSmokeDebugReverts(t *testing.T) {`
`39`	`39`	`name: "revert with a custom err",`
`40`	`40`	`method: "alwaysRevertsCustomError",`
`41`	`41`	`output: map[string]string{`
`42`		`- seth.GETH: "error type: CustomErr, error values: [12 21]",`
	`42`	`+ seth.GETH: "transaction reverted with custom error: error type: CustomErr, error values: [12 21]",`
`43`	`43`	`},`
`44`	`44`	`},`
`45`	`45`	`}`
`@@ -57,7 +57,7 @@ func TestSmokeDebugReverts(t *testing.T) {`
`57`	`57`	`expectedOutput = eo`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- require.Equal(t, expectedOutput, err.Error())`
	`60`	`+ require.Contains(t, err.Error(), expectedOutput, "expected error message to contain the reverted error type and values")`
`61`	`61`	`})`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func TestRPCHealthCheckEnabled_Node_Unhealthy(t *testing.T) {`
`40`	`40`
`41`	`41`	`_, err = seth.NewClientWithConfig(cfg)`
`42`	`42`	`require.Error(t, err, "expected error when connecting to unhealthy node")`
`43`		`- require.Contains(t, err.Error(), seth.ErrRpcHealthCheckFailed, "expected error message when connecting to dead node")`
	`43`	`+ require.Contains(t, err.Error(), "RPC health check failed: failed to send transaction to network: insufficient funds for gas * price + value:", "expected error message when connecting to dead node")`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func TestRPCHealthCheckDisabled_Node_Unhealthy(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -63,18 +63,18 @@ func TestSmokeContractABIStore(t *testing.T) {`
`63`	`63`	`{`
`64`	`64`	`name: "empty ABI dir",`
`65`	`65`	`abiPath: "./contracts/emptyContractDir",`
`66`		`- err: "no ABI files found in './contracts/emptyContractDir'. Fix the path or comment out 'abi_dir' setting",`
	`66`	`+ err: "no ABI files (*.abi) found in directory './contracts/emptyContractDir'.",`
`67`	`67`	`},`
`68`	`68`	`{`
`69`	`69`	`name: "empty gethwrappers dir",`
`70`	`70`	`gethWrappersPaths: []string{"./contracts/emptyContractDir"},`
`71`		`- err: "failed to load geth wrappers from [./contracts/emptyContractDir]: no geth wrappers found in '[./contracts/emptyContractDir]'. Fix the path or comment out 'geth_wrappers_dirs' setting",`
	`71`	`+ err: "failed to load geth wrappers from [./contracts/emptyContractDir]: no geth wrapper files found in directories: [./contracts/emptyContractDir]",`
`72`	`72`	`},`
`73`	`73`	`{`
`74`	`74`	`name: "empty ABI and gethwrappers dir",`
`75`	`75`	`abiPath: "./contracts/emptyContractDir",`
`76`	`76`	`gethWrappersPaths: []string{"./contracts/emptyContractDir"},`
`77`		`- err: "no ABI files found in './contracts/emptyContractDir'. Fix the path or comment out 'abi_dir' setting",`
	`77`	`+ err: "no ABI files (*.abi) found in directory './contracts/emptyContractDir'.",`
`78`	`78`	`},`
`79`	`79`	`{`
`80`	`80`	`name: "no MetaData in one of gethwrappers",`
`@@ -84,7 +84,7 @@ func TestSmokeContractABIStore(t *testing.T) {`
`84`	`84`	`{`
`85`	`85`	`name: "empty MetaData in one of gethwrappers",`
`86`	`86`	`gethWrappersPaths: []string{"./contracts/emptyMetaDataContractDir"},`
`87`		`- err: "failed to load geth wrappers from [./contracts/emptyMetaDataContractDir]: failed to parse ABI content: EOF",`
	`87`	`+ err: "failed to load geth wrappers from [./contracts/emptyMetaDataContractDir]: failed to parse ABI content from 'contracts/emptyMetaDataContractDir/NetworkDebugContract_Broken.go': EOF",`
`88`	`88`	`},`
`89`	`89`	`{`
`90`	`90`	`name: "gethwrappers dir mixes regular go files and gethwrappers",`
`@@ -94,12 +94,12 @@ func TestSmokeContractABIStore(t *testing.T) {`
`94`	`94`	`{`
`95`	`95`	`name: "invalid ABI inside ABI dir",`
`96`	`96`	`abiPath: "./contracts/invalidContractDir",`
`97`		`- err: "failed to parse ABI file: invalid character ':' after array element",`
	`97`	`+ err: "failed to parse ABI file 'NetworkDebugContract.abi': invalid character ':' after array element",`
`98`	`98`	`},`
`99`	`99`	`{`
`100`	`100`	`name: "invalid ABI in gethwrappers inside dir",`
`101`	`101`	`gethWrappersPaths: []string{"./contracts/invalidContractDir"},`
`102`		`- err: "failed to load geth wrappers from [./contracts/invalidContractDir]: failed to parse ABI content: invalid character 'i' looking for beginning of value",`
	`102`	`+ err: "failed to load geth wrappers from [./contracts/invalidContractDir]: failed to parse ABI content from 'contracts/invalidContractDir/NetworkDebugContract_Broken.go': invalid character 'i' looking for beginning of value",`
`103`	`103`	`},`
`104`	`104`	`}`
`105`	`105`
`@@ -114,7 +114,7 @@ func TestSmokeContractABIStore(t *testing.T) {`
`114`	`114`	`require.Equal(t, make(map[string][]uint8), cs.BINs)`
`115`	`115`	`err = errors.New("")`
`116`	`116`	`}`
`117`		`- require.Equal(t, tc.err, err.Error())`
	`117`	`+ require.Contains(t, err.Error(), tc.err, "error should match")`
`118`	`118`	`})`
`119`	`119`	`}`
`120`	`120`	`}`
`@@ -152,7 +152,7 @@ func TestSmokeContractBINStore(t *testing.T) {`
`152`	`152`	`name: "empty BIN dir",`
`153`	`153`	`abiPath: "./contracts/abi",`
`154`	`154`	`binPath: "./contracts/emptyContractDir",`
`155`		`- err: "no BIN files found in './contracts/emptyContractDir'. Fix the path or comment out 'bin_dir' setting",`
	`155`	`+ err: "no BIN files (*.bin) found in directory './contracts/emptyContractDir'.",`
`156`	`156`	`},`
`157`	`157`	`}`
`158`	`158`
`@@ -171,7 +171,7 @@ func TestSmokeContractBINStore(t *testing.T) {`
`171`	`171`	`} else {`
`172`	`172`	`require.Nil(t, cs, "ContractStore should be nil")`
`173`	`173`	`}`
`174`		`- require.Equal(t, tc.err, err.Error(), "error should match")`
	`174`	`+ require.Contains(t, err.Error(), tc.err, "error should match")`
`175`	`175`	`})`
`176`	`176`	`}`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -617,13 +617,7 @@ func (m Client) callAndGetRevertReason(tx types.Transaction, rc *types.Receipt`
`617`	`617`	`return err`
`618`	`618`	`}`
`619`	`619`	`if decodedABIErrString != "" {`
`620`		`- return fmt.Errorf("failed to decode ABI from contract code: %s\n"+`
`621`		`- "This happens when:\n"+`
`622`		`- " 1. Contract bytecode doesn't contain valid ABI metadata\n"+`
`623`		`- " 2. Contract wasn't compiled with metadata (--metadata-hash none)\n"+`
`624`		`- " 3. Contract code at the address is not a valid contract\n"+`
`625`		`- "For third-party contracts, manually load the ABI instead of relying on auto-detection",`
`626`		`- decodedABIErrString)`
	`620`	`+ return fmt.Errorf("transaction reverted with custom error: %s", decodedABIErrString)`
`627`	`621`	`}`
`628`	`622`
`629`	`623`	`if plainStringErr != nil {`