Merge pull request #803 from pastelnetwork/PSL-1132_countFieldOptional

[PSL-1132] make count field optional in self-healing detailed logs en…

Author: j-rafique

walletnode/api/services/self_healing.go

@@ -49,25 +49,20 @@ func (service *MetricsAPIHandler) APIKeyAuth(ctx context.Context, _ string, _ *s
 
 // GetDetailedLogs returns the detailed self-healing reports
 func (service *MetricsAPIHandler) GetDetailedLogs(ctx context.Context, p *metrics.GetDetailedLogsPayload) (*metrics.SelfHealingReports, error) {
-	if p.Count == nil && p.EventID == nil {
-		return nil, metrics.MakeBadRequest(fmt.Errorf("count or event_id is required"))
-	}
-
-	if p.Count != nil && p.EventID != nil {
-		return nil, metrics.MakeBadRequest(fmt.Errorf("only one of count or event_id is allowed"))
-	}
-
-	req := metricsregister.SHReportRequest{
-		PastelID:   p.Pid,
-		Passphrase: p.Key,
-	}
-
-	if p.Count != nil {
-		req.Count = *p.Count
-	}
+	var req metricsregister.SHReportRequest
 
 	if p.EventID != nil {
-		req.EventID = *p.EventID
+		req = metricsregister.SHReportRequest{
+			EventID:    *p.EventID,
+			PastelID:   p.Pid,
+			Passphrase: p.Key,
+		}
+	} else {
+		req = metricsregister.SHReportRequest{
+			Count:      10,
+			PastelID:   p.Pid,
+			Passphrase: p.Key,
+		}
 	}
 
 	reports, err := service.metricsService.GetDetailedLogs(ctx, req)

walletnode/services/metrics/service.go

@@ -311,6 +311,6 @@ func (service *Service) fetchSHChallengesFromNode(addr, pid, passphrase string,
 func NewMetricsService(pastelClient pastel.Client) *Service {
 	return &Service{
 		pastelHandler: mixins.NewPastelHandler(pastelClient),
-		client:        http.Client{Timeout: time.Duration(60) * time.Second},
+		client:        http.Client{Timeout: time.Duration(120) * time.Second},
 	}
 }