dont use searchset for indirect pin checking

whyrusleeping · whyrusleeping · commit 1bb45300f703 · 2015-07-10T11:34:29.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/pin/pin.go b/pin/pin.go
@@ -177,19 +177,16 @@ func (p *pinner) isPinned(k key.Key) (string, bool, error) {
 	}
 
 	for _, rk := range p.recursePin.GetKeys() {
-		ss := &searchSet{target: k}
-
 		rnd, err := p.dserv.Get(context.Background(), rk)
 		if err != nil {
 			return "", false, err
 		}
 
-		err = mdag.EnumerateChildren(context.Background(), p.dserv, rnd, ss)
+		has, err := hasChild(p.dserv, rnd, k)
 		if err != nil {
 			return "", false, err
 		}
-
-		if ss.found {
+		if has {
 			return rk.B58String(), true, nil
 		}
 	}
@@ -350,26 +347,19 @@ func (p *pinner) PinWithMode(k key.Key, mode PinMode) {
 	}
 }
 
-// searchSet implements key.KeySet in
-type searchSet struct {
-	target key.Key
-	found  bool
-}
-
-func (ss *searchSet) Add(k key.Key) {
-	if ss.target == k {
-		ss.found = true
-	}
-}
+func hasChild(ds mdag.DAGService, root *mdag.Node, child key.Key) (bool, error) {
+	for _, lnk := range root.Links {
+		k := key.Key(lnk.Hash)
+		if k == child {
+			return true, nil
+		}
 
-func (ss *searchSet) Has(k key.Key) bool {
-	// returning true to all Has queries will cause EnumerateChildren to return
-	// almost immediately
-	return ss.found
-}
+		nd, err := ds.Get(context.Background(), k)
+		if err != nil {
+			return false, err
+		}
 
-func (ss *searchSet) Keys() []key.Key {
-	return nil
+		return hasChild(ds, nd, child)
+	}
+	return false, nil
 }
-
-func (ss *searchSet) Remove(key.Key) {}
