comments from CR

whyrusleeping · whyrusleeping · commit f06caf3a5bd4 · 2015-07-17T10:12:27.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/corerouting/core.go b/core/corerouting/core.go
@@ -28,7 +28,7 @@ var (
 // SupernodeServer returns a configuration for a routing server that stores
 // routing records to the provided datastore. Only routing records are store in
 // the datastore.
-func SupernodeServer(recordSource ds.ThreadSafeDatastore) core.RoutingOption {
+func SupernodeServer(recordSource ds.Datastore) core.RoutingOption {
 	return func(ctx context.Context, ph host.Host, dstore repo.Datastore) (routing.IpfsRouting, error) {
 		server, err := supernode.NewServer(recordSource, ph.Peerstore(), ph.ID())
 		if err != nil {
diff --git a/repo/repo.go b/repo/repo.go
@@ -22,7 +22,6 @@ type Repo interface {
 // Datastore is the interface required from a datastore to be
 // acceptable to FSRepo.
 type Datastore interface {
-	ds.Datastore // should be threadsafe, just be careful
-	Batch() (ds.Batch, error)
-	Close() error
+	ds.Batching // should be threadsafe, just be careful
+	io.Closer
 }
diff --git a/routing/supernode/server.go b/routing/supernode/server.go
@@ -18,13 +18,13 @@ import (
 // Server handles routing queries using a database backend
 type Server struct {
 	local           peer.ID
-	routingBackend  datastore.ThreadSafeDatastore
+	routingBackend  datastore.Datastore
 	peerstore       peer.Peerstore
 	*proxy.Loopback // so server can be injected into client
 }
 
 // NewServer creates a new Supernode routing Server
-func NewServer(ds datastore.ThreadSafeDatastore, ps peer.Peerstore, local peer.ID) (*Server, error) {
+func NewServer(ds datastore.Datastore, ps peer.Peerstore, local peer.ID) (*Server, error) {
 	s := &Server{local, ds, ps, nil}
 	s.Loopback = &proxy.Loopback{
 		Handler: s,
