From a6c2cf2472d65d3fae4570f50530acb2e27e5d5b Mon Sep 17 00:00:00 2001
From: Adam Hamrick <adam.hamrick@smartcontract.com>
Date: Tue, 11 Jul 2023 19:05:03 -0400
Subject: [PATCH] Remove old reporters

---
 integration-tests/actions/ocr2_helpers.go     |  2 +-
 integration-tests/actions/ocr_helpers.go      |  2 +-
 .../contracts/ethereum_contracts.go           | 59 ++++++++-----------
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/integration-tests/actions/ocr2_helpers.go b/integration-tests/actions/ocr2_helpers.go
index 24fbafc515e..fa31d978632 100644
--- a/integration-tests/actions/ocr2_helpers.go
+++ b/integration-tests/actions/ocr2_helpers.go
@@ -366,7 +366,7 @@ func StartNewOCR2Round(
 		if err != nil {
 			return fmt.Errorf("requesting new OCR round %d have failed: %w", i+1, err)
 		}
-		ocrRound := contracts.NewOffchainAggregatorV2RoundConfirmer(ocrInstances[i], big.NewInt(roundNumber), timeout, nil)
+		ocrRound := contracts.NewOffchainAggregatorV2RoundConfirmer(ocrInstances[i], big.NewInt(roundNumber), timeout)
 		client.AddHeaderEventSubscription(ocrInstances[i].Address(), ocrRound)
 		err = client.WaitForEvents()
 		if err != nil {
diff --git a/integration-tests/actions/ocr_helpers.go b/integration-tests/actions/ocr_helpers.go
index 2f94bb9693f..3befb0a01f3 100644
--- a/integration-tests/actions/ocr_helpers.go
+++ b/integration-tests/actions/ocr_helpers.go
@@ -330,7 +330,7 @@ func StartNewRound(
 		if err != nil {
 			return fmt.Errorf("requesting new OCR round %d have failed: %w", i+1, err)
 		}
-		ocrRound := contracts.NewOffchainAggregatorRoundConfirmer(ocrInstances[i], big.NewInt(roundNumber), client.GetNetworkConfig().Timeout.Duration, nil)
+		ocrRound := contracts.NewOffchainAggregatorRoundConfirmer(ocrInstances[i], big.NewInt(roundNumber), client.GetNetworkConfig().Timeout.Duration)
 		client.AddHeaderEventSubscription(ocrInstances[i].Address(), ocrRound)
 		err = client.WaitForEvents()
 		if err != nil {
diff --git a/integration-tests/contracts/ethereum_contracts.go b/integration-tests/contracts/ethereum_contracts.go
index 2e7062e7911..cc8edae1f36 100644
--- a/integration-tests/contracts/ethereum_contracts.go
+++ b/integration-tests/contracts/ethereum_contracts.go
@@ -34,7 +34,6 @@ import (
 
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	eth_contracts "github.com/smartcontractkit/chainlink/integration-tests/contracts/ethereum"
-	"github.com/smartcontractkit/chainlink/integration-tests/testreporters"
 )
 
 // EthereumOracle oracle for "directrequest" job tests
@@ -1006,14 +1005,13 @@ func (o *RunlogRoundConfirmer) Wait() error {
 
 // OffchainAggregatorRoundConfirmer is a header subscription that awaits for a certain OCR round to be completed
 type OffchainAggregatorRoundConfirmer struct {
-	ocrInstance        OffchainAggregator
-	roundID            *big.Int
-	doneChan           chan struct{}
-	context            context.Context
-	cancel             context.CancelFunc
-	optionalTestReport *testreporters.OCRSoakTestReport
-	blocksSinceAnswer  uint
-	complete           bool
+	ocrInstance       OffchainAggregator
+	roundID           *big.Int
+	doneChan          chan struct{}
+	context           context.Context
+	cancel            context.CancelFunc
+	blocksSinceAnswer uint
+	complete          bool
 }
 
 // NewOffchainAggregatorRoundConfirmer provides a new instance of a OffchainAggregatorRoundConfirmer
@@ -1021,17 +1019,15 @@ func NewOffchainAggregatorRoundConfirmer(
 	contract OffchainAggregator,
 	roundID *big.Int,
 	timeout time.Duration,
-	optionalTestReport *testreporters.OCRSoakTestReport,
 ) *OffchainAggregatorRoundConfirmer {
 	ctx, ctxCancel := context.WithTimeout(context.Background(), timeout)
 	return &OffchainAggregatorRoundConfirmer{
-		ocrInstance:        contract,
-		roundID:            roundID,
-		doneChan:           make(chan struct{}),
-		context:            ctx,
-		cancel:             ctxCancel,
-		optionalTestReport: optionalTestReport,
-		complete:           false,
+		ocrInstance: contract,
+		roundID:     roundID,
+		doneChan:    make(chan struct{}),
+		context:     ctx,
+		cancel:      ctxCancel,
+		complete:    false,
 	}
 }
 
@@ -1083,14 +1079,13 @@ func (o *OffchainAggregatorRoundConfirmer) Complete() bool {
 
 // OffchainAggregatorRoundConfirmer is a header subscription that awaits for a certain OCR round to be completed
 type OffchainAggregatorV2RoundConfirmer struct {
-	ocrInstance        OffchainAggregatorV2
-	roundID            *big.Int
-	doneChan           chan struct{}
-	context            context.Context
-	cancel             context.CancelFunc
-	optionalTestReport *testreporters.OCRSoakTestReport
-	blocksSinceAnswer  uint
-	complete           bool
+	ocrInstance       OffchainAggregatorV2
+	roundID           *big.Int
+	doneChan          chan struct{}
+	context           context.Context
+	cancel            context.CancelFunc
+	blocksSinceAnswer uint
+	complete          bool
 }
 
 // NewOffchainAggregatorRoundConfirmer provides a new instance of a OffchainAggregatorRoundConfirmer
@@ -1098,17 +1093,15 @@ func NewOffchainAggregatorV2RoundConfirmer(
 	contract OffchainAggregatorV2,
 	roundID *big.Int,
 	timeout time.Duration,
-	optionalTestReport *testreporters.OCRSoakTestReport,
 ) *OffchainAggregatorV2RoundConfirmer {
 	ctx, ctxCancel := context.WithTimeout(context.Background(), timeout)
 	return &OffchainAggregatorV2RoundConfirmer{
-		ocrInstance:        contract,
-		roundID:            roundID,
-		doneChan:           make(chan struct{}),
-		context:            ctx,
-		cancel:             ctxCancel,
-		optionalTestReport: optionalTestReport,
-		complete:           false,
+		ocrInstance: contract,
+		roundID:     roundID,
+		doneChan:    make(chan struct{}),
+		context:     ctx,
+		cancel:      ctxCancel,
+		complete:    false,
 	}
 }