mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-15 00:13:46 +00:00
fix: remove duplicate merge logs block
This commit is contained in:
parent
b395595c8b
commit
7a3036c110
1 changed files with 0 additions and 14 deletions
|
|
@ -2164,20 +2164,6 @@ func (bc *BlockChain) reorg(oldBlock, newBlock *types.Block) error {
|
||||||
}
|
}
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
// mergeLogs returns a merged log slice with specified sort order.
|
|
||||||
mergeLogs = func(logs [][]*types.Log, reverse bool) []*types.Log {
|
|
||||||
var ret []*types.Log
|
|
||||||
if reverse {
|
|
||||||
for i := len(logs) - 1; i >= 0; i-- {
|
|
||||||
ret = append(ret, logs[i]...)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for i := 0; i < len(logs); i++ {
|
|
||||||
ret = append(ret, logs[i]...)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
// Reduce the longer chain to the same number as the shorter one
|
// Reduce the longer chain to the same number as the shorter one
|
||||||
if oldBlock.NumberU64() > newBlock.NumberU64() {
|
if oldBlock.NumberU64() > newBlock.NumberU64() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue