Merge remote-tracking branch 'upstream/develop' into evmjit

1 files changed, 6 insertions, 17 deletions

diff --git a/core/error.go b/core/error.go
index 11d8c1653..e86bacb2d 100644
--- a/core/error.go
+++ b/core/error.go
@@ -1,10 +1,16 @@
 package core
 
 import (
+	"errors"
 	"fmt"
 	"math/big"
 )
 
+var (
+	BlockNumberErr = errors.New("block number invalid")
+	BlockFutureErr = errors.New("block time is in the future")
+)
+
 // Parent error. In case a parent is unknown this error will be thrown
 // by the block manager
 type ParentErr struct {
@@ -62,23 +68,6 @@ func IsValidationErr(err error) bool {
 	return ok
 }
 
-type GasLimitErr struct {
-	Message string
-	Is, Max *big.Int
-}
-
-func IsGasLimitErr(err error) bool {
-	_, ok := err.(*GasLimitErr)
-
-	return ok
-}
-func (err *GasLimitErr) Error() string {
-	return err.Message
-}
-func GasLimitError(is, max *big.Int) *GasLimitErr {
-	return &GasLimitErr{Message: fmt.Sprintf("GasLimit error. Max %s, transaction would take it to %s", max, is), Is: is, Max: max}
-}
-
 type NonceErr struct {
 	Message string
 	Is, Exp uint64