Skip to content

GitLab

Commit c3fa8147 authored by Łukasz Magiera's avatar Łukasz Magiera
Browse files
Options

coreapi: cleanup coredag references in interface 

License: MIT
Signed-off-by: default avatarŁukasz Magiera <magik6k@gmail.com>
parent 67fd754f
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 51 deletions
tests/dag.go
View file @ c3fa8147
...@@ -8,8 +8,9 @@ import ( ...@@ -8,8 +8,9 @@ import (
"testing" "testing"
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
coredag "github.com/ipfs/go-ipfs/core/coredag"
ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash" mh "gx/ipfs/QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW/go-multihash"
) )
...@@ -46,18 +47,18 @@ func (tp *provider) TestPut(t *testing.T) { ...@@ -46,18 +47,18 @@ func (tp *provider) TestPut(t *testing.T) {
t.Error(err) t.Error(err)
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
err = api.Dag().Add(ctx, nds[0]) err = api.Dag().Add(ctx, nd)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" { if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
t.Errorf("got wrong cid: %s", nds[0].Cid().String()) t.Errorf("got wrong cid: %s", nd.Cid().String())
} }
} }
...@@ -69,18 +70,18 @@ func (tp *provider) TestPutWithHash(t *testing.T) { ...@@ -69,18 +70,18 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
t.Error(err) t.Error(err)
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), mh.ID, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), mh.ID, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
err = api.Dag().Add(ctx, nds[0]) err = api.Dag().Add(ctx, nd)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if nds[0].Cid().String() != "z5hRLNd2sv4z1c" { if nd.Cid().String() != "z5hRLNd2sv4z1c" {
t.Errorf("got wrong cid: %s", nds[0].Cid().String()) t.Errorf("got wrong cid: %s", nd.Cid().String())
} }
} }
...@@ -92,27 +93,27 @@ func (tp *provider) TestDagPath(t *testing.T) { ...@@ -92,27 +93,27 @@ func (tp *provider) TestDagPath(t *testing.T) {
t.Error(err) t.Error(err)
} }
snds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"foo"`), math.MaxUint64, -1) snd, err := ipldcbor.FromJSON(strings.NewReader(`"foo"`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
err = api.Dag().Add(ctx, snds[0]) err = api.Dag().Add(ctx, snd)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+snds[0].Cid().String()+`"}}`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+snd.Cid().String()+`"}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
err = api.Dag().Add(ctx, nds[0]) err = api.Dag().Add(ctx, nd)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
p, err := coreiface.ParsePath(path.Join(nds[0].Cid().String(), "lnk")) p, err := coreiface.ParsePath(path.Join(nd.Cid().String(), "lnk"))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -122,13 +123,13 @@ func (tp *provider) TestDagPath(t *testing.T) { ...@@ -122,13 +123,13 @@ func (tp *provider) TestDagPath(t *testing.T) {
t.Error(err) t.Error(err)
} }
nd, err := api.Dag().Get(ctx, rp.Cid()) ndd, err := api.Dag().Get(ctx, rp.Cid())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if nd.Cid().String() != snds[0].Cid().String() { if nd.Cid().String() != snd.Cid().String() {
t.Errorf("got unexpected cid %s, expected %s", nd.Cid().String(), snds[0].Cid().String()) t.Errorf("got unexpected cid %s, expected %s", ndd.Cid().String(), snd.Cid().String())
} }
} }
...@@ -140,17 +141,17 @@ func (tp *provider) TestTree(t *testing.T) { ...@@ -140,17 +141,17 @@ func (tp *provider) TestTree(t *testing.T) {
t.Error(err) t.Error(err)
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`{"a": 123, "b": "foo", "c": {"d": 321, "e": 111}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
err = api.Dag().Add(ctx, nds[0]) err = api.Dag().Add(ctx, nd)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
res, err := api.Dag().Get(ctx, nds[0].Cid()) res, err := api.Dag().Get(ctx, nd.Cid())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -175,25 +176,25 @@ func (tp *provider) TestBatch(t *testing.T) { ...@@ -175,25 +176,25 @@ func (tp *provider) TestBatch(t *testing.T) {
t.Error(err) t.Error(err)
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`"Hello"`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`"Hello"`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" { if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
t.Errorf("got wrong cid: %s", nds[0].Cid().String()) t.Errorf("got wrong cid: %s", nd.Cid().String())
} }
_, err = api.Dag().Get(ctx, nds[0].Cid()) _, err = api.Dag().Get(ctx, nd.Cid())
if err == nil || !strings.Contains(err.Error(), "not found") { if err == nil || !strings.Contains(err.Error(), "not found") {
t.Error(err) t.Error(err)
} }
if err := api.Dag().AddMany(ctx, nds); err != nil { if err := api.Dag().AddMany(ctx, []ipld.Node{nd}); err != nil {
t.Error(err) t.Error(err)
} }
_, err = api.Dag().Get(ctx, nds[0].Cid()) _, err = api.Dag().Get(ctx, nd.Cid())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
......
tests/path.go
View file @ c3fa8147
...@@ -8,7 +8,8 @@ import ( ...@@ -8,7 +8,8 @@ import (
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
"github.com/ipfs/go-ipfs/core/coreapi/interface/options" "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
"github.com/ipfs/go-ipfs/core/coredag"
ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
) )
func (tp *provider) TestPath(t *testing.T) { func (tp *provider) TestPath(t *testing.T) {
...@@ -37,7 +38,8 @@ func (tp *provider) TestMutablePath(t *testing.T) { ...@@ -37,7 +38,8 @@ func (tp *provider) TestMutablePath(t *testing.T) {
t.Error("expected /ipld path to be immutable") t.Error("expected /ipld path to be immutable")
} }
// get self /ipns path // get self /ipns path ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
if api.Key() == nil { if api.Key() == nil {
t.Fatal(".Key not implemented") t.Fatal(".Key not implemented")
} }
...@@ -64,16 +66,16 @@ func (tp *provider) TestPathRemainder(t *testing.T) { ...@@ -64,16 +66,16 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
t.Fatal(".Dag not implemented") t.Fatal(".Dag not implemented")
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if err := api.Dag().AddMany(ctx, nds); err != nil { if err := api.Dag().Add(ctx, nd); err != nil {
t.Fatal(err) t.Fatal(err)
} }
p1, err := coreiface.ParsePath(nds[0].String() + "/foo/bar") p1, err := coreiface.ParsePath(nd.String() + "/foo/bar")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -100,16 +102,16 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) { ...@@ -100,16 +102,16 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
t.Fatal(".Dag not implemented") t.Fatal(".Dag not implemented")
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if err := api.Dag().AddMany(ctx, nds); err != nil { if err := api.Dag().Add(ctx, nd); err != nil {
t.Fatal(err) t.Fatal(err)
} }
p1, err := coreiface.ParsePath(nds[0].Cid().String()) p1, err := coreiface.ParsePath(nd.Cid().String())
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -136,16 +138,16 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) { ...@@ -136,16 +138,16 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
t.Fatal(".Dag not implemented") t.Fatal(".Dag not implemented")
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"bar": "baz"}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if err := api.Dag().AddMany(ctx, nds); err != nil { if err := api.Dag().Add(ctx, nd); err != nil {
t.Fatal(err) t.Fatal(err)
} }
p1, err := coreiface.ParsePath("/ipld/" + nds[0].Cid().String() + "/bar/baz") p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/bar/baz")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -177,16 +179,16 @@ func (tp *provider) TestPathRoot(t *testing.T) { ...@@ -177,16 +179,16 @@ func (tp *provider) TestPathRoot(t *testing.T) {
t.Fatal(".Dag not implemented") t.Fatal(".Dag not implemented")
} }
nds, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`), math.MaxUint64, -1) nd, err := ipldcbor.FromJSON(strings.NewReader(`{"foo": {"/": "`+blk.Path().Cid().String()+`"}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if err := api.Dag().AddMany(ctx, nds); err != nil { if err := api.Dag().Add(ctx, nd); err != nil {
t.Fatal(err) t.Fatal(err)
} }
p1, err := coreiface.ParsePath("/ipld/" + nds[0].Cid().String() + "/foo") p1, err := coreiface.ParsePath("/ipld/" + nd.Cid().String() + "/foo")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -196,7 +198,7 @@ func (tp *provider) TestPathRoot(t *testing.T) { ...@@ -196,7 +198,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if rp.Root().String() != nds[0].Cid().String() { if rp.Root().String() != nd.Cid().String() {
t.Error("unexpected path root") t.Error("unexpected path root")
} }
......
tests/pin.go
View file @ c3fa8147
...@@ -8,7 +8,9 @@ import ( ...@@ -8,7 +8,9 @@ import (
"github.com/ipfs/go-ipfs/core/coreapi/interface" "github.com/ipfs/go-ipfs/core/coreapi/interface"
opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options" opt "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
"github.com/ipfs/go-ipfs/core/coredag"
ipld "gx/ipfs/QmRL22E4paat7ky7vx9MLpR97JHHbFPrg3ytFQw6qp1y1s/go-ipld-format"
ipldcbor "gx/ipfs/QmRZxJ7oybgnnwriuRub9JXp5YdFM9wiGSyRq38QC7swpS/go-ipld-cbor"
) )
func (tp *provider) TestPin(t *testing.T) { func (tp *provider) TestPin(t *testing.T) {
...@@ -111,26 +113,26 @@ func (tp *provider) TestPinRecursive(t *testing.T) { ...@@ -111,26 +113,26 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
t.Error(err) t.Error(err)
} }
nd2, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`), math.MaxUint64, -1) nd2, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+p0.Cid().String()+`"}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
nd3, err := coredag.ParseInputs("json", "dag-cbor", strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`), math.MaxUint64, -1) nd3, err := ipldcbor.FromJSON(strings.NewReader(`{"lnk": {"/": "`+p1.Cid().String()+`"}}`), math.MaxUint64, -1)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
if err := api.Dag().AddMany(ctx, append(nd2, nd3...)); err != nil { if err := api.Dag().AddMany(ctx, []ipld.Node{nd2, nd3}); err != nil {
t.Fatal(err) t.Fatal(err)
} }
err = api.Pin().Add(ctx, iface.IpldPath(nd2[0].Cid())) err = api.Pin().Add(ctx, iface.IpldPath(nd2.Cid()))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
err = api.Pin().Add(ctx, iface.IpldPath(nd3[0].Cid()), opt.Pin.Recursive(false)) err = api.Pin().Add(ctx, iface.IpldPath(nd3.Cid()), opt.Pin.Recursive(false))
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
...@@ -153,8 +155,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) { ...@@ -153,8 +155,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
t.Errorf("unexpected pin list len: %d", len(list)) t.Errorf("unexpected pin list len: %d", len(list))
} }
if list[0].Path().String() != iface.IpldPath(nd3[0].Cid()).String() { if list[0].Path().String() != iface.IpldPath(nd3.Cid()).String() {
t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpfsPath(nd2[0].Cid()).String()) t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpfsPath(nd2.Cid()).String())
} }
list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive()) list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
...@@ -166,8 +168,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) { ...@@ -166,8 +168,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
t.Errorf("unexpected pin list len: %d", len(list)) t.Errorf("unexpected pin list len: %d", len(list))
} }
if list[0].Path().String() != iface.IpldPath(nd2[0].Cid()).String() { if list[0].Path().String() != iface.IpldPath(nd2.Cid()).String() {
t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpldPath(nd3[0].Cid()).String()) t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpldPath(nd3.Cid()).String())
} }
list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect()) list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment