aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-03 23:19:22 +0800
committerobscuren <geffobscura@gmail.com>2015-04-03 23:19:22 +0800
commitec8a6e0a2b74c5755ebab97e438b00f8765851fe (patch)
tree8c59bc962eec32b2ffb67cd7cff5fb4c93056b68 /core
parent36452afd4e31083d748155e5e5ddd682128aa9b0 (diff)
parentf9d94c7462bbb3a0c463427baefc68555f853dee (diff)
downloadgo-tangerine-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar.gz
go-tangerine-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.tar.zst
go-tangerine-ec8a6e0a2b74c5755ebab97e438b00f8765851fe.zip
Merge branch 'develop' into glog
Diffstat (limited to 'core')
-rw-r--r--core/block_processor.go2
-rw-r--r--core/chain_manager.go3
2 files changed, 3 insertions, 2 deletions
diff --git a/core/block_processor.go b/core/block_processor.go
index 97c885536..0a98f3e32 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -342,7 +342,7 @@ func (sm *BlockProcessor) VerifyUncles(statedb *state.StateDB, block, parent *ty
return UncleError(fmt.Sprintf("Uncle's parent unknown (%x)", uncle.ParentHash[0:4]))
}
- if err := sm.ValidateHeader(uncle, ancestorHeaders[uncle.ParentHash]); err != nil && err != BlockEqualTSErr {
+ if err := sm.ValidateHeader(uncle, ancestorHeaders[uncle.ParentHash]); err != nil {
return ValidationError(fmt.Sprintf("%v", err))
}
diff --git a/core/chain_manager.go b/core/chain_manager.go
index d97a94b06..bf5ba9b40 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -448,7 +448,8 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
}
if err == BlockEqualTSErr {
- queue[i] = ChainSideEvent{block, logs}
+ //queue[i] = ChainSideEvent{block, logs}
+ // XXX silently discard it?
continue
}