aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-11 01:50:13 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-11 01:50:13 +0800
commit617804c32731c5103319e7072557f62a9ce63836 (patch)
treebaca8a8f2e014892983ca45e8ec618ab54121526 /core
parent3de51f76eea87f8e8a4b8a7277cd294529e28491 (diff)
parentbbe8b186600992ada6da9e75e9976cd5a9dc0ae3 (diff)
downloaddexon-617804c32731c5103319e7072557f62a9ce63836.tar
dexon-617804c32731c5103319e7072557f62a9ce63836.tar.gz
dexon-617804c32731c5103319e7072557f62a9ce63836.tar.bz2
dexon-617804c32731c5103319e7072557f62a9ce63836.tar.lz
dexon-617804c32731c5103319e7072557f62a9ce63836.tar.xz
dexon-617804c32731c5103319e7072557f62a9ce63836.tar.zst
dexon-617804c32731c5103319e7072557f62a9ce63836.zip
Merge branch 'rpcfrontier' of github.com:ethereum/go-ethereum into rpcfrontier
Diffstat (limited to 'core')
-rw-r--r--core/block_processor.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/block_processor.go b/core/block_processor.go
index 34c12729c..ea9d06841 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -261,7 +261,7 @@ func (sm *BlockProcessor) ValidateHeader(block, parent *types.Header) error {
}
if block.Time <= parent.Time {
- return ValidationError("Block timestamp not after or equal to prev block (%v - %v)", block.Time, parent.Time)
+ return ValidationError("Block timestamp equal or less than previous block (%v - %v)", block.Time, parent.Time)
}
if int64(block.Time) > time.Now().Unix() {