compile

ipfs-inactive · Sep 20, 2023 · 8a4982a · 8a4982a
1 parent 8e1d706
commit 8a4982a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/blockstore_caboose.go b/blockstore_caboose.go
@@ -42,7 +42,7 @@ func newCabooseBlockStore(orchestrator, loggingEndpoint string, cdns *cachedDNS)
 	}
 
 	saturnOrchestratorClient := &http.Client{
-		Timeout: caboose.DefaultSaturnOrchestratorRequestTimeout,
+		Timeout: caboose.DefaultOrchestratorRequestTimeout,
 		Transport: &customTransport{
 			AuthorizationBearerToken: os.Getenv(EnvSaturnLoggerSecret),
 			RoundTripper: &http.Transport{
@@ -53,7 +53,7 @@ func newCabooseBlockStore(orchestrator, loggingEndpoint string, cdns *cachedDNS)
 	}
 
 	saturnLoggerClient := &http.Client{
-		Timeout: caboose.DefaultSaturnOrchestratorRequestTimeout, // caboose does nto provide custom timeout for logger, reusing one for orchestrator
+		Timeout: caboose.DefaultOrchestratorRequestTimeout, // caboose does nto provide custom timeout for logger, reusing one for orchestrator
 		Transport: &customTransport{
 			AuthorizationBearerToken: os.Getenv(EnvSaturnLoggerSecret),
 			RoundTripper: &http.Transport{
@@ -64,7 +64,7 @@ func newCabooseBlockStore(orchestrator, loggingEndpoint string, cdns *cachedDNS)
 	}
 
 	saturnRetrievalClient := &http.Client{
-		Timeout: caboose.DefaultSaturnCarRequestTimeout,
+		Timeout: caboose.DefaultCarRequestTimeout,
 		Transport: otelhttp.NewTransport(&customTransport{
 			RoundTripper: &http.Transport{
 				// Increasing concurrency defaults from http.DefaultTransport
@@ -102,7 +102,7 @@ func newCabooseBlockStore(orchestrator, loggingEndpoint string, cdns *cachedDNS)
 
 		DoValidation: true,
 		PoolRefresh:  caboose.DefaultPoolRefreshInterval,
-		SaturnClient: saturnRetrievalClient,
+		Client:       saturnRetrievalClient,
 
 		ComplianceCidPeriod: int64(5),
 	})

diff --git a/lib/gateway_utils.go b/lib/gateway_utils.go
@@ -54,7 +54,7 @@ func GatewayError(err error) error {
 
 	// All timeouts should produce 504 Gateway Timeout
 	if errors.Is(err, context.DeadlineExceeded) ||
-		errors.Is(err, caboose.ErrSaturnTimeout) ||
+		errors.Is(err, caboose.ErrTimeout) ||
 		// Unfortunately this is not an exported type so we have to check for the content.
 		strings.Contains(err.Error(), "Client.Timeout exceeded") {
 		return fmt.Errorf("%w: %s", gateway.ErrGatewayTimeout, err.Error())