Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add function to marshal raw nodes to json #36

Merged
merged 1 commit into from
Mar 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions merkledag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package merkledag_test
import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
"io"
Expand Down Expand Up @@ -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) {
ctx := context.Background()

Expand Down
6 changes: 6 additions & 0 deletions raw.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package merkledag

import (
"encoding/json"
"fmt"
"github.com/ipfs/go-block-format"

Expand Down Expand Up @@ -94,4 +95,9 @@ func (rn *RawNode) Stat() (*ipld.NodeStat, error) {
}, 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)