Merge branch 'port-2021-05-02'

convert.go

@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gitlab.dms3.io/dms3/public/go-datastore"
-	"gitlab.dms3.io/dms3/public/go-datastore/query"
+	"gitlab.dms3.io/dms3/go-datastore"
+	"gitlab.dms3.io/dms3/go-datastore/query"
 )
 
 func UpgradeV0toV1(path string, prefixLen int) error {

convert_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.dms3.io/dms3/public/go-datastore"
-	flatfs "gitlab.dms3.io/dms3/public/go-ds-flatfs"
+	"gitlab.dms3.io/dms3/go-datastore"
+	flatfs "gitlab.dms3.io/dms3/go-ds-flatfs"
 )
 
 func TestMove(t *testing.T) {

flatfs.go

@@ -18,10 +18,10 @@ import (
 	"time"
 
 	"github.com/jbenet/goprocess"
-	"gitlab.dms3.io/dms3/public/go-datastore"
-	"gitlab.dms3.io/dms3/public/go-datastore/query"
+	"gitlab.dms3.io/dms3/go-datastore"
+	"gitlab.dms3.io/dms3/go-datastore/query"
 
-	logging "gitlab.dms3.io/dms3/public/go-log"
+	logging "gitlab.dms3.io/dms3/go-log"
 )
 
 var log = logging.Logger("flatfs")

flatfs/main.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strconv"
 
-	flatfs "gitlab.dms3.io/dms3/public/go-ds-flatfs"
+	flatfs "gitlab.dms3.io/dms3/go-ds-flatfs"
 )
 
 // To convert from the old format to a new format with a different

flatfs_test.go

@@ -15,11 +15,11 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.dms3.io/dms3/public/go-datastore"
-	"gitlab.dms3.io/dms3/public/go-datastore/mount"
-	"gitlab.dms3.io/dms3/public/go-datastore/query"
-	dstest "gitlab.dms3.io/dms3/public/go-datastore/test"
-	flatfs "gitlab.dms3.io/dms3/public/go-ds-flatfs"
+	"gitlab.dms3.io/dms3/go-datastore"
+	"gitlab.dms3.io/dms3/go-datastore/mount"
+	"gitlab.dms3.io/dms3/go-datastore/query"
+	dstest "gitlab.dms3.io/dms3/go-datastore/test"
+	flatfs "gitlab.dms3.io/dms3/go-ds-flatfs"
 )
 
 func checkTemp(t *testing.T, dir string) {

go.mod

-module gitlab.dms3.io/dms3/public/go-ds-flatfs
+module gitlab.dms3.io/dms3/go-ds-flatfs
 
 require (
 	github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5
 	github.com/jbenet/goprocess v0.1.4
-	gitlab.dms3.io/dms3/public/go-datastore v0.0.1
-	gitlab.dms3.io/dms3/public/go-log v0.0.1
+	gitlab.dms3.io/dms3/go-datastore v0.0.2
+	gitlab.dms3.io/dms3/go-log v0.0.2
 )
 
 go 1.15

go.sum

@@ -29,11 +29,11 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-gitlab.dms3.io/dms3/public/go-datastore v0.0.1 h1:RjZLvnqlvWDpb5ZwvkVEWGONF7zKNPe4Q0DND5oxZec=
-gitlab.dms3.io/dms3/public/go-datastore v0.0.1/go.mod h1:qSI0hpmVMo6HCp0uveHTKyQ87j1aVe2hqiTeiPCehYA=
-gitlab.dms3.io/dms3/public/go-dms3-delay v0.0.1/go.mod h1:Mg+buHOoh8UruN+MMqeqBUPBKMRTmpsXAyxv5ZSt+X4=
-gitlab.dms3.io/dms3/public/go-log v0.0.1 h1:jqz2g8pVdPW+Sy8CCo4rYfGEjktGhCBfgIb3oeY6yx8=
-gitlab.dms3.io/dms3/public/go-log v0.0.1/go.mod h1:OsyF7lVYe47r03v1ZCbrmz0byeGUWB0Y219jN1DJx3s=
+gitlab.dms3.io/dms3/go-datastore v0.0.2 h1:cLsmDEiDz+onFnbPhyLYuPECw+tJEnvpil958ps0WHw=
+gitlab.dms3.io/dms3/go-datastore v0.0.2/go.mod h1:IOybd0feVxRiGt5idG/FzjdeK6itS0uaMgD42CmANFo=
+gitlab.dms3.io/dms3/go-dms3-delay v0.0.2/go.mod h1:WPBu+WALc2GAYE3KfI5QM+r3dX9gv7wHJVfTFlYBwDg=
+gitlab.dms3.io/dms3/go-log v0.0.2 h1:vuNG5qmx6P9iK+A1+k4AmC6Q+ORm2ekWaQVbMmeL2wc=
+gitlab.dms3.io/dms3/go-log v0.0.2/go.mod h1:iLuW2zqJJaP1WdbME4P6AS9AIMovwGDAn3zV/riR5iE=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=

key.go

 package flatfs
 
 import (
-	"gitlab.dms3.io/dms3/public/go-datastore"
+	"gitlab.dms3.io/dms3/go-datastore"
 )
 
 // keyIsValid returns true if the key is valid for flatfs.

key_test.go

@@ -3,7 +3,7 @@ package flatfs
 import (
 	"testing"
 
-	"gitlab.dms3.io/dms3/public/go-datastore"
+	"gitlab.dms3.io/dms3/go-datastore"
 )
 
 var (

readme.go

 package flatfs
 
-var README_DMS3_DEF_SHARD = `This is a repository of DMS3LD objects. Each DMS3LD object is in a single file,
+var README_DMS3_DEF_SHARD = `This is a repository of LD objects. Each LD object is in a single file,
 named <base32 encoding of cid>.data. Where <base32 encoding of cid> is the
 "base32" encoding of the CID (as specified in
 https://github.com/multiformats/multibase) without the 'B' prefix.