Merge pull request #95 from ipfs/feat/repo-migration-raw-multihashes

 Migration 11-12: migrate CIDsv1 to raw multihashes

Makefile

@@ -40,4 +40,4 @@ test_go: $(shell ls -d fs-repo-*-to-* | sed -e 's/fs-repo/test_go.fs-repo/')
 
 test_go.%: MIGRATION=$*
 test_go.%:
-	@cd $(MIGRATION) && go test -mod=vendor
+	@cd $(MIGRATION)/migration && go test -mod=vendor

fs-repo-10-to-11/migration/migration.go

@@ -11,14 +11,14 @@ import (
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-datastore"
 	"github.com/ipfs/go-filestore"
-	"github.com/ipfs/go-ipfs-blockstore"
-	"github.com/ipfs/go-ipfs-exchange-offline"
+	blockstore "github.com/ipfs/go-ipfs-blockstore"
+	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	"github.com/ipfs/go-ipfs-pinner/pinconv"
 	"github.com/ipfs/go-ipfs/plugin/loader"
 	"github.com/ipfs/go-ipfs/repo"
 	"github.com/ipfs/go-ipfs/repo/fsrepo"
 	"github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
-	"github.com/ipfs/go-ipld-format"
+	format "github.com/ipfs/go-ipld-format"
 	"github.com/ipfs/go-merkledag"
 
 	migrate "github.com/ipfs/fs-repo-migrations/tools/go-migrate"
@@ -88,7 +88,7 @@ func (m Migration) Apply(opts migrate.Options) error {
 
 	err = migrations.WriteRepoVersion(opts.Path, toVer)
 	if err != nil {
-		return fmt.Errorf("failed to update version file to %s: %v", toVer, err)
+		return fmt.Errorf("failed to update version file to %d: %v", toVer, err)
 	}
 
 	log.Print("updated version file")

fs-repo-11-to-12/Makefile

@@ -0,0 +1,7 @@
+.PHONY: build clean
+
+build:
+	go build -mod=vendor
+
+clean:
+	go clean

fs-repo-11-to-12/go.mod

@@ -0,0 +1,17 @@
+module github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12
+
+go 1.15
+
+require (
+	github.com/hsanjuan/ipfs-lite v1.1.19
+	github.com/ipfs/fs-repo-migrations v1.7.1
+	github.com/ipfs/go-cid v0.0.7
+	github.com/ipfs/go-datastore v0.4.5
+	github.com/ipfs/go-filestore v1.0.0
+	github.com/ipfs/go-ipfs v0.8.0
+	github.com/ipfs/go-ipfs-blockstore v1.0.3 // indirect
+	github.com/ipfs/go-ipfs-ds-help v1.0.0
+	github.com/ipfs/go-ipfs-pinner v0.1.1
+	github.com/ipfs/go-ipld-format v0.2.0
+	github.com/otiai10/copy v1.5.1
+)

fs-repo-11-to-12/main.go

@@ -0,0 +1,11 @@
+package main
+
+import (
+	mg11 "github.com/ipfs/fs-repo-migrations/fs-repo-11-to-12/migration"
+	migrate "github.com/ipfs/fs-repo-migrations/go-migrate"
+)
+
+func main() {
+	m := mg11.Migration{}
+	migrate.Main(&m)
+}

fs-repo-11-to-12/migration/generate_repotest.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# This script can be used to generate the repotest folder that is used
+# to test the migration, using go-ipfs v0.8.0.
+
+export IPFS_PATH=repotest
+
+mkdir a
+echo "file1" > a/file1
+mkdir b
+echo "file2" > b/file2
+mkdir c
+echo "file3" > c/file3
+
+ipfs init
+
+# A: add with both v0 and v1
+ipfs add -r --pin=false a
+ipfs add -r --cid-version=1 --raw-leaves=false --pin=false a
+
+# B: add with v1
+ipfs add -r --cid-version=1 --raw-leaves=false --pin=false b
+
+# C: add with v0
+ipfs add -r --pin=false c