MERC-6003 Move aggregator to v4 pkg

go.mod

@@ -13,7 +13,6 @@ require (
 )
 
 require (
-	cloud.google.com/go/compute/metadata v0.3.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
@@ -51,7 +50,6 @@ require (
 	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.11.1 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
@@ -66,7 +64,6 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/mod v0.19.0 // indirect
 	golang.org/x/net v0.27.0 // indirect
 	golang.org/x/sys v0.22.0 // indirect
 	golang.org/x/text v0.16.0 // indirect

mercury/aggregate_functions.go

@@ -166,39 +166,3 @@ func GetConsensusNativeFee(paos []PAONativeFee, f int) (*big.Int, error) {
 
 	return validNativeFees[len(validNativeFees)/2], nil
 }
-
-type PAOMarketStatus interface {
-	GetMarketStatus() (uint32, bool)
-}
-
-// GetConsensusMarketStatus gets the most common status, provided that it is at least F+1.
-func GetConsensusMarketStatus(paos []PAOMarketStatus, f int) (uint32, error) {
-	marketStatusCounts := make(map[uint32]int)
-	for _, pao := range paos {
-		marketStatus, valid := pao.GetMarketStatus()
-		if valid {
-			marketStatusCounts[marketStatus] += 1
-		}
-	}
-
-	var mostCommonMarketStatus uint32
-	var mostCommonCount int
-	for marketStatus, count := range marketStatusCounts {
-		if count > mostCommonCount {
-			mostCommonMarketStatus = marketStatus
-			mostCommonCount = count
-		} else if count == mostCommonCount {
-			// For stability, always prefer the smaller enum value in case of ties.
-			// In practice this will prefer CLOSED over OPEN.
-			if marketStatus < mostCommonMarketStatus {
-				mostCommonMarketStatus = marketStatus
-			}
-		}
-	}
-
-	if mostCommonCount < f+1 {
-		return 0, fmt.Errorf("market status has fewer than f+1 observations (status %d got %d/%d)", mostCommonMarketStatus, mostCommonCount, len(paos))
-	}
-
-	return mostCommonMarketStatus, nil
-}

mercury/aggregate_functions_test.go

@@ -407,44 +407,6 @@ func Test_AggregateFunctions(t *testing.T) {
 			assert.EqualError(t, err, "fewer than f+1 observations have a valid nativeFee (got: 1/4)")
 		})
 	})
-
-	t.Run("GetConsensusMarketStatus", func(t *testing.T) {
-		t.Run("gets consensus on market status when valid", func(t *testing.T) {
-			marketStatus, err := GetConsensusMarketStatus(convertMarketStatus(validPaos), f)
-			require.NoError(t, err)
-			assert.Equal(t, uint32(1), marketStatus)
-		})
-		t.Run("treats zero values as valid", func(t *testing.T) {
-			paos := NewValidParsedAttributedObservations()
-			for i := range paos {
-				paos[i].MarketStatus = 0
-			}
-			marketStatus, err := GetConsensusMarketStatus(convertMarketStatus(paos), f)
-			require.NoError(t, err)
-			assert.Equal(t, uint32(0), marketStatus)
-		})
-		t.Run("is stable during ties", func(t *testing.T) {
-			paos := NewValidParsedAttributedObservations()
-			for i := range paos {
-				paos[i].MarketStatus = uint32(i % 2)
-			}
-			marketStatus, err := GetConsensusMarketStatus(convertMarketStatus(paos), f)
-			require.NoError(t, err)
-			assert.Equal(t, uint32(0), marketStatus)
-		})
-		t.Run("fails when the mode is less than f+1", func(t *testing.T) {
-			paos := NewValidParsedAttributedObservations()
-			for i := range paos {
-				paos[i].MarketStatus = uint32(i)
-			}
-			_, err := GetConsensusMarketStatus(convertMarketStatus(paos), f)
-			assert.EqualError(t, err, "market status has fewer than f+1 observations (status 0 got 1/4)")
-		})
-		t.Run("fails when all observations are invalid", func(t *testing.T) {
-			_, err := GetConsensusMarketStatus(convertMarketStatus(invalidPaos), f)
-			assert.EqualError(t, err, "market status has fewer than f+1 observations (status 0 got 0/4)")
-		})
-	})
 }
 
 // convert funcs are necessary because go is not smart enough to cast
@@ -485,9 +447,3 @@ func convertNativeFee(pao []testParsedAttributedObservation) (ret []PAONativeFee
 	}
 	return ret
 }
-func convertMarketStatus(pao []testParsedAttributedObservation) (ret []PAOMarketStatus) {
-	for _, v := range pao {
-		ret = append(ret, v)
-	}
-	return ret
-}

mercury/v4/aggregate_functions.go

@@ -0,0 +1,39 @@
+package v4
+
+import "fmt"
+
+type PAOMarketStatus interface {
+	GetMarketStatus() (uint32, bool)
+}
+
+// GetConsensusMarketStatus gets the most common status, provided that it is at least F+1.
+func GetConsensusMarketStatus(paos []PAOMarketStatus, f int) (uint32, error) {
+	marketStatusCounts := make(map[uint32]int)
+	for _, pao := range paos {
+		marketStatus, valid := pao.GetMarketStatus()
+		if valid {
+			marketStatusCounts[marketStatus] += 1
+		}
+	}
+
+	var mostCommonMarketStatus uint32
+	var mostCommonCount int
+	for marketStatus, count := range marketStatusCounts {
+		if count > mostCommonCount {
+			mostCommonMarketStatus = marketStatus
+			mostCommonCount = count
+		} else if count == mostCommonCount {
+			// For stability, always prefer the smaller enum value in case of ties.
+			// In practice this will prefer CLOSED over OPEN.
+			if marketStatus < mostCommonMarketStatus {
+				mostCommonMarketStatus = marketStatus
+			}
+		}
+	}
+
+	if mostCommonCount < f+1 {
+		return 0, fmt.Errorf("market status has fewer than f+1 observations (status %d got %d/%d)", mostCommonMarketStatus, mostCommonCount, len(paos))
+	}
+
+	return mostCommonMarketStatus, nil
+}