Merge pull request #5922 from ipfs/feat/coreapi/dag-ipld

coreapi: replace coreiface.DagAPI with ipld.DAGService
ipfs · Jan 21, 2019 · 2e83a0a · 2e83a0a
2 parents 0fd7374 + eb23c90
commit 2e83a0a
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 319 deletions.
diff --git a/core/coreapi/coreapi.go b/core/coreapi/coreapi.go
@@ -96,8 +96,8 @@ func (api *CoreAPI) Block() coreiface.BlockAPI {
 }
 
 // Dag returns the DagAPI interface implementation backed by the go-ipfs node
-func (api *CoreAPI) Dag() coreiface.DagAPI {
-	return (*DagAPI)(api)
+func (api *CoreAPI) Dag() ipld.DAGService {
+	return api.dag
 }
 
 // Name returns the NameAPI interface implementation backed by the go-ipfs node

diff --git a/core/coreapi/dag.go b/core/coreapi/dag.go
diff --git a/core/coreapi/interface/coreapi.go b/core/coreapi/interface/coreapi.go
@@ -19,7 +19,7 @@ type CoreAPI interface {
 	Block() BlockAPI
 
 	// Dag returns an implementation of Dag API
-	Dag() DagAPI
+	Dag() ipld.DAGService
 
 	// Name returns an implementation of Name API
 	Name() NameAPI

diff --git a/core/coreapi/interface/dag.go b/core/coreapi/interface/dag.go
diff --git a/core/coreapi/interface/options/dag.go b/core/coreapi/interface/options/dag.go