From e400fa3b380b589c2ae385a66a007d685147e4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 19 Feb 2019 22:19:56 +0100
Subject: [PATCH] pin verify: use temporary struct

---
 pin.go | 57 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/pin.go b/pin.go
index b11efd3..f667a54 100644
--- a/pin.go
+++ b/pin.go
@@ -90,27 +90,20 @@ func (api *PinAPI) Update(ctx context.Context, from iface.Path, to iface.Path, o
 }
 
 type pinVerifyRes struct {
-	Cid       string
-	JOk       bool       `json:"Ok"`
-	JBadNodes []*badNode `json:"BadNodes,omitempty"`
+	ok       bool
+	badNodes []iface.BadPinNode
 }
 
 func (r *pinVerifyRes) Ok() bool {
-	return r.JOk
+	return r.ok
 }
 
 func (r *pinVerifyRes) BadNodes() []iface.BadPinNode {
-	out := make([]iface.BadPinNode, len(r.JBadNodes))
-	for i, n := range r.JBadNodes {
-		out[i] = n
-	}
-	return out
+	return r.badNodes
 }
 
 type badNode struct {
-	Cid  string
-	JErr string `json:"Err"`
-
+	err error
 	cid cid.Cid
 }
 
@@ -119,10 +112,7 @@ func (n *badNode) Path() iface.ResolvedPath {
 }
 
 func (n *badNode) Err() error {
-	if n.JErr != "" {
-		return errors.New(n.JErr)
-	}
-	return nil
+	return n.err
 }
 
 func (api *PinAPI) Verify(ctx context.Context) (<-chan iface.PinStatus, error) {
@@ -140,20 +130,45 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan iface.PinStatus, error) {
 		defer close(res)
 		dec := json.NewDecoder(resp.Output)
 		for {
-			var out pinVerifyRes
+			var out struct {
+				Cid string
+				Ok bool
+
+				BadNodes []struct{
+					Cid string
+					Err string
+				}
+			}
 			if err := dec.Decode(&out); err != nil {
 				return // todo: handle non io.EOF somehow
 			}
 
-			for i, n := range out.JBadNodes {
-				out.JBadNodes[i].cid, err = cid.Decode(n.Cid)
+			badNodes := make([]iface.BadPinNode, len(out.BadNodes))
+			for i, n := range out.BadNodes {
+				c, err := cid.Decode(n.Cid)
 				if err != nil {
-					return
+					badNodes[i] = &badNode{
+						cid: c,
+						err: err,
+					}
+					continue
+				}
+
+				if n.Err != "" {
+					err = errors.New(n.Err)
+				}
+				badNodes[i] = &badNode{
+					cid: c,
+					err: err,
 				}
 			}
 
 			select {
-			case res <- &out:
+			case res <- &pinVerifyRes{
+				ok: out.Ok,
+
+				badNodes: badNodes,
+			}:
 			case <-ctx.Done():
 				return
 			}