Minor cleanups (#140)

smartcontractkit · Jul 17, 2023 · 61eb2c0 · 61eb2c0
1 parent b67d49a
commit 61eb2c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/reportingplugins/mercury/mercury.go b/pkg/reportingplugins/mercury/mercury.go
@@ -234,7 +234,6 @@ func (fac Factory) NewMercuryPlugin(configuration ocr3types.MercuryPluginConfig)
 		configuration.ConfigDigest,
 		configuration.F,
 		epochRound{},
-		new(big.Int),
 		maxReportLength,
 	}
 
@@ -259,7 +258,6 @@ type reportingPlugin struct {
 	configDigest             ocrtypes.ConfigDigest
 	f                        int
 	latestAcceptedEpochRound epochRound
-	latestAcceptedMedian     *big.Int
 	maxReportLength          int
 }
 
@@ -306,10 +304,10 @@ func (rp *reportingPlugin) Observation(ctx context.Context, repts ocrtypes.Repor
 
 	if obs.Ask.Err != nil {
 		obsErrors = append(obsErrors, pkgerrors.Wrap(obs.Ask.Err, "failed to observe Ask"))
-	} else if bid, err := EncodeValueInt192(obs.Ask.Val); err != nil {
+	} else if ask, err := EncodeValueInt192(obs.Ask.Val); err != nil {
 		obsErrors = append(obsErrors, pkgerrors.Wrap(err, "failed to observe Ask; encoding failed"))
 	} else {
-		p.Ask = bid
+		p.Ask = ask
 	}
 
 	if obs.BenchmarkPrice.Err == nil && obs.Bid.Err == nil && obs.Ask.Err == nil {

diff --git a/pkg/reportingplugins/mercury/validation.go b/pkg/reportingplugins/mercury/validation.go
@@ -10,6 +10,7 @@ import (
 // NOTE: hardcoded for now, this may need to change if we support block range on chains other than eth
 const evmHashLen = 32
 
+// ValidateBenchmarkPrice checks that value is between min and max
 func ValidateBenchmarkPrice(paos []ParsedAttributedObservation, f int, min, max *big.Int) error {
 	answer, err := GetConsensusBenchmarkPrice(paos, f)
 	if err != nil {
@@ -23,6 +24,7 @@ func ValidateBenchmarkPrice(paos []ParsedAttributedObservation, f int, min, max
 	return nil
 }
 
+// ValidateBid checks that value is between min and max
 func ValidateBid(paos []ParsedAttributedObservation, f int, min, max *big.Int) error {
 	answer, err := GetConsensusBid(paos, f)
 	if err != nil {
@@ -36,6 +38,7 @@ func ValidateBid(paos []ParsedAttributedObservation, f int, min, max *big.Int) e
 	return nil
 }
 
+// ValidateAsk checks that value is between min and max
 func ValidateAsk(paos []ParsedAttributedObservation, f int, min, max *big.Int) error {
 	answer, err := GetConsensusAsk(paos, f)
 	if err != nil {
@@ -49,6 +52,7 @@ func ValidateAsk(paos []ParsedAttributedObservation, f int, min, max *big.Int) e
 	return nil
 }
 
+// ValidateCurrentBlock sanity checks number and hash
 func ValidateCurrentBlock(paos []ParsedAttributedObservation, f int, validFromBlockNum int64) error {
 	if validFromBlockNum < 0 {
 		return fmt.Errorf("validFromBlockNum must be >= 0 (got: %d)", validFromBlockNum)