Fix provider/location resolver using incorrect cache time

data-preservation-programs · Jul 22, 2023 · f74a47a · f74a47a
1 parent 8452f1d
commit f74a47a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/integration/filplus/main.go b/integration/filplus/main.go
@@ -2,6 +2,8 @@ package main
 
 import (
 	"context"
+	"time"
+
 	"github.com/data-preservation-programs/RetrievalBot/integration/filplus/util"
 	"github.com/data-preservation-programs/RetrievalBot/pkg/env"
 	"github.com/data-preservation-programs/RetrievalBot/pkg/model"
@@ -13,7 +15,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"time"
 )
 
 var logger = logging.Logger("filplus-integration")
@@ -109,11 +110,11 @@ func NewFilPlusIntegration() *FilPlusIntegration {
 	batchSize := env.GetInt(env.FilplusIntegrationBatchSize, 100)
 	providerCacheTTL := env.GetDuration(env.ProviderCacheTTL, 24*time.Hour)
 	locationCacheTTL := env.GetDuration(env.LocationCacheTTL, 24*time.Hour)
-	locationResolver := resolver.NewLocationResolver(env.GetRequiredString(env.IPInfoToken), providerCacheTTL)
+	locationResolver := resolver.NewLocationResolver(env.GetRequiredString(env.IPInfoToken), locationCacheTTL)
 	providerResolver, err := resolver.NewProviderResolver(
 		env.GetString(env.LotusAPIUrl, "https://api.node.glif.io/rpc/v0"),
 		env.GetString(env.LotusAPIToken, ""),
-		locationCacheTTL)
+		providerCacheTTL)
 	if err != nil {
 		panic(err)
 	}

diff --git a/integration/spcoverage/main.go b/integration/spcoverage/main.go
@@ -1,6 +1,9 @@
 package main
 
 import (
+	"os"
+	"time"
+
 	"github.com/data-preservation-programs/RetrievalBot/integration/filplus/util"
 	"github.com/data-preservation-programs/RetrievalBot/pkg/env"
 	"github.com/data-preservation-programs/RetrievalBot/pkg/model"
@@ -13,8 +16,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-	"os"
-	"time"
 )
 
 var logger = logging.Logger("spcoverage")
@@ -76,11 +77,11 @@ func run(c *cli.Context) error {
 
 	providerCacheTTL := env.GetDuration(env.ProviderCacheTTL, 24*time.Hour)
 	locationCacheTTL := env.GetDuration(env.LocationCacheTTL, 24*time.Hour)
-	locationResolver := resolver.NewLocationResolver(env.GetRequiredString(env.IPInfoToken), providerCacheTTL)
+	locationResolver := resolver.NewLocationResolver(env.GetRequiredString(env.IPInfoToken), locationCacheTTL)
 	providerResolver, err := resolver.NewProviderResolver(
 		env.GetString(env.LotusAPIUrl, "https://api.node.glif.io/rpc/v0"),
 		env.GetString(env.LotusAPIToken, ""),
-		locationCacheTTL)
+		providerCacheTTL)
 	if err != nil {
 		panic(err)
 	}