From 19880644db23e66fb6d77c2960cec2e0c1cad128 Mon Sep 17 00:00:00 2001
From: Hans Moog <hm@mkjc.net>
Date: Fri, 12 Jun 2020 11:02:47 +0200
Subject: [PATCH] Fix: finalized wasn't propagated when a branch was rejected
---
.../packages/branchmanager/branchmanager.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dapps/valuetransfers/packages/branchmanager/branchmanager.go b/dapps/valuetransfers/packages/branchmanager/branchmanager.go
index 0fc7717c..cb9b4a3f 100644
--- a/dapps/valuetransfers/packages/branchmanager/branchmanager.go
+++ b/dapps/valuetransfers/packages/branchmanager/branchmanager.go
@@ -391,6 +391,11 @@ func (branchManager *BranchManager) setBranchFinalized(cachedBranch *CachedBranc
branchManager.Events.BranchFinalized.Trigger(cachedBranch)
+ // propagate finalized to aggregated child branches
+ if err = branchManager.propagateFinalizedToAggregatedChildBranches(cachedBranch.Retain()); err != nil {
+ return
+ }
+
if !branch.Preferred() {
branchManager.propagateRejectedToChildBranches(cachedBranch.Retain())
@@ -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
err = branchManager.propagateConfirmedToChildBranches(cachedBranch.Retain())
--
GitLab