use hashmap for diagnostic engine

internal/diagnosticsEngine/diagnosticsEngine.go

@@ -13,7 +13,7 @@ type IDiagnosticsEngine interface {
 	// allow agents to report status of sent message
 	ReportSendMessageStatus(bool)
 	// allow server to report number of end message closures
-	ReportEndMessagingStatus()
+	ReportEndMessagingStatus(int)
 	// allow for resetting of diagnostics for round-to-round data
 	ResetRoundDiagnostics()
 	// compile results for end of round messaging status
@@ -33,8 +33,8 @@ func (de *DiagnosticsEngine) ReportSendMessageStatus(status bool) {
 	}
 }
 
-func (de *DiagnosticsEngine) ReportEndMessagingStatus() {
-	de.numEndMessagings++
+func (de *DiagnosticsEngine) ReportEndMessagingStatus(n int) {
+	de.numEndMessagings = n
 }
 
 func (de *DiagnosticsEngine) ResetRoundDiagnostics() {

internal/diagnosticsEngine/diagnosticsEngine_test.go

@@ -48,7 +48,7 @@ func TestGetNumberEndMessagings(t *testing.T) {
 	if initEnds != 0 {
 		t.Error("Diagnostics engine intialised with non-zero number")
 	}
-	engine.ReportEndMessagingStatus()
+	engine.ReportEndMessagingStatus(1)
 	newEnds := engine.GetNumberEndMessagings()
 	if newEnds != initEnds+1 {
 		t.Error("Diagnostics engine successes not correctly incremented")
@@ -94,11 +94,8 @@ func TestEndMessagingSuccessRate(t *testing.T) {
 	engine := diagnosticsEngine.CreateDiagnosticsEngine()
 	numAgents := 100
 	numReports := 20
-	for i := 0; i < numAgents; i++ {
-		if i < numReports {
-			engine.ReportEndMessagingStatus()
-		}
-	}
+
+	engine.ReportEndMessagingStatus(numReports)
 	trueSuccessRate := engine.GetEndMessagingSuccessRate(numAgents)
 	expectedSuccessRate := float32(numReports) / float32(numAgents) * 100
 	if trueSuccessRate != expectedSuccessRate {
@@ -109,11 +106,12 @@ func TestEndMessagingSuccessRate(t *testing.T) {
 func TestResetDiagnostics(t *testing.T) {
 	engine := diagnosticsEngine.CreateDiagnosticsEngine()
 	rounds := 3
+	nMessages := 10
 	for r := 0; r < rounds; r++ {
-		for delta := 0; delta < 10; delta++ {
-			engine.ReportEndMessagingStatus()
+		for delta := 0; delta < nMessages; delta++ {
 			engine.ReportSendMessageStatus(true)
 		}
+		engine.ReportEndMessagingStatus(nMessages)
 		engine.ResetRoundDiagnostics()
 		nSent := engine.GetNumberSentMessages()
 		nSucc := engine.GetNumberMessageSuccesses()

pkg/server/baseServer.go

@@ -55,12 +55,12 @@ awaitSessionEnd:
 		select {
 		case id := <-serv.agentFinishedMessaging:
 			agentStoppedTalkingMap[id] = struct{}{}
-			serv.diagnosticsEngine.ReportEndMessagingStatus()
 		case <-ctx.Done():
 			status = false
 			break awaitSessionEnd
 		}
 	}
+	serv.diagnosticsEngine.ReportEndMessagingStatus(len(agentStoppedTalkingMap))
 	close(serv.endNotifyAgentDone)
 	return status
 }