aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-03-11 00:14:31 +0800
committerFelix Lange <fjl@twurst.com>2015-03-11 00:14:31 +0800
commit269cfbb8ace76ddc1f50dbd5b218c499308c8a5c (patch)
treec2e9e274c64f431f03b9a6b8b3de22585c016027 /core
parent972e2c1e31067a9bab77228c19348b66964ce643 (diff)
parent0542df941f57a75fa7b699089db1d9ae40e4ff71 (diff)
downloaddexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.gz
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.bz2
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.lz
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.xz
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.tar.zst
dexon-269cfbb8ace76ddc1f50dbd5b218c499308c8a5c.zip
Merge branch origin/develop into accounts-integration
Conflicts: cmd/blocktest/main.go cmd/mist/debugger.go cmd/utils/cmd.go
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() {