readability(util) Do -> ContextDo

@jbenet

net/net.go

@@ -60,7 +60,7 @@ func NewIpfsNetwork(ctx context.Context, listen []ma.Multiaddr, local peer.Peer,
 // DialPeer attempts to establish a connection to a given peer.
 // Respects the context.
 func (n *IpfsNetwork) DialPeer(ctx context.Context, p peer.Peer) error {
-	err := util.Do(ctx, func() error {
+	err := util.ContextDo(ctx, func() error {
 		_, err := n.swarm.Dial(p)
 		return err
 	})

util/do.go

@@ -2,7 +2,7 @@ package util
 
 import "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
 
-func Do(ctx context.Context, f func() error) error {
+func ContextDo(ctx context.Context, f func() error) error {
 
 	ch := make(chan error)
 

util/do_test.go

@@ -10,7 +10,7 @@ import (
 func TestDoReturnsContextErr(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	ch := make(chan struct{})
-	err := Do(ctx, func() error {
+	err := ContextDo(ctx, func() error {
 		cancel()
 		ch <- struct{}{} // won't return
 		return nil
@@ -22,8 +22,8 @@ func TestDoReturnsContextErr(t *testing.T) {
 
 func TestDoReturnsFuncError(t *testing.T) {
 	ctx := context.Background()
-	expected := errors.New("expected to be returned by Do")
-	err := Do(ctx, func() error {
+	expected := errors.New("expected to be returned by ContextDo")
+	err := ContextDo(ctx, func() error {
 		return expected
 	})
 	if err != expected {
@@ -33,7 +33,7 @@ func TestDoReturnsFuncError(t *testing.T) {
 
 func TestDoReturnsNil(t *testing.T) {
 	ctx := context.Background()
-	err := Do(ctx, func() error {
+	err := ContextDo(ctx, func() error {
 		return nil
 	})
 	if err != nil {