refactor after forking multiformats

datastore.go

@@ -11,9 +11,9 @@ import (
 	badger "github.com/dgraph-io/badger"
 	options "github.com/dgraph-io/badger/options"
 	goprocess "github.com/jbenet/goprocess"
-	ds "gitlab.dms3.io/dms3/public/go-datastore"
-	dsq "gitlab.dms3.io/dms3/public/go-datastore/query"
-	logger "gitlab.dms3.io/dms3/public/go-log/v2"
+	ds "gitlab.dms3.io/dms3/go-datastore"
+	dsq "gitlab.dms3.io/dms3/go-datastore/query"
+	logger "gitlab.dms3.io/dms3/go-log/v2"
 )
 
 // badgerLog is a local wrapper for go-log to make the interface
@@ -156,7 +156,7 @@ func NewDatastore(path string, options *Options) (*Datastore, error) {
 	kv, err := badger.Open(opt)
 	if err != nil {
 		if strings.HasPrefix(err.Error(), "manifest has unsupported version:") {
-			err = fmt.Errorf("unsupported badger version, use gitlab.dms3.io/dms3/public/badgerds-upgrade to upgrade: %s", err.Error())
+			err = fmt.Errorf("unsupported badger version, use gitlab.dms3.io/dms3/badgerds-upgrade to upgrade: %s", err.Error())
 		}
 		return nil, err
 	}

ds_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	ds "gitlab.dms3.io/dms3/public/go-datastore"
-	dsq "gitlab.dms3.io/dms3/public/go-datastore/query"
+	ds "gitlab.dms3.io/dms3/go-datastore"
+	dsq "gitlab.dms3.io/dms3/go-datastore/query"
 )
 
 var testcases = map[string]string{

go.mod

-module gitlab.dms3.io/dms3/public/go-ds-badger
+module gitlab.dms3.io/dms3/go-ds-badger
 
 require (
 	github.com/dgraph-io/badger v1.6.2
 	github.com/jbenet/goprocess v0.1.4
-	gitlab.dms3.io/dms3/public/go-datastore v0.0.1
-	gitlab.dms3.io/dms3/public/go-log/v2 v2.0.0
+	gitlab.dms3.io/dms3/go-datastore v0.0.2
+	gitlab.dms3.io/dms3/go-log/v2 v2.0.1
 )
 
 go 1.15

go.sum

@@ -69,11 +69,11 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-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/v2 v2.0.0 h1:wuQlyeKop/bBd5y4m/GARriSgX9VZOIWv2Lo1h8m2/c=
-gitlab.dms3.io/dms3/public/go-log/v2 v2.0.0/go.mod h1:eIsr0zyB2Ny/Tu0TdTeI1CHMRwaBg3q58LL2PKxEk34=
+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/v2 v2.0.1 h1:PI9k2MiEYr6okcq2HzRJhmeLLf8WlAhX2rN30pZz1hI=
+gitlab.dms3.io/dms3/go-log/v2 v2.0.1/go.mod h1:QNTmVEuz5pe4j73ve23UVWoiYW+ZBU8+bea5kX49W0k=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=