Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions repo/fsrepo/migrations/fetch.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
// same name it has inside the archive. Otherwise, the binary file is written
// to the file named by out.
func FetchBinary(ctx context.Context, fetcher Fetcher, dist, ver, binName, out string) (string, error) {
// The archive file name is the base of dist to support possible subdir in
// dist, for example: "ipfs-repo-migrations/ipfs-11-to-12"
// The archive file name is the base of dist. This is to support a possible subdir in
// dist, for example: "ipfs-repo-migrations/fs-repo-11-to-12"
arcName := path.Base(dist)
// If binary base name is not specified, then it is same as archive base name.
if binName == "" {
Expand Down
2 changes: 1 addition & 1 deletion repo/fsrepo/migrations/fetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

const (
// Current dirstibution to fetch migrations from
CurrentIpfsDist = "/ipfs/Qme8pJhBidEUXRdpcWLGR2fkG5kdwVnaMh3kabjfP8zz7Y"
CurrentIpfsDist = "/ipfs/QmZqzacg5Q8WpDL7SymogoaSZYw6RZT2kgPavymCmMwWse"
// Latest distribution path. Default for fetchers.
LatestIpfsDist = "/ipns/dist.ipfs.io"

Expand Down
2 changes: 1 addition & 1 deletion repo/fsrepo/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func ExeName(name string) string {
}

func migrationName(from, to int) string {
return fmt.Sprintf("ipfs-%d-to-%d", from, to)
return fmt.Sprintf("fs-repo-%d-to-%d", from, to)
}

// findMigrations returns a list of migrations, ordered from first to last
Expand Down
4 changes: 2 additions & 2 deletions repo/fsrepo/migrations/migrations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func TestFetchMigrations(t *testing.T) {
}
defer os.RemoveAll(tmpDir)

needed := []string{"ipfs-1-to-2", "ipfs-2-to-3"}
needed := []string{"fs-repo-1-to-2", "fs-repo-2-to-3"}
fetched, err := fetchMigrations(ctx, fetcher, needed, tmpDir)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -177,7 +177,7 @@ func TestRunMigrations(t *testing.T) {

err = RunMigration(ctx, fetcher, targetVer, fakeIpfs, true)
if err != nil {
if !strings.HasPrefix(err.Error(), "migration ipfs-10-to-11 failed") {
if !strings.HasPrefix(err.Error(), "migration fs-repo-10-to-11 failed") {
t.Fatal(err)
}
}
Expand Down