Merge pull request #3616 from ipfs/fix/cbor-spec

update to the correct ipld cbor code

Author: whyrusleeping

core/commands/dag/dag.go

@@ -9,8 +9,8 @@ import (
 	path "github.com/ipfs/go-ipfs/path"
 
 	node "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node"
-	ipldcbor "gx/ipfs/QmbuuwTd9x4NReZ7sxtiKk7wFcfDUo54MfWBdtF5MRCPGR/go-ipld-cbor"
 	cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid"
+	ipldcbor "gx/ipfs/QmfMxth6d2po8YGrtSVyNb2u6SFNrPdAsWQoZG83oXRBqX/go-ipld-cbor"
 )
 
 var DagCmd = &cmds.Command{

merkledag/merkledag.go

@@ -13,8 +13,8 @@ import (
 
 	node "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node"
 	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
-	ipldcbor "gx/ipfs/QmbuuwTd9x4NReZ7sxtiKk7wFcfDUo54MfWBdtF5MRCPGR/go-ipld-cbor"
 	cid "gx/ipfs/QmcTcsTvfaeEBRFo1TkFgT8sRmgi1n1LTZpecfVP8fzpGD/go-cid"
+	ipldcbor "gx/ipfs/QmfMxth6d2po8YGrtSVyNb2u6SFNrPdAsWQoZG83oXRBqX/go-ipld-cbor"
 )
 
 var log = logging.Logger("merkledag")

package.json

@@ -272,9 +272,9 @@
     },
     {
       "author": "whyrusleeping",
-      "hash": "QmbuuwTd9x4NReZ7sxtiKk7wFcfDUo54MfWBdtF5MRCPGR",
+      "hash": "QmfMxth6d2po8YGrtSVyNb2u6SFNrPdAsWQoZG83oXRBqX",
       "name": "go-ipld-cbor",
-      "version": "0.4.2"
+      "version": "1.0.0"
     },
     {
       "author": "lgierth",

test/sharness/t0053-dag.sh

@@ -15,10 +15,10 @@ test_expect_success "make a few test files" '
 	echo "bar" > file2 &&
 	echo "baz" > file3 &&
 	echo "qux" > file4 &&
-	HASH1=$(ipfs add -q file1) &&
-	HASH2=$(ipfs add -q file2) &&
-	HASH3=$(ipfs add -q file3) &&
-	HASH4=$(ipfs add -q file4)
+	HASH1=$(ipfs add --pin=false -q file1) &&
+	HASH2=$(ipfs add --pin=false -q file2) &&
+	HASH3=$(ipfs add --pin=false -q file3) &&
+	HASH4=$(ipfs add --pin=false -q file4)
 '
 
 test_expect_success "make an ipld object in json" '
@@ -31,7 +31,7 @@ test_dag_cmd() {
 	'
 
 	test_expect_success "output looks correct" '
-		EXPHASH="zdpuApvChR5xM7ttbQmpmtna7wcShHi4gPyxUcWbB7nh8K7cN"
+		EXPHASH="zdpuAzn7KZcQmKJvpEM1DgHXaybVj7mRP4ZMrkW94taYEuZHp"
 		test $EXPHASH = $IPLDHASH
 	'
 
@@ -47,6 +47,15 @@ test_dag_cmd() {
 		test_cmp file3 out3
 	'
 
+	test_expect_success "can pin cbor object" '
+		ipfs pin add $EXPHASH
+	'
+
+	test_expect_success "after gc, objects still acessible" '
+		ipfs repo gc > /dev/null &&
+		ipfs refs -r --timeout=2s $EXPHASH > /dev/null
+	'
+
 	test_expect_success "add a normal file" '
 		HASH=$(echo "foobar" | ipfs add -q)
 	'