Unverified Commit fe3c46b2 authored by Steven Allen's avatar Steven Allen Committed by GitHub

Merge pull request #36 from ipfs/fix/go-ipfs-6076

add function to marshal raw nodes to json
parents 1bc88945 9f35e3ef
...@@ -3,6 +3,7 @@ package merkledag_test ...@@ -3,6 +3,7 @@ package merkledag_test
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"io" "io"
...@@ -640,6 +641,27 @@ func TestCidRawDoesnNeedData(t *testing.T) { ...@@ -640,6 +641,27 @@ func TestCidRawDoesnNeedData(t *testing.T) {
} }
} }
func TestRawToJson(t *testing.T) {
rawData := []byte{1, 2, 3, 4}
nd := NewRawNode(rawData)
encoded, err := nd.MarshalJSON()
if err != nil {
t.Fatal(err)
}
var res interface{}
err = json.Unmarshal(encoded, &res)
if err != nil {
t.Fatal(err)
}
resBytes, ok := res.(string)
if !ok {
t.Fatal("expected to marshal to a string")
}
if string(rawData) != resBytes {
t.Fatal("failed to round-trip bytes")
}
}
func TestGetManyDuplicate(t *testing.T) { func TestGetManyDuplicate(t *testing.T) {
ctx := context.Background() ctx := context.Background()
......
package merkledag package merkledag
import ( import (
"encoding/json"
"fmt" "fmt"
"github.com/ipfs/go-block-format" "github.com/ipfs/go-block-format"
...@@ -94,4 +95,9 @@ func (rn *RawNode) Stat() (*ipld.NodeStat, error) { ...@@ -94,4 +95,9 @@ func (rn *RawNode) Stat() (*ipld.NodeStat, error) {
}, nil }, nil
} }
// MarshalJSON is required for our "ipfs dag" commands.
func (rn *RawNode) MarshalJSON() ([]byte, error) {
return json.Marshal(string(rn.RawData()))
}
var _ ipld.Node = (*RawNode)(nil) var _ ipld.Node = (*RawNode)(nil)
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