reorg network context options.

network/context.go

@@ -10,8 +10,27 @@ import (
 // each independently.
 var DialPeerTimeout = 60 * time.Second
 
+type noDialCtxKey struct{}
 type dialPeerTimeoutCtxKey struct{}
 
+var noDial = noDialCtxKey{}
+
+// WithNoDial constructs a new context with an option that instructs the network
+// to not attempt a new dial when opening a stream.
+func WithNoDial(ctx context.Context, reason string) context.Context {
+	return context.WithValue(ctx, noDial, reason)
+}
+
+// GetNoDial returns true if the no dial option is set in the context.
+func GetNoDial(ctx context.Context) (nodial bool, reason string) {
+	v := ctx.Value(noDial)
+	if v != nil {
+		return true, v.(string)
+	}
+
+	return false, ""
+}
+
 // GetDialPeerTimeout returns the current DialPeer timeout (or the default).
 func GetDialPeerTimeout(ctx context.Context) time.Duration {
 	if to, ok := ctx.Value(dialPeerTimeoutCtxKey{}).(time.Duration); ok {

network/options.go

@@ -1,23 +0,0 @@
-package network
-
-import "context"
-
-type noDialCtxKey struct{}
-
-var noDial = noDialCtxKey{}
-
-// WithNoDial constructs a new context with an option that instructs the network
-// to not attempt a new dial when opening a stream.
-func WithNoDial(ctx context.Context, reason string) context.Context {
-	return context.WithValue(ctx, noDial, reason)
-}
-
-// GetNoDial returns true if the no dial option is set in the context.
-func GetNoDial(ctx context.Context) (nodial bool, reason string) {
-	v := ctx.Value(noDial)
-	if v != nil {
-		return true, v.(string)
-	}
-
-	return false, ""
-}