From c00c142bf9b27ad4649bb68936fbfaa14eee0a79 Mon Sep 17 00:00:00 2001 From: Jeromy Date: Sun, 5 Feb 2017 15:36:15 -0800 Subject: [PATCH] dag/get: fix link formatting in json output License: MIT Signed-off-by: Jeromy --- core/commands/dag/dag.go | 2 +- merkledag/merkledag.go | 2 +- package.json | 4 ++-- test/sharness/t0053-dag.sh | 13 +++++++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index 6225ad484..2f0f33ff5 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -10,7 +10,7 @@ import ( node "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node" cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid" - ipldcbor "gx/ipfs/QmfMxth6d2po8YGrtSVyNb2u6SFNrPdAsWQoZG83oXRBqX/go-ipld-cbor" + ipldcbor "gx/ipfs/Qmf658QLDTXfRDgnGmUB6TYj671XjmHScG61p3g7dSxUcF/go-ipld-cbor" ) var DagCmd = &cmds.Command{ diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go index c5f913fa8..1083ba099 100644 --- a/merkledag/merkledag.go +++ b/merkledag/merkledag.go @@ -14,7 +14,7 @@ import ( node "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node" logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log" cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid" - ipldcbor "gx/ipfs/QmfMxth6d2po8YGrtSVyNb2u6SFNrPdAsWQoZG83oXRBqX/go-ipld-cbor" + ipldcbor "gx/ipfs/Qmf658QLDTXfRDgnGmUB6TYj671XjmHScG61p3g7dSxUcF/go-ipld-cbor" ) var log = logging.Logger("merkledag") diff --git a/package.json b/package.json index e16377851..0259c2815 100644 --- a/package.json +++ b/package.json @@ -272,9 +272,9 @@ }, { "author": "whyrusleeping", - "hash": "QmfMxth6d2po8YGrtSVyNb2u6SFNrPdAsWQoZG83oXRBqX", + "hash": "Qmf658QLDTXfRDgnGmUB6TYj671XjmHScG61p3g7dSxUcF", "name": "go-ipld-cbor", - "version": "1.0.0" + "version": "1.1.0" }, { "author": "lgierth", diff --git a/test/sharness/t0053-dag.sh b/test/sharness/t0053-dag.sh index fca19d5b5..7ea6df5af 100755 --- a/test/sharness/t0053-dag.sh +++ b/test/sharness/t0053-dag.sh @@ -56,6 +56,19 @@ test_dag_cmd() { ipfs refs -r --timeout=2s $EXPHASH > /dev/null ' + test_expect_success "can get object" ' + ipfs dag get $IPLDHASH > ipld_obj_out + ' + + test_expect_success "object links look right" ' + grep "{\"/\":\"" ipld_obj_out > /dev/null + ' + + test_expect_success "retreived object hashes back correctly" ' + IPLDHASH2=$(cat ipld_obj_out | ipfs dag put) && + test "$IPLDHASH" = "$IPLDHASH2" + ' + test_expect_success "add a normal file" ' HASH=$(echo "foobar" | ipfs add -q) '