Skip to content

Commit

Permalink
[DataApi] Minor Logging and Test fixes (Layr-Labs#291)
Browse files Browse the repository at this point in the history 
Co-authored-by: Siddharth More <Siddhi More>
  • Loading branch information
@siddimore
siddimore authored Feb 29, 2024
1 parent 390c2ad commit 4e8cedb
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions disperser/dataapi/operators_info_handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (s *server) getDeregisteredOperatorForDays(ctx context.Context, days int32)
}

// Log the time taken
s.logger.Info("Time taken to get deregistered operators for days: %v", time.Since(startTime))
s.logger.Info("Time taken to get deregistered operators for days", "duration", time.Since(startTime))
sort.Slice(DeregisteredOperatorMetadata, func(i, j int) bool {
return DeregisteredOperatorMetadata[i].BlockNumber < DeregisteredOperatorMetadata[j].BlockNumber
})
Expand Down Expand Up @@ -86,9 +86,9 @@ func checkIsOnlineAndProcessOperator(operatorStatus OperatorOnlineStatus, operat

// Log the online status
if isOnline {
logger.Debug("Operator %v is online at %s", operatorStatus.IndexedOperatorInfo, socket)
logger.Debug("Operator is online", "operatorInfo", operatorStatus.IndexedOperatorInfo, "socket", socket)
} else {
logger.Debug("Operator %v is offline at %s", operatorStatus.IndexedOperatorInfo, socket)
logger.Debug("Operator is offline", "operatorInfo", operatorStatus.IndexedOperatorInfo, "socket", socket)
}

// Create the metadata regardless of online status
Expand Down
32 changes: 16 additions & 16 deletions disperser/dataapi/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,10 @@ func TestFetchDeregisteredOperatorOffline(t *testing.T) {

mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorState, nil)

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down Expand Up @@ -715,10 +715,10 @@ func TestFetchDeregisteredOperatorInvalidDaysQueryParam(t *testing.T) {

mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorStates, nil)

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=ten", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=ten", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down Expand Up @@ -757,10 +757,10 @@ func TestFetchDeregisteredOperatorQueryDaysGreaterThan30(t *testing.T) {

mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorState, nil)

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=31", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=31", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down Expand Up @@ -803,10 +803,10 @@ func TestFetchDeregisteredOperatorsMultipleOffline(t *testing.T) {

mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorStates, nil)

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down Expand Up @@ -868,10 +868,10 @@ func TestFetchDeregisteredOperatorOnline(t *testing.T) {
}
defer closeServer() // Ensure the server is closed after the test

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down Expand Up @@ -924,10 +924,10 @@ func TestFetchDeregisteredOperatorsMultipleOfflineOnline(t *testing.T) {
}
defer closeServer()

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down Expand Up @@ -998,10 +998,10 @@ func TestFetchDeregisteredOperatorsMultipleOnline(t *testing.T) {
}
defer closeServer2() // Ensure the server is closed after the test

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down Expand Up @@ -1059,10 +1059,10 @@ func TestFetchDeregisteredOperatorsMultipleOfflineSameBlock(t *testing.T) {

mockSubgraphApi.On("QueryIndexedDeregisteredOperatorsForTimeWindow").Return(indexedOperatorStates, nil)

r.GET("/v1/operators-info/deregistered-operators/", testDataApiServer.FetchDeregisteredOperators)
r.GET("/v1/operators-info/deregistered-operators", testDataApiServer.FetchDeregisteredOperators)

w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators/?days=14", nil)
req := httptest.NewRequest(http.MethodGet, "/v1/operators-info/deregistered-operators?days=14", nil)
r.ServeHTTP(w, req)

res := w.Result()
Expand Down

0 comments on commit 4e8cedb

Please sign in to comment.