fix: rm ParseNewBatchV3 as it is a static call.

Author: PatStiles

core/chainio/avs_reader.go

@@ -86,7 +86,7 @@ func (r *AvsReader) GetNotRespondedTasksFrom(fromBlock uint64) ([]servicemanager
 	var tasks []servicemanager.ContractAlignedLayerServiceManagerNewBatchV3
 
 	for logs.Next() {
-		task, err := r.ParseNewBatchV3Retryable(logs.Event.Raw)
+		task, err := r.AvsContractBindings.ServiceManager.ParseNewBatchV3(logs.Event.Raw)
 		if err != nil {
 			return nil, err
 		}

core/chainio/retryable.go

@@ -306,23 +306,6 @@ func (r *AvsReader) FilterNewBatchV3Retryable(opts *bind.FilterOpts, batchMerkle
 	return retry.RetryWithData(FilterNewBatchV3(r, opts, batchMerkleRoot), retry.DefaultRetryConfig())
 }
 
-func ParseNewBatchV3(r *AvsReader, log types.Log) func() (*servicemanager.ContractAlignedLayerServiceManagerNewBatchV3, error) {
-	filter_func := func() (*servicemanager.ContractAlignedLayerServiceManagerNewBatchV3, error) {
-		return r.AvsContractBindings.ServiceManager.ParseNewBatchV3(log)
-	}
-	return filter_func
-}
-
-/*
-ParseNewBatchV3
-Parses and returns the task data from a NewBatchV3 Log
-- All errors are considered Transient Errors
-- Retry times (3 retries): 12 sec (1 Blocks), 24 sec (2 Blocks), 48 sec (4 Blocks)
-*/
-func (r *AvsReader) ParseNewBatchV3Retryable(log types.Log) (*servicemanager.ContractAlignedLayerServiceManagerNewBatchV3, error) {
-	return retry.RetryWithData(ParseNewBatchV3(r, log), retry.ChainRetryConfig())
-}
-
 func ReaderBatchesState(r *AvsReader, opts *bind.CallOpts, arg0 [32]byte) func() (struct {
 	TaskCreatedBlock      uint32
 	Responded             bool

core/retry_test.go

@@ -964,60 +964,6 @@ func TestFilterNewBatchV3(t *testing.T) {
 		return
 	}
 }
-
-func TestParseNewBatchV3(t *testing.T) {
-	cmd, _, err := SetupAnvil(8545)
-	if err != nil {
-		t.Errorf("Error setting up Anvil: %s\n", err)
-	}
-	aggregatorConfig := config.NewAggregatorConfig("../config-files/config-aggregator-test.yaml")
-	avsReader, err := chainio.NewAvsReaderFromConfig(aggregatorConfig.BaseConfig, aggregatorConfig.EcdsaConfig)
-	if err != nil {
-		return
-	}
-	logs, err := avsReader.FilterNewBatchV3Retryable(&bind.FilterOpts{Start: 1, End: nil, Context: context.Background()}, nil)
-	if err != nil {
-		return
-	}
-	parse_func := chainio.ParseNewBatchV3(avsReader, logs.Event.Raw)
-	_, err = parse_func()
-	assert.NotNil(t, err)
-	if !strings.Contains(err.Error(), "no event signature") {
-		t.Errorf("ParseNewBatchV3 did not return expected error: %s\n", err)
-		return
-	}
-	if err := cmd.Process.Kill(); err != nil {
-		t.Errorf("Error killing process: %v\n", err)
-		return
-	}
-	parse_func = chainio.ParseNewBatchV3(avsReader, logs.Event.Raw)
-	_, err = parse_func()
-	assert.NotNil(t, err)
-	if _, ok := err.(retry.PermanentError); ok {
-		t.Errorf("ParseNewBatchV3 Emitted non-Transient error: %s\n", err)
-		return
-	}
-	if !strings.Contains(err.Error(), "connection reset") {
-		t.Errorf("ParseNewBatchV3 did not return expected error: %s\n", err)
-		return
-	}
-	cmd, _, err = SetupAnvil(8545)
-	if err != nil {
-		t.Errorf("Error setting up Anvil: %s\n", err)
-	}
-	parse_func = chainio.ParseNewBatchV3(avsReader, logs.Event.Raw)
-	_, err = parse_func()
-	assert.NotNil(t, err)
-	if !strings.Contains(err.Error(), "no event signature") {
-		t.Errorf("ParseNewBatchV3 did not return expected error: %s\n", err)
-		return
-	}
-	if err := cmd.Process.Kill(); err != nil {
-		t.Errorf("Error killing process: %v\n", err)
-		return
-	}
-}
-
 func TestBatchesStateReader(t *testing.T) {
 	cmd, _, err := SetupAnvil(8545)
 	if err != nil {
@@ -1050,7 +996,7 @@ func TestBatchesStateReader(t *testing.T) {
 		t.Errorf("BatchesStateReader Emitted non-Transient error: %s\n", err)
 		return
 	}
-	if !strings.Contains(err.Error(), "connect: connection refused") {
+	if !strings.Contains(err.Error(), "connection reset") {
 		t.Errorf("BatchesStateReader did not contain expected error: %s\n", err)
 		return
 	}