Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-05-30 02:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into patch

Browse Source
This commit is contained in:
msutton 2022-03-09 21:16:48 +02:00
commit ca32eb6bbf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
domain/consensus/processes/consensusstatemanager/pick_virtual_parents.go
View File

@ -336,12 +336,12 @@ func (csm *consensusStateManager) boundedMergeBreakingParents(stagingArea *model
log.Debugf("Checking whether parent %s breaks the bounded merge set", parent) log.Debugf("Checking whether parent %s breaks the bounded merge set", parent)
isBadRedInPast := false isBadRedInPast := false
for _, badRedBlock := range badReds { for _, badRedBlock := range badReds {
isBadRedInPast, err = csm.dagTopologyManager.IsAncestorOf(stagingArea, parent, badRedBlock) isBadRedInPast, err = csm.dagTopologyManager.IsAncestorOf(stagingArea, badRedBlock, parent)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if isBadRedInPast { if isBadRedInPast {
log.Debugf("Parent %s is an ancestor of bad red %s", parent, badRedBlock) log.Debugf("Parent %s is a descendant of bad red %s", parent, badRedBlock)
break break
} }
} }