From baee850471603d7fbf37eed0074c9de01df92ee7 Mon Sep 17 00:00:00 2001 From: KimMachineGun Date: Tue, 6 Nov 2018 17:54:19 +0900 Subject: swarm: modify context key (#17925) * swarm: modify context key * gofmt sctx.go --- swarm/api/http/sctx.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'swarm/api') diff --git a/swarm/api/http/sctx.go b/swarm/api/http/sctx.go index 431e11735..b8dafab0b 100644 --- a/swarm/api/http/sctx.go +++ b/swarm/api/http/sctx.go @@ -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) } -- cgit v1.2.3