Merge branch 'port-2021-05-02'

cid-fmt/main.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"strings"
 
-	cidutil "gitlab.dms3.io/dms3/public/go-cidutil"
+	cidutil "gitlab.dms3.io/dms3/go-cidutil"
 
 	mb "github.com/multiformats/go-multibase"
-	c "gitlab.dms3.io/dms3/public/go-cid"
+	c "gitlab.dms3.io/dms3/go-cid"
 )
 
 func usage() {

cid-fmt/main_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	c "gitlab.dms3.io/dms3/public/go-cid"
+	c "gitlab.dms3.io/dms3/go-cid"
 )
 
 func TestCidConv(t *testing.T) {

cidenc/encoder.go

@@ -2,7 +2,7 @@ package cidenc
 
 import (
 	mbase "github.com/multiformats/go-multibase"
-	cid "gitlab.dms3.io/dms3/public/go-cid"
+	cid "gitlab.dms3.io/dms3/go-cid"
 )
 
 // Encoder is a basic Encoder that will encode CIDs using a specified

cidenc/encoder_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	mbase "github.com/multiformats/go-multibase"
-	cid "gitlab.dms3.io/dms3/public/go-cid"
+	cid "gitlab.dms3.io/dms3/go-cid"
 )
 
 func TestCidEncoder(t *testing.T) {

format.go

@@ -6,7 +6,7 @@ import (
 
 	mb "github.com/multiformats/go-multibase"
 	mh "github.com/multiformats/go-multihash"
-	c "gitlab.dms3.io/dms3/public/go-cid"
+	c "gitlab.dms3.io/dms3/go-cid"
 )
 
 // FormatRef is a string documenting the format string for the Format function

format_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	mb "github.com/multiformats/go-multibase"
-	c "gitlab.dms3.io/dms3/public/go-cid"
+	c "gitlab.dms3.io/dms3/go-cid"
 )
 
 func TestFmt(t *testing.T) {

go.mod

-module gitlab.dms3.io/dms3/public/go-cidutil
+module gitlab.dms3.io/dms3/go-cidutil
 
 require (
 	github.com/multiformats/go-multibase v0.0.3
 	github.com/multiformats/go-multihash v0.0.14
-	gitlab.dms3.io/dms3/public/go-cid v0.0.1
+	gitlab.dms3.io/dms3/go-cid v0.0.3
 )
 
 go 1.15

go.sum

@@ -20,8 +20,8 @@ github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2
 github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-gitlab.dms3.io/dms3/public/go-cid v0.0.1 h1:qs4dtkDigcLGY/58dIZaFjKLt+orrTcmTBvtqaM3570=
-gitlab.dms3.io/dms3/public/go-cid v0.0.1/go.mod h1:GQw3gc4CSrFY+aX6M+OBQDlg0p5/eQJoRrayaZzkAOQ=
+gitlab.dms3.io/dms3/go-cid v0.0.3 h1:5qZ1sl1Bi26naLz7Vsc8fjWcJKX8bR6njt3WPCteXac=
+gitlab.dms3.io/dms3/go-cid v0.0.3/go.mod h1:qT/Q1NZD31UnWQ+rwsQgzGrrsQhpq7dYSlXf7ulDgtk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

inline.go

@@ -2,7 +2,7 @@ package cidutil
 
 import (
 	mhash "github.com/multiformats/go-multihash"
-	cid "gitlab.dms3.io/dms3/public/go-cid"
+	cid "gitlab.dms3.io/dms3/go-cid"
 )
 
 // InlineBuilder is a cid.Builder that will use the id multihash when the

inline_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	mhash "github.com/multiformats/go-multihash"
-	cid "gitlab.dms3.io/dms3/public/go-cid"
+	cid "gitlab.dms3.io/dms3/go-cid"
 )
 
 func TestInlineBuilderSmallValue(t *testing.T) {

set.go

@@ -3,7 +3,7 @@ package cidutil
 import (
 	"context"
 
-	c "gitlab.dms3.io/dms3/public/go-cid"
+	c "gitlab.dms3.io/dms3/go-cid"
 )
 
 type Set = c.Set

slice.go

@@ -3,7 +3,7 @@ package cidutil
 import (
 	"sort"
 
-	"gitlab.dms3.io/dms3/public/go-cid"
+	"gitlab.dms3.io/dms3/go-cid"
 )
 
 // Slice is a convenience type for sorting CIDs