Skip to content

Commit

Permalink
Merge pull request #5426 from kjzz/zkj/refactor
Browse files Browse the repository at this point in the history
object:refactor data encode error
  • Loading branch information
Stebalien authored Sep 5, 2018
2 parents 78a32f2 + dad9bdd commit 2dca8c2
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions core/commands/object/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ import (
cid "gx/ipfs/QmZFbDTY9jfSBms2MchvYM9oYRbAF19K7Pby47yDBfpPrb/go-cid"
)

// ErrObjectTooLarge is returned when too much data was read from stdin. current limit 2m
var ErrObjectTooLarge = errors.New("input object was too large. limit is 2mbytes")

const inputLimit = 2 << 20

type Node struct {
Expand All @@ -43,6 +40,8 @@ type Object struct {
Links []Link `json:"Links,omitempty"`
}

var ErrDataEncoding = errors.New("unkown data field encoding")

var ObjectCmd = &cmds.Command{
Helptext: cmdkit.HelpText{
Tagline: "Interact with IPFS objects.",
Expand Down Expand Up @@ -575,7 +574,7 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error)
}
dagnode.SetData(data)
default:
return nil, fmt.Errorf("unkown data field encoding")
return nil, ErrDataEncoding
}

links := make([]*ipld.Link, len(nd.Links))
Expand Down Expand Up @@ -617,5 +616,5 @@ func encodeData(data []byte, encoding string) (string, error) {
return base64.StdEncoding.EncodeToString(data), nil
}

return "", fmt.Errorf("unkown data field encoding")
return "", ErrDataEncoding
}

0 comments on commit 2dca8c2

Please sign in to comment.