From 53787a85ae77637607625a1d4a3b885f34b42f98 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Mon, 28 Mar 2022 22:12:17 +0200 Subject: [PATCH 1/2] fix: unknown fetcher type error --- cmd/ipfs/add_migrations.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/ipfs/add_migrations.go b/cmd/ipfs/add_migrations.go index b5b6c31a137..d7cb7ae24dd 100644 --- a/cmd/ipfs/add_migrations.go +++ b/cmd/ipfs/add_migrations.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "github.com/ipfs/go-ipfs-files" + files "github.com/ipfs/go-ipfs-files" "github.com/ipfs/go-ipfs/core" "github.com/ipfs/go-ipfs/core/coreapi" "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" @@ -31,6 +31,9 @@ func addMigrations(ctx context.Context, node *core.IpfsNode, fetcher migrations. for _, fetcher := range fetchers { switch f := fetcher.(type) { + case nil: + // https://github.com/ipfs/go-ipfs/issues/8780 + continue case *ipfsfetcher.IpfsFetcher: // Add migrations by connecting to temp node and getting from IPFS err := addMigrationPaths(ctx, node, f.AddrInfo(), f.FetchedPaths(), pin) From a763f6c7eaecd410c7e20cb1d318ca78cc8464f9 Mon Sep 17 00:00:00 2001 From: Marcin Rataj Date: Mon, 28 Mar 2022 23:28:58 +0200 Subject: [PATCH 2/2] fix: match RetryFetcher as HttpFetcher --- cmd/ipfs/add_migrations.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmd/ipfs/add_migrations.go b/cmd/ipfs/add_migrations.go index d7cb7ae24dd..58b62e4f777 100644 --- a/cmd/ipfs/add_migrations.go +++ b/cmd/ipfs/add_migrations.go @@ -31,16 +31,13 @@ func addMigrations(ctx context.Context, node *core.IpfsNode, fetcher migrations. for _, fetcher := range fetchers { switch f := fetcher.(type) { - case nil: - // https://github.com/ipfs/go-ipfs/issues/8780 - continue case *ipfsfetcher.IpfsFetcher: // Add migrations by connecting to temp node and getting from IPFS err := addMigrationPaths(ctx, node, f.AddrInfo(), f.FetchedPaths(), pin) if err != nil { return err } - case *migrations.HttpFetcher: + case *migrations.HttpFetcher, *migrations.RetryFetcher: // https://github.com/ipfs/go-ipfs/issues/8780 // Add the downloaded migration files directly if migrations.DownloadDirectory != "" { var paths []string