Skip to content

Commit

Permalink
Merge pull request #5976 from ipfs/misc/coreapi-imports
Browse files Browse the repository at this point in the history 
coreapi: cleanup non-gx references
  • Loading branch information
@Stebalien
Stebalien authored Feb 8, 2019
2 parents 33575e0 + 6ed9f1c commit 6a5a268
Show file tree
Hide file tree
Showing 19 changed files with 71 additions and 66 deletions.
2 changes: 1 addition & 1 deletion core/commands/dns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io"

ncmd "github.com/ipfs/go-ipfs/core/commands/name"
nsopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
namesys "github.com/ipfs/go-ipfs/namesys"
nsopts "github.com/ipfs/go-ipfs/namesys/opts"

cmds "gx/ipfs/QmR77mMvvh8mJBBWQmBfQBu8oD38NUN4KE9SL2gDgAQNc6/go-ipfs-cmds"
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/name/ipns.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
nsopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"

path "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"
cmds "gx/ipfs/QmR77mMvvh8mJBBWQmBfQBu8oD38NUN4KE9SL2gDgAQNc6/go-ipfs-cmds"
Expand Down
2 changes: 1 addition & 1 deletion core/commands/resolve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
ncmd "github.com/ipfs/go-ipfs/core/commands/name"
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
nsopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
ns "github.com/ipfs/go-ipfs/namesys"
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
path "gx/ipfs/QmQ3YSqfxunT5QBg6KBVskKyRE26q6hjSMyhpxchpm7jEN/go-path"

cmds "gx/ipfs/QmR77mMvvh8mJBBWQmBfQBu8oD38NUN4KE9SL2gDgAQNc6/go-ipfs-cmds"
Expand Down
2 changes: 1 addition & 1 deletion core/coreapi/interface/options/name.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package options
import (
"time"

ropts "github.com/ipfs/go-ipfs/namesys/opts"
ropts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
)

const (
Expand Down
0 namesys/opts/opts.go → ...coreapi/interface/options/namesys/opts.go
View file
File renamed without changes.
53 changes: 27 additions & 26 deletions core/coreapi/interface/tests/dag.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (
"testing"

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"
)

Expand Down Expand Up @@ -46,18 +47,18 @@ func (tp *provider) TestPut(t *testing.T) {
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 {
t.Error(err)
}

err = api.Dag().Add(ctx, nds[0])
err = api.Dag().Add(ctx, nd)
if err != nil {
t.Fatal(err)
}

if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
t.Errorf("got wrong cid: %s", nds[0].Cid().String())
if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
t.Errorf("got wrong cid: %s", nd.Cid().String())
}
}

Expand All @@ -69,18 +70,18 @@ func (tp *provider) TestPutWithHash(t *testing.T) {
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 {
t.Error(err)
}

err = api.Dag().Add(ctx, nds[0])
err = api.Dag().Add(ctx, nd)
if err != nil {
t.Fatal(err)
}

if nds[0].Cid().String() != "z5hRLNd2sv4z1c" {
t.Errorf("got wrong cid: %s", nds[0].Cid().String())
if nd.Cid().String() != "z5hRLNd2sv4z1c" {
t.Errorf("got wrong cid: %s", nd.Cid().String())
}
}

Expand All @@ -92,27 +93,27 @@ func (tp *provider) TestDagPath(t *testing.T) {
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 {
t.Error(err)
}

err = api.Dag().Add(ctx, snds[0])
err = api.Dag().Add(ctx, snd)
if err != nil {
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 {
t.Error(err)
}

err = api.Dag().Add(ctx, nds[0])
err = api.Dag().Add(ctx, nd)
if err != nil {
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 {
t.Error(err)
}
Expand All @@ -122,13 +123,13 @@ func (tp *provider) TestDagPath(t *testing.T) {
t.Error(err)
}

nd, err := api.Dag().Get(ctx, rp.Cid())
ndd, err := api.Dag().Get(ctx, rp.Cid())
if err != nil {
t.Error(err)
}

if nd.Cid().String() != snds[0].Cid().String() {
t.Errorf("got unexpected cid %s, expected %s", nd.Cid().String(), snds[0].Cid().String())
if ndd.Cid().String() != snd.Cid().String() {
t.Errorf("got unexpected cid %s, expected %s", ndd.Cid().String(), snd.Cid().String())
}
}

Expand All @@ -140,17 +141,17 @@ func (tp *provider) TestTree(t *testing.T) {
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 {
t.Error(err)
}

err = api.Dag().Add(ctx, nds[0])
err = api.Dag().Add(ctx, nd)
if err != nil {
t.Fatal(err)
}

res, err := api.Dag().Get(ctx, nds[0].Cid())
res, err := api.Dag().Get(ctx, nd.Cid())
if err != nil {
t.Error(err)
}
Expand All @@ -175,25 +176,25 @@ func (tp *provider) TestBatch(t *testing.T) {
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 {
t.Error(err)
}

if nds[0].Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
t.Errorf("got wrong cid: %s", nds[0].Cid().String())
if nd.Cid().String() != "zdpuAqckYF3ToF3gcJNxPZXmnmGuXd3gxHCXhq81HGxBejEvv" {
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") {
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)
}

_, err = api.Dag().Get(ctx, nds[0].Cid())
_, err = api.Dag().Get(ctx, nd.Cid())
if err != nil {
t.Error(err)
}
Expand Down
32 changes: 17 additions & 15 deletions core/coreapi/interface/tests/path.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import (

coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
"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) {
Expand Down Expand Up @@ -37,7 +38,8 @@ func (tp *provider) TestMutablePath(t *testing.T) {
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 {
t.Fatal(".Key not implemented")
}
Expand All @@ -64,16 +66,16 @@ func (tp *provider) TestPathRemainder(t *testing.T) {
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 {
t.Error(err)
}

if err := api.Dag().AddMany(ctx, nds); err != nil {
if err := api.Dag().Add(ctx, nd); err != nil {
t.Fatal(err)
}

p1, err := coreiface.ParsePath(nds[0].String() + "/foo/bar")
p1, err := coreiface.ParsePath(nd.String() + "/foo/bar")
if err != nil {
t.Error(err)
}
Expand All @@ -100,16 +102,16 @@ func (tp *provider) TestEmptyPathRemainder(t *testing.T) {
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 {
t.Error(err)
}

if err := api.Dag().AddMany(ctx, nds); err != nil {
if err := api.Dag().Add(ctx, nd); err != nil {
t.Fatal(err)
}

p1, err := coreiface.ParsePath(nds[0].Cid().String())
p1, err := coreiface.ParsePath(nd.Cid().String())
if err != nil {
t.Error(err)
}
Expand All @@ -136,16 +138,16 @@ func (tp *provider) TestInvalidPathRemainder(t *testing.T) {
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 {
t.Error(err)
}

if err := api.Dag().AddMany(ctx, nds); err != nil {
if err := api.Dag().Add(ctx, nd); err != nil {
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 {
t.Error(err)
}
Expand Down Expand Up @@ -177,16 +179,16 @@ func (tp *provider) TestPathRoot(t *testing.T) {
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 {
t.Error(err)
}

if err := api.Dag().AddMany(ctx, nds); err != nil {
if err := api.Dag().Add(ctx, nd); err != nil {
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 {
t.Error(err)
}
Expand All @@ -196,7 +198,7 @@ func (tp *provider) TestPathRoot(t *testing.T) {
t.Fatal(err)
}

if rp.Root().String() != nds[0].Cid().String() {
if rp.Root().String() != nd.Cid().String() {
t.Error("unexpected path root")
}

Expand Down
22 changes: 12 additions & 10 deletions core/coreapi/interface/tests/pin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import (

"github.com/ipfs/go-ipfs/core/coreapi/interface"
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) {
Expand Down Expand Up @@ -111,26 +113,26 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
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 {
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 {
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)
}

err = api.Pin().Add(ctx, iface.IpldPath(nd2[0].Cid()))
err = api.Pin().Add(ctx, iface.IpldPath(nd2.Cid()))
if err != nil {
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 {
t.Error(err)
}
Expand All @@ -153,8 +155,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
t.Errorf("unexpected pin list len: %d", len(list))
}

if list[0].Path().String() != iface.IpldPath(nd3[0].Cid()).String() {
t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpfsPath(nd2[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.Cid()).String())
}

list, err = api.Pin().Ls(ctx, opt.Pin.Type.Recursive())
Expand All @@ -166,8 +168,8 @@ func (tp *provider) TestPinRecursive(t *testing.T) {
t.Errorf("unexpected pin list len: %d", len(list))
}

if list[0].Path().String() != iface.IpldPath(nd2[0].Cid()).String() {
t.Errorf("unexpected path, %s != %s", list[0].Path().String(), iface.IpldPath(nd3[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.Cid()).String())
}

list, err = api.Pin().Ls(ctx, opt.Pin.Type.Indirect())
Expand Down
2 changes: 1 addition & 1 deletion core/corehttp/gateway_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/ipfs/go-ipfs/core/coreapi"
"github.com/ipfs/go-ipfs/core/coreapi/interface"
"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
nsopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
namesys "github.com/ipfs/go-ipfs/namesys"
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
repo "github.com/ipfs/go-ipfs/repo"

ci "gx/ipfs/QmNiJiXwWE3kRhZrC5ej3kSjWHm337pYfhjLGSCDNKJP2s/go-libp2p-crypto"
Expand Down
2 changes: 1 addition & 1 deletion core/corehttp/ipns_hostname.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"

core "github.com/ipfs/go-ipfs/core"
nsopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options/namesys"
namesys "github.com/ipfs/go-ipfs/namesys"
nsopts "github.com/ipfs/go-ipfs/namesys/opts"

isd "gx/ipfs/QmZmmuAXgX73UQmX1jRKjTGmjzq24Jinqkq8vzkBtno4uX/go-is-domain"
)
Expand Down
Loading

0 comments on commit 6a5a268

Please sign in to comment.