Browse Source

Revert "feat: export (const.)core.v2rayKey (#831)"

This reverts commit 102e3295
Shelikhoo 4 years ago
parent
commit
e31bfe02f0
2 changed files with 3 additions and 4 deletions
  1. 2 3
      context.go
  2. 1 1
      functions.go

+ 2 - 3
context.go

@@ -9,12 +9,11 @@ import (
 // V2rayKey is the key type of Instance in Context, exported for test.
 type V2rayKey int
 
-// V2rayKeyValue is the key value of Instance in Context, exported for test.
-const V2rayKeyValue V2rayKey = 1
+const v2rayKey V2rayKey = 1
 
 // FromContext returns an Instance from the given context, or nil if the context doesn't contain one.
 func FromContext(ctx context.Context) *Instance {
-	if s, ok := ctx.Value(V2rayKeyValue).(*Instance); ok {
+	if s, ok := ctx.Value(v2rayKey).(*Instance); ok {
 		return s
 	}
 	return nil

+ 1 - 1
functions.go

@@ -16,7 +16,7 @@ import (
 func CreateObject(v *Instance, config interface{}) (interface{}, error) {
 	var ctx context.Context
 	if v != nil {
-		ctx = context.WithValue(v.ctx, V2rayKeyValue, v)
+		ctx = context.WithValue(v.ctx, v2rayKey, v)
 	}
 	return common.CreateObject(ctx, config)
 }