diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index cadf095efe..24a6e909e7 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -380,8 +380,8 @@ func (b *SimulatedBackend) CallContract(ctx context.Context, call ethereum.CallM reason, err := abi.UnpackRevert(res.Revert()) if err == nil { return nil, &revertError{ - error: errors.New("execution reverted"), - errData: reason, + error: fmt.Errorf("execution reverted: %v", reason), + errData: res.Revert(), } } } @@ -403,8 +403,8 @@ func (b *SimulatedBackend) PendingCallContract(ctx context.Context, call ethereu reason, err := abi.UnpackRevert(res.Revert()) if err == nil { return nil, &revertError{ - error: errors.New("execution reverted"), - errData: reason, + error: fmt.Errorf("execution reverted: %v", reason), + errData: res.Revert(), } } } diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go index 2d246d353e..61ee6b8bae 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/accounts/abi/bind/backends/simulated_test.go @@ -1053,8 +1053,8 @@ func TestSimulatedBackend_CallContractRevert(t *testing.T) { if !ok { t.Errorf("expect revert error") } - if !reflect.DeepEqual(rerr.ErrorData(), val) { - t.Errorf("error was malformed: got %v want %v", rerr.ErrorData(), val) + if rerr.Error() != "execution reverted: "+val.(string) { + t.Errorf("error was malformed: got %v want %v", rerr.Error(), val) } } else { // revert(0x0,0x0) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 1cb165adc6..5687a12968 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -899,8 +899,8 @@ func (s *PublicBlockChainAPI) Call(ctx context.Context, args CallArgs, blockNrOr reason, err := abi.UnpackRevert(result.Revert()) if err == nil { return nil, &revertError{ - error: errors.New("execution reverted"), - errData: reason, + error: fmt.Errorf("execution reverted: %v", reason), + errData: result.Revert(), } } } @@ -1003,8 +1003,8 @@ func DoEstimateGas(ctx context.Context, b Backend, args CallArgs, blockNrOrHash reason, err := abi.UnpackRevert(result.Revert()) if err == nil { return 0, &revertError{ - error: errors.New("execution reverted"), - errData: reason, + error: fmt.Errorf("execution reverted: %v", reason), + errData: result.Revert(), } } }