Skip to content
Snippets Groups Projects
Unverified Commit 04c04e7f authored by jonastheis's avatar jonastheis
Browse files

Merge branch 'tests/tangle' of github.com:iotaledger/goshimmer into tests/tangle

parents dd188234 19880644
No related tags found
No related merge requests found
...@@ -391,6 +391,11 @@ func (branchManager *BranchManager) setBranchFinalized(cachedBranch *CachedBranc ...@@ -391,6 +391,11 @@ func (branchManager *BranchManager) setBranchFinalized(cachedBranch *CachedBranc
branchManager.Events.BranchFinalized.Trigger(cachedBranch) branchManager.Events.BranchFinalized.Trigger(cachedBranch)
// propagate finalized to aggregated child branches
if err = branchManager.propagateFinalizedToAggregatedChildBranches(cachedBranch.Retain()); err != nil {
return
}
if !branch.Preferred() { if !branch.Preferred() {
branchManager.propagateRejectedToChildBranches(cachedBranch.Retain()) branchManager.propagateRejectedToChildBranches(cachedBranch.Retain())
...@@ -416,11 +421,6 @@ func (branchManager *BranchManager) setBranchFinalized(cachedBranch *CachedBranc ...@@ -416,11 +421,6 @@ func (branchManager *BranchManager) setBranchFinalized(cachedBranch *CachedBranc
}) })
} }
// propagate finalized to aggregated child branches
if err = branchManager.propagateFinalizedToAggregatedChildBranches(cachedBranch.Retain()); err != nil {
return
}
// schedule confirmed checks of children // schedule confirmed checks of children
err = branchManager.propagateConfirmedToChildBranches(cachedBranch.Retain()) err = branchManager.propagateConfirmedToChildBranches(cachedBranch.Retain())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment