cancel contexts in early returns

whyrusleeping · whyrusleeping · commit f155f2e44e81 · 2015-06-03T15:08:14.000-07:00
diff --git a/core/commands/object.go b/core/commands/object.go
@@ -453,6 +453,7 @@ resulting object hash.
 		rnode, err := nd.DAG.Get(ctx, rhash)
 		if err != nil {
 			res.SetError(err, cmds.ErrNormal)
+			cancel()
 			return
 		}
 		cancel()
@@ -595,6 +596,7 @@ func addLink(ctx context.Context, ds dag.DAGService, root *dag.Node, childname s
 	ctx, cancel := context.WithTimeout(ctx, time.Second*30)
 	childnd, err := ds.Get(ctx, childk)
 	if err != nil {
+		cancel()
 		return "", err
 	}
 	cancel()
diff --git a/routing/record/record.go b/routing/record/record.go
@@ -6,11 +6,13 @@ import (
 	proto "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
 
 	key "github.com/ipfs/go-ipfs/blocks/key"
+	dag "github.com/ipfs/go-ipfs/merkledag"
 	ci "github.com/ipfs/go-ipfs/p2p/crypto"
 	pb "github.com/ipfs/go-ipfs/routing/dht/pb"
 	eventlog "github.com/ipfs/go-ipfs/thirdparty/eventlog"
 )
 
+var _ = dag.FetchGraph
 var log = eventlog.Logger("routing/record")
 
 // MakePutRecord creates and signs a dht record for the given key/value pair
