From 47c4dcb2b07cd3b44baea00fe5291ff5c0192eb3 Mon Sep 17 00:00:00 2001
From: Kejie Zhang <601172892@qq.com>
Date: Wed, 5 Sep 2018 14:07:35 +0800
Subject: [PATCH 1/2] object:refactor data encode error
License: MIT
Signed-off-by: Kejie Zhang <601172892@qq.com>
---
core/commands/object/object.go | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/core/commands/object/object.go b/core/commands/object/object.go
index 3edfd9044..bf4d3cdf0 100644
--- a/core/commands/object/object.go
+++ b/core/commands/object/object.go
@@ -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 {
@@ -43,6 +40,12 @@ type Object struct {
Links []Link `json:"Links,omitempty"`
}
+var (
+ // ErrObjectTooLarge is returned when too much data was read from stdin. current limit 2m
+ ErrObjectTooLarge = errors.New("input object was too large. limit is 2mbytes")
+ ErrDataEncoding = errors.New("unkown data field encoding")
+)
+
var ObjectCmd = &cmds.Command{
Helptext: cmdkit.HelpText{
Tagline: "Interact with IPFS objects.",
@@ -575,7 +578,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))
@@ -617,5 +620,5 @@ func encodeData(data []byte, encoding string) (string, error) {
return base64.StdEncoding.EncodeToString(data), nil
}
- return "", fmt.Errorf("unkown data field encoding")
+ return "", ErrDataEncoding
}
From dad9bdd6f4fe961460e89adcb8fadf8a90c03ed6 Mon Sep 17 00:00:00 2001
From: Kejie Zhang <601172892@qq.com>
Date: Wed, 5 Sep 2018 17:05:51 +0800
Subject: [PATCH 2/2] remove ErrObejctTooLarge error
License: MIT
Signed-off-by: Kejie Zhang <601172892@qq.com>
---
core/commands/object/object.go | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/core/commands/object/object.go b/core/commands/object/object.go
index bf4d3cdf0..721a6ca10 100644
--- a/core/commands/object/object.go
+++ b/core/commands/object/object.go
@@ -40,11 +40,7 @@ type Object struct {
Links []Link `json:"Links,omitempty"`
}
-var (
- // ErrObjectTooLarge is returned when too much data was read from stdin. current limit 2m
- ErrObjectTooLarge = errors.New("input object was too large. limit is 2mbytes")
- ErrDataEncoding = errors.New("unkown data field encoding")
-)
+var ErrDataEncoding = errors.New("unkown data field encoding")
var ObjectCmd = &cmds.Command{
Helptext: cmdkit.HelpText{