Merge package baseorbitdb into package orbitdb to resolve https://github.com/berty/go-orbit-db/issues/161

README.md

@@ -13,8 +13,8 @@
     <img src="https://www.codefactor.io/repository/github/berty/go-orbit-db/badge"
          alt="Code Factor">
   </a>
-  <a href="https://goreportcard.com/report/berty.tech/go-orbit-db">
-    <img src="https://goreportcard.com/badge/berty.tech/go-orbit-db"
+  <a href="https://goreportcard.com/report/github.com/stateless-minds/go-orbit-db">
+    <img src="https://goreportcard.com/badge/github.com/stateless-minds/go-orbit-db"
          alt="Go Report Card">
   </a>
   <a href="https://github.com/berty/go-orbit-db/releases">
@@ -25,8 +25,8 @@
     <img src="https://codecov.io/gh/berty/go-orbit-db/branch/master/graph/badge.svg"
          alt="Coverage" />
   </a>
-  <a href="https://godoc.org/berty.tech/go-orbit-db">
-    <img src="https://godoc.org/berty.tech/go-orbit-db?status.svg"
+  <a href="https://godoc.org/github.com/stateless-minds/go-orbit-db">
+    <img src="https://godoc.org/github.com/stateless-minds/go-orbit-db?status.svg"
          alt="GoDoc">
   </a>
 </p>
@@ -51,15 +51,15 @@ See [GoDoc](https://godoc.org/github.com/berty/go-orbit-db).
 Constraints:
 
 * `go-orbit-db` currently only works with **go1.16** and later
-* You need to use the canonical import: `berty.tech/go-orbit-db` instead of `github.com/berty/go-orbit-db`
+* You need to use the canonical import: `github.com/stateless-minds/go-orbit-db` instead of `github.com/berty/go-orbit-db`
 * If you have `410 gone` errors, make sure that you use a reliable `$GOPROXY` or disable it completely
 
 Example:
 
 ```console
 $ go version
 go version go1.17.3 darwin/amd64
-$ go get berty.tech/go-orbit-db
+$ go get github.com/stateless-minds/go-orbit-db
 [...]
 $
 ```

accesscontroller/doc.go

@@ -1,2 +1,2 @@
 // accesscontroller is a package handling permissions for OrbitDB stores
-package accesscontroller // import "berty.tech/go-orbit-db/accesscontroller"
+package accesscontroller // import "github.com/stateless-minds/go-orbit-db/accesscontroller"

accesscontroller/interface.go

@@ -3,8 +3,9 @@ package accesscontroller
 import (
 	"context"
 
-	"berty.tech/go-ipfs-log/accesscontroller"
-	"berty.tech/go-ipfs-log/iface"
+	"github.com/stateless-minds/go-ipfs-log/accesscontroller"
+	"github.com/stateless-minds/go-ipfs-log/iface"
+	"github.com/stateless-minds/go-orbit-db/address"
 
 	"go.uber.org/zap"
 )
@@ -19,6 +20,8 @@ type Interface interface {
 	// Type Returns the type of the store as a string
 	Type() string
 
+	Address() address.Address
+
 	// GetAuthorizedByRole Returns the list of keys authorized for a given role
 	GetAuthorizedByRole(role string) ([]string, error)
 

accesscontroller/ipfs/accesscontroller_ipfs.go

@@ -6,16 +6,16 @@ import (
 	"fmt"
 	"sync"
 
-	logac "berty.tech/go-ipfs-log/accesscontroller"
-	"berty.tech/go-ipfs-log/identityprovider"
-	"berty.tech/go-ipfs-log/io"
-	"berty.tech/go-orbit-db/accesscontroller"
-	"berty.tech/go-orbit-db/address"
-	"berty.tech/go-orbit-db/iface"
 	cid "github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"
 	coreiface "github.com/ipfs/kubo/core/coreiface"
 	"github.com/polydawn/refmt/obj/atlas"
+	logac "github.com/stateless-minds/go-ipfs-log/accesscontroller"
+	"github.com/stateless-minds/go-ipfs-log/identityprovider"
+	"github.com/stateless-minds/go-ipfs-log/io"
+	"github.com/stateless-minds/go-orbit-db/accesscontroller"
+	"github.com/stateless-minds/go-orbit-db/address"
+	"github.com/stateless-minds/go-orbit-db/iface"
 	"go.uber.org/zap"
 )
 
@@ -137,7 +137,7 @@ func (i *ipfsAccessController) Close() error {
 }
 
 // NewIPFSAccessController Returns an access controller for IPFS
-func NewIPFSAccessController(_ context.Context, db iface.BaseOrbitDB, params accesscontroller.ManifestParams, options ...accesscontroller.Option) (accesscontroller.Interface, error) {
+func NewIPFSAccessController(_ context.Context, db iface.OrbitDB, params accesscontroller.ManifestParams, options ...accesscontroller.Option) (accesscontroller.Interface, error) {
 	if params == nil {
 		return &ipfsAccessController{}, fmt.Errorf("an options object must be passed")
 	}

accesscontroller/ipfs/doc.go

@@ -1,2 +1,2 @@
 // ipfs is an access controller
-package ipfs // import "berty.tech/go-orbit-db/accesscontroller/ipfs"
+package ipfs // import "github.com/stateless-minds/go-orbit-db/accesscontroller/ipfs"

accesscontroller/manifest.go

@@ -6,11 +6,11 @@ import (
 	"strings"
 	"sync"
 
-	"berty.tech/go-ipfs-log/io"
 	cid "github.com/ipfs/go-cid"
 	cbornode "github.com/ipfs/go-ipld-cbor"
 	coreiface "github.com/ipfs/kubo/core/coreiface"
 	"github.com/polydawn/refmt/obj/atlas"
+	"github.com/stateless-minds/go-ipfs-log/io"
 	"go.uber.org/zap"
 )