gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

swarm: modify context key (#17925)

Browse Source 
* swarm: modify context key

* gofmt sctx.go
This commit is contained in:
KimMachineGun
2018-11-06 17:54:19 +09:00
committed by Viktor Trón
parent 126dfde6c9
commit baee850471
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
swarm/api/http/sctx.go
View File

@@ -7,14 +7,10 @@ import (
"github.com/ethereum/go-ethereum/swarm/sctx"
)
type contextKey int
const (
uriKey contextKey = iota
)
type uriKey struct{}
func GetRUID(ctx context.Context) string {
v, ok := ctx.Value(sctx.HTTPRequestIDKey).(string)
v, ok := ctx.Value(sctx.HTTPRequestIDKey{}).(string)
if ok {
return v
}
@@ -22,11 +18,11 @@ func GetRUID(ctx context.Context) string {
}
func SetRUID(ctx context.Context, ruid string) context.Context {
return context.WithValue(ctx, sctx.HTTPRequestIDKey, ruid)
return context.WithValue(ctx, sctx.HTTPRequestIDKey{}, ruid)
}
func GetURI(ctx context.Context) *api.URI {
v, ok := ctx.Value(uriKey).(*api.URI)
v, ok := ctx.Value(uriKey{}).(*api.URI)
if ok {
return v
}
@@ -34,5 +30,5 @@ func GetURI(ctx context.Context) *api.URI {
}
func SetURI(ctx context.Context, uri *api.URI) context.Context {
return context.WithValue(ctx, uriKey, uri)
return context.WithValue(ctx, uriKey{}, uri)
}

12
swarm/sctx/sctx.go
View File

@@ -2,19 +2,17 @@ package sctx
import "context"
type ContextKey int
const (
HTTPRequestIDKey ContextKey = iota
requestHostKey
type (
HTTPRequestIDKey struct{}
requestHostKey struct{}
)
func SetHost(ctx context.Context, domain string) context.Context {
return context.WithValue(ctx, requestHostKey, domain)
return context.WithValue(ctx, requestHostKey{}, domain)
}
func GetHost(ctx context.Context) string {
v, ok := ctx.Value(requestHostKey).(string)
v, ok := ctx.Value(requestHostKey{}).(string)
if ok {
return v
}