merkledag: keep key order in dedupeKeys

License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
ipfs · Oct 19, 2017 · 913f964 · 913f964
1 parent 3fbb771
commit 913f964
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go
@@ -373,7 +373,7 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
 }
 
 type sizeReadSeeker interface {
-  Size() uint64
+	Size() uint64
 
 	io.ReadSeeker
 }

diff --git a/merkledag/merkledag.go b/merkledag/merkledag.go
@@ -307,11 +307,14 @@ func GetNodes(ctx context.Context, ds DAGService, keys []*cid.Cid) []NodeGetter
 
 // Remove duplicates from a list of keys
 func dedupeKeys(cids []*cid.Cid) []*cid.Cid {
+	out := make([]*cid.Cid, 0, len(cids))
 	set := cid.NewSet()
 	for _, c := range cids {
-		set.Add(c)
+		if set.Visit(c) {
+			out = append(out, c)
+		}
 	}
-	return set.Keys()
+	return out
 }
 
 func newNodePromise(ctx context.Context) NodeGetter {