[lbry] claimtrie: more verbose error message in ResetHeight
This commit is contained in:
parent
fae4063046
commit
5499a2c1b3
1 changed files with 11 additions and 1 deletions
|
@ -333,13 +333,23 @@ func (ct *ClaimTrie) ResetHeight(height int32) error {
|
||||||
if passedHashFork {
|
if passedHashFork {
|
||||||
names = nil // force them to reconsider all names
|
names = nil // force them to reconsider all names
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var fullRebuildRequired bool
|
||||||
|
|
||||||
err = ct.merkleTrie.SetRoot(hash)
|
err = ct.merkleTrie.SetRoot(hash)
|
||||||
if err == merkletrie.ErrFullRebuildRequired {
|
if err == merkletrie.ErrFullRebuildRequired {
|
||||||
|
fullRebuildRequired = true
|
||||||
|
} else if err != nil {
|
||||||
|
return errors.Wrapf(err, "setRoot")
|
||||||
|
}
|
||||||
|
|
||||||
|
if fullRebuildRequired {
|
||||||
ct.runFullTrieRebuild(names, nil)
|
ct.runFullTrieRebuild(names, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
if !ct.MerkleHash().IsEqual(hash) {
|
if !ct.MerkleHash().IsEqual(hash) {
|
||||||
return errors.Errorf("unable to restore the hash at height %d", height)
|
return errors.Errorf("unable to restore the hash at height %d"+
|
||||||
|
" (fullTriedRebuilt: %t)", height, fullRebuildRequired)
|
||||||
}
|
}
|
||||||
|
|
||||||
return errors.WithStack(ct.blockRepo.Delete(height+1, oldHeight))
|
return errors.WithStack(ct.blockRepo.Delete(height+1, oldHeight))
|
||||||
|
|
Loading…
Reference in a new issue