merkledag: fix json marshalling of pbnode

License: MIT
Signed-off-by: Jeromy <why@ipfs.io>

merkledag/node.go

@@ -2,6 +2,7 @@ package merkledag
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	node "gx/ipfs/QmRSU5EqqWVZSNdbU51yXmVoF1uNw3JgTNB6RaiL7DZM16/go-ipld-node"
@@ -228,6 +229,15 @@ func (n *ProtoNode) Loggable() map[string]interface{} {
 	}
 }
 
+func (n *ProtoNode) MarshalJSON() ([]byte, error) {
+	out := map[string]interface{}{
+		"data":  n.data,
+		"links": n.links,
+	}
+
+	return json.Marshal(out)
+}
+
 func (n *ProtoNode) Cid() *cid.Cid {
 	if n.encoded != nil && n.cached != nil {
 		return n.cached

test/sharness/t0053-dag.sh

@@ -46,6 +46,19 @@ test_dag_cmd() {
 		test_cmp file2 out2 &&
 		test_cmp file3 out3
 	'
+
+	test_expect_success "add a normal file" '
+		HASH=$(echo "foobar" | ipfs add -q)
+	'
+
+	test_expect_success "can view protobuf object with dag get" '
+		ipfs dag get $HASH > dag_get_pb_out
+	'
+
+	test_expect_success "output looks correct" '
+		echo "{\"data\":\"CAISB2Zvb2JhcgoYBw==\",\"links\":[]}" > dag_get_pb_exp &&
+		test_cmp dag_get_pb_exp dag_get_pb_out
+	'
 }
 
 # should work offline