Hotfix-getDataFromAPI (#951)

* Changed numm of retry attempts

* removed redundant retry attempts

* corrected tests

Author: Yashk767

utils/api.go

@@ -3,7 +3,6 @@ package utils
 import (
 	"errors"
 	"net/http"
-	"razor/core"
 	"time"
 
 	"github.com/PaesslerAG/jsonpath"
@@ -24,14 +23,15 @@ func (*UtilsStruct) GetDataFromAPI(url string) ([]byte, error) {
 			}
 			defer response.Body.Close()
 			if response.StatusCode != 200 {
+				log.Errorf("API: %s responded with status code %d", url, response.StatusCode)
 				return errors.New("unable to reach API")
 			}
 			body, err = IOInterface.ReadAll(response.Body)
 			if err != nil {
 				return err
 			}
 			return nil
-		}, RetryInterface.RetryAttempts(core.MaxRetries))
+		}, retry.Attempts(2), retry.Delay(time.Second*2))
 	if err != nil {
 		return nil, err
 	}

utils/api_test.go

@@ -2,7 +2,6 @@ package utils
 
 import (
 	"errors"
-	"github.com/avast/retry-go"
 	"github.com/stretchr/testify/mock"
 	"razor/utils/mocks"
 	"reflect"
@@ -88,19 +87,16 @@ func TestGetDataFromAPI(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			retryMock := new(mocks.RetryUtils)
 			utilsMock := new(mocks.Utils)
 			ioMock := new(mocks.IOUtils)
 
 			optionsPackageStruct := OptionsPackageStruct{
-				RetryInterface: retryMock,
 				UtilsInterface: utilsMock,
 				IOInterface:    ioMock,
 			}
 			utils := StartRazor(optionsPackageStruct)
 
 			ioMock.On("ReadAll", mock.Anything).Return(tt.args.body, tt.args.bodyErr)
-			retryMock.On("RetryAttempts", mock.AnythingOfType("uint")).Return(retry.Attempts(1))
 
 			got, err := utils.GetDataFromAPI(tt.args.url)
 			if (err != nil) != tt.wantErr {

utils/asset.go

@@ -273,15 +273,11 @@ func (*UtilsStruct) GetDataToCommitFromJob(job bindings.StructsJob) (*big.Int, e
 	// Fetch data from API with retry mechanism
 	var parsedData interface{}
 	if job.SelectorType == 0 {
-		apiErr = retry.Do(
-			func() error {
-				response, apiErr = UtilsInterface.GetDataFromAPI(job.Url)
-				if apiErr != nil {
-					log.Error("Error in fetching data from API: ", apiErr)
-					return apiErr
-				}
-				return nil
-			}, RetryInterface.RetryAttempts(core.MaxRetries))
+		response, apiErr = UtilsInterface.GetDataFromAPI(job.Url)
+		if apiErr != nil {
+			log.Error("Error in fetching data from API: ", apiErr)
+			return nil, apiErr
+		}
 
 		err := json.Unmarshal(response, &parsedJSON)
 		if err != nil {

utils/asset_test.go

@@ -778,17 +778,14 @@ func TestGetDataToCommitFromJob(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			retryMock := new(mocks.RetryUtils)
 			utilsMock := new(mocks.Utils)
 
 			optionsPackageStruct := OptionsPackageStruct{
-				RetryInterface: retryMock,
 				UtilsInterface: utilsMock,
 			}
 			utils := StartRazor(optionsPackageStruct)
 
 			utilsMock.On("GetDataFromAPI", mock.AnythingOfType("string")).Return(tt.args.response, tt.args.responseErr)
-			retryMock.On("RetryAttempts", mock.AnythingOfType("uint")).Return(retry.Attempts(1))
 			utilsMock.On("GetDataFromJSON", mock.Anything, mock.AnythingOfType("string")).Return(tt.args.parsedData, tt.args.parsedDataErr)
 			utilsMock.On("GetDataFromXHTML", mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(tt.args.dataPoint, tt.args.dataPointErr)
 			utilsMock.On("ConvertToNumber", mock.Anything).Return(tt.args.datum, tt.args.datumErr)