From b1f3ce4138cb695ae25c789fe026360523816eab Mon Sep 17 00:00:00 2001
From: capossele <angelocapossele@gmail.com>
Date: Tue, 9 Jun 2020 09:32:20 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Update=20FPC=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
plugins/analysis/dashboard/fpc_livefeed.go | 48 ++++++++++---------
.../analysis/dashboard/fpc_livefeed_test.go | 2 -
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/plugins/analysis/dashboard/fpc_livefeed.go b/plugins/analysis/dashboard/fpc_livefeed.go
index 8a80f817..5251f36b 100644
--- a/plugins/analysis/dashboard/fpc_livefeed.go
+++ b/plugins/analysis/dashboard/fpc_livefeed.go
@@ -86,31 +86,33 @@ func createFPCUpdate(hb *packet.FPCHeartbeat, recordEvent bool) *FPCUpdate {
}
}
- // check finalized conflicts
- if len(hb.Finalized) > 0 {
- finalizedConflicts := make([]FPCRecord, len(hb.Finalized))
- i := 0
- for ID, finalOpinion := range hb.Finalized {
- recordedConflicts.lock.Lock()
- conflictDetail := recordedConflicts.conflictSet[ID].NodesView[nodeID]
- conflictDetail.Status = vote.ConvertOpinionToInt32(finalOpinion)
- conflicts[ID] = newConflict()
- conflicts[ID].NodesView[nodeID] = conflictDetail
- recordedConflicts.conflictSet[ID].NodesView[nodeID] = conflictDetail
- finalizedConflicts[i] = FPCRecord{
- ConflictID: ID,
- NodeID: conflictDetail.NodeID,
- Rounds: conflictDetail.Rounds,
- Opinions: conflictDetail.Opinions,
- Status: conflictDetail.Status,
+ if recordEvent {
+ // check finalized conflicts
+ if len(hb.Finalized) > 0 {
+ finalizedConflicts := make([]FPCRecord, len(hb.Finalized))
+ i := 0
+ for ID, finalOpinion := range hb.Finalized {
+ recordedConflicts.lock.Lock()
+ conflictDetail := recordedConflicts.conflictSet[ID].NodesView[nodeID]
+ conflictDetail.Status = vote.ConvertOpinionToInt32(finalOpinion)
+ conflicts[ID] = newConflict()
+ conflicts[ID].NodesView[nodeID] = conflictDetail
+ recordedConflicts.conflictSet[ID].NodesView[nodeID] = conflictDetail
+ finalizedConflicts[i] = FPCRecord{
+ ConflictID: ID,
+ NodeID: conflictDetail.NodeID,
+ Rounds: conflictDetail.Rounds,
+ Opinions: conflictDetail.Opinions,
+ Status: conflictDetail.Status,
+ }
+ recordedConflicts.lock.Unlock()
+ i++
}
- recordedConflicts.lock.Unlock()
- i++
- }
- err := storeFPCRecords(finalizedConflicts, mongoDB())
- if err != nil {
- log.Errorf("Error while writing on MongoDB: %s", err)
+ err := storeFPCRecords(finalizedConflicts, mongoDB())
+ if err != nil {
+ log.Errorf("Error while writing on MongoDB: %s", err)
+ }
}
}
diff --git a/plugins/analysis/dashboard/fpc_livefeed_test.go b/plugins/analysis/dashboard/fpc_livefeed_test.go
index b012f590..e72421b7 100644
--- a/plugins/analysis/dashboard/fpc_livefeed_test.go
+++ b/plugins/analysis/dashboard/fpc_livefeed_test.go
@@ -30,7 +30,6 @@ func TestCreateFPCUpdate(t *testing.T) {
Opinions: []vote.Opinion{vote.Dislike, vote.Like, vote.Dislike},
}},
},
- Finalized: map[string]vote.Opinion{"one": vote.Like},
}
// create a matching FPCUpdate
@@ -42,7 +41,6 @@ func TestCreateFPCUpdate(t *testing.T) {
NodeID: base58OwnID,
Rounds: 3,
Opinions: []int32{disliked, liked, disliked},
- Status: liked,
},
},
},
--
GitLab