From cce39eb8932a45a81ee5ee5234acf962dd2e7cad Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <k@kevina.org>
Date: Fri, 27 May 2016 15:13:50 -0400
Subject: [PATCH] Filestore: Minor Refactor.

License: MIT
Signed-off-by: Kevin Atkinson <k@kevina.org>
---
 filestore/util/move.go |  2 +-
 merkledag/coding.go    | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/filestore/util/move.go b/filestore/util/move.go
index 48867f68ee85..72e68da312cb 100644
--- a/filestore/util/move.go
+++ b/filestore/util/move.go
@@ -112,7 +112,7 @@ func (p *params) convertToFile(key bk.Key, root bool, offset uint64) (uint64, er
 			return 0, err
 		}
 		dataObj.Flags |= NoBlockData
-		pbnode := n.GetPBNode(true)
+		pbnode := n.GetPBNode()
 		pbnode.Data, err = fsnode.GetBytesNoData()
 		if err != nil {
 			return 0, err
diff --git a/merkledag/coding.go b/merkledag/coding.go
index 2cb0ceba4b07..7530205bb7b1 100644
--- a/merkledag/coding.go
+++ b/merkledag/coding.go
@@ -40,7 +40,7 @@ func (n *Node) unmarshal(encoded []byte) error {
 // Marshal encodes a *Node instance into a new byte slice.
 // The conversion uses an intermediate PBNode.
 func (n *Node) Marshal() ([]byte, error) {
-	pbn := n.GetPBNode(true)
+	pbn := n.GetPBNode()
 	data, err := pbn.Marshal()
 	if err != nil {
 		return data, fmt.Errorf("Marshal failed. %v", err)
@@ -49,7 +49,10 @@ func (n *Node) Marshal() ([]byte, error) {
 }
 
 func (n *Node) MarshalNoData() ([]byte, error) {
-	pbn := n.GetPBNode(false)
+	pbn := n.GetPBNode()
+	if n.DataPtr != nil && len(n.DataPtr.AltData) > 0 {
+		pbn.Data = n.DataPtr.AltData
+	}
 	data, err := pbn.Marshal()
 	if err != nil {
 		return data, fmt.Errorf("Marshal failed. %v", err)
@@ -57,7 +60,7 @@ func (n *Node) MarshalNoData() ([]byte, error) {
 	return data, nil
 }
 
-func (n *Node) GetPBNode(useData bool) *pb.PBNode {
+func (n *Node) GetPBNode() *pb.PBNode {
 	pbn := &pb.PBNode{}
 	if len(n.Links) > 0 {
 		pbn.Links = make([]*pb.PBLink, len(n.Links))
@@ -71,17 +74,10 @@ func (n *Node) GetPBNode(useData bool) *pb.PBNode {
 		pbn.Links[i].Hash = []byte(l.Hash)
 	}
 
-	if useData {
-		if len(n.Data) > 0 {
-			pbn.Data = n.Data
-		}
-	} else {
-		if n.DataPtr != nil && len(n.DataPtr.AltData) > 0 {
-			pbn.Data = n.DataPtr.AltData
-		} else if len(n.Data) > 0 {
-			pbn.Data = n.Data
-		}
+	if len(n.Data) > 0 {
+		pbn.Data = n.Data
 	}
+
 	return pbn
 }