Remove blockstore.GetBlock

sourcenetwork · Mar 10, 2022 · b2d1841 · b2d1841
1 parent 74b92d7
commit b2d1841
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 27 deletions.
diff --git a/api/http/api.go b/api/http/api.go
@@ -179,7 +179,7 @@ func (s *Server) getBlock(w http.ResponseWriter, r *http.Request) {
 		c = cid.NewCidV1(cid.Raw, hash)
 	}
 
-	block, err := s.db.GetBlock(ctx, c)
+	block, err := s.db.Blockstore().Get(ctx, c)
 	if err != nil {
 		result.Errors = []interface{}{err.Error()}
 

diff --git a/client/core.go b/client/core.go
@@ -18,8 +18,6 @@ import (
 	"github.com/sourcenetwork/defradb/document"
 	"github.com/sourcenetwork/defradb/document/key"
 
-	blocks "github.com/ipfs/go-block-format"
-	cid "github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 )
@@ -35,7 +33,6 @@ type DB interface {
 
 	Root() ds.Batching
 	Blockstore() blockstore.Blockstore
-	GetBlock(ctx context.Context, c cid.Cid) (blocks.Block, error)
 
 	NewTxn(context.Context, bool) (Txn, error)
 	ExecQuery(context.Context, string) *QueryResult

diff --git a/db/blockstore.go b/db/blockstore.go
diff --git a/net/peer.go b/net/peer.go
@@ -200,7 +200,7 @@ func (p *Peer) handleBroadcastLoop() {
 func (p *Peer) RegisterNewDocument(ctx context.Context, dockey key.DocKey, c cid.Cid, schemaID string) error {
 	log.Debug(p.ctx, "Registering a new document for our peer node", logging.NewKV("DocKey", dockey.String()))
 
-	block, err := p.db.GetBlock(ctx, c)
+	block, err := p.db.Blockstore().Get(ctx, c)
 	if err != nil {
 		log.ErrorE(p.ctx, "Failed to get document cid", err)
 		return err