refactor endpoint

Author: Marketen

api/api.go

@@ -326,63 +326,53 @@ func (m *ApiService) handleMemoryValidatorBlocks(w http.ResponseWriter, r *http.
 	// Create a map to hold the ordered blocks, with the ValidatorIndex as the key
 	orderedBlocks := make(map[uint64]*httpOkValBlocks)
 
-	// Add the ordered blocks to the map
+	// Iterate over the ProposedBlocks and add them to the orderedBlocks map
 	for _, block := range proposedBlocks {
 		validatorIndex := block.ValidatorIndex
-		if _, ok := orderedBlocks[validatorIndex]; !ok {
-			orderedBlocks[validatorIndex] = &httpOkValBlocks{ValidatorIndex: validatorIndex}
+		if valBlocks, ok := orderedBlocks[validatorIndex]; ok {
+			valBlocks.ProposedBlocks = append(valBlocks.ProposedBlocks, block)
+		} else {
+			orderedBlocks[validatorIndex] = &httpOkValBlocks{
+				ValidatorIndex: validatorIndex,
+				ProposedBlocks: []oracle.Block{block},
+			}
 		}
-		orderedBlocks[validatorIndex].ProposedBlocks = append(orderedBlocks[validatorIndex].ProposedBlocks, block)
 	}
 
+	// Iterate over the MissedBlocks and add them to the orderedBlocks map
 	for _, block := range missedBlocks {
 		validatorIndex := block.ValidatorIndex
-		if _, ok := orderedBlocks[validatorIndex]; !ok {
-			orderedBlocks[validatorIndex] = &httpOkValBlocks{ValidatorIndex: validatorIndex}
+		if valBlocks, ok := orderedBlocks[validatorIndex]; ok {
+			valBlocks.MissedBlocks = append(valBlocks.MissedBlocks, block)
+		} else {
+			orderedBlocks[validatorIndex] = &httpOkValBlocks{
+				ValidatorIndex: validatorIndex,
+				MissedBlocks:   []oracle.Block{block},
+			}
 		}
-		orderedBlocks[validatorIndex].MissedBlocks = append(orderedBlocks[validatorIndex].MissedBlocks, block)
 	}
 
+	// Iterate over the WrongFeeBlocks and add them to the orderedBlocks map
 	for _, block := range wrongFeeBlocks {
 		validatorIndex := block.ValidatorIndex
-		if _, ok := orderedBlocks[validatorIndex]; !ok {
-			orderedBlocks[validatorIndex] = &httpOkValBlocks{ValidatorIndex: validatorIndex}
+		if valBlocks, ok := orderedBlocks[validatorIndex]; ok {
+			valBlocks.WrongFeeBlocks = append(valBlocks.WrongFeeBlocks, block)
+		} else {
+			orderedBlocks[validatorIndex] = &httpOkValBlocks{
+				ValidatorIndex: validatorIndex,
+				WrongFeeBlocks: []oracle.Block{block},
+			}
 		}
-		orderedBlocks[validatorIndex].WrongFeeBlocks = append(orderedBlocks[validatorIndex].WrongFeeBlocks, block)
-	}
-
-	// Sort the blocks within each validator index by slot number
-	for _, valBlocks := range orderedBlocks {
-		sort.Slice(valBlocks.ProposedBlocks, func(i, j int) bool {
-			return valBlocks.ProposedBlocks[i].Slot < valBlocks.ProposedBlocks[j].Slot
-		})
-		sort.Slice(valBlocks.MissedBlocks, func(i, j int) bool {
-			return valBlocks.MissedBlocks[i].Slot < valBlocks.MissedBlocks[j].Slot
-		})
-		sort.Slice(valBlocks.WrongFeeBlocks, func(i, j int) bool {
-			return valBlocks.WrongFeeBlocks[i].Slot < valBlocks.WrongFeeBlocks[j].Slot
-		})
-	}
-
-	// Create a slice to hold the ordered validator indices
-	orderedIndices := make([]uint64, 0, len(orderedBlocks))
-
-	// Extract the validator indices from the map into the slice
-	for index := range orderedBlocks {
-		orderedIndices = append(orderedIndices, index)
 	}
 
-	// Sort the validator indices in ascending order
-	sort.Slice(orderedIndices, func(i, j int) bool {
-		return orderedIndices[i] < orderedIndices[j]
-	})
-
 	// Create a slice to hold the final JSON output
 	finalOutput := make([]*httpOkValBlocks, 0, len(orderedBlocks))
 
-	// Add the blocks to the final JSON output in the ordered sequence
-	for _, index := range orderedIndices {
-		finalOutput = append(finalOutput, orderedBlocks[index])
+	// Iterate over the orderedBlocks map using the validator indices in ascending order
+	for index := uint64(0); index < uint64(len(orderedBlocks)); index++ {
+		if valBlocks, ok := orderedBlocks[index]; ok {
+			finalOutput = append(finalOutput, valBlocks)
+		}
 	}
 
 	m.respondOK(w, finalOutput)