From fe336fd5ba28ea66deae7713e02f304809e1ad4e Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Mon, 16 Nov 2020 12:31:25 +0300 Subject: [PATCH] [#198] sdk/client: Use XHeader type Signed-off-by: Leonard Lyubich --- pkg/client/opts.go | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkg/client/opts.go b/pkg/client/opts.go index 702f4c2..4404ab6 100644 --- a/pkg/client/opts.go +++ b/pkg/client/opts.go @@ -21,13 +21,9 @@ type ( apply(*clientOptions) } - xHeader struct { - v2session.XHeader - } - callOptions struct { version *pkg.Version - xHeaders []xHeader + xHeaders []*pkg.XHeader ttl uint32 epoch uint64 session *token.SessionToken @@ -81,15 +77,9 @@ func newFuncCallOption(f func(option *callOptions)) *funcCallOption { } } -func WithXHeader(key, value string) CallOption { +func WithXHeader(x *pkg.XHeader) CallOption { return newFuncCallOption(func(option *callOptions) { - xhdr := new(v2session.XHeader) - xhdr.SetKey(key) - xhdr.SetValue(value) - - option.xHeaders = append(option.xHeaders, xHeader{ - XHeader: *xhdr, - }) + option.xHeaders = append(option.xHeaders, x) }) } @@ -125,7 +115,7 @@ func v2MetaHeaderFromOpts(options callOptions) *v2session.RequestMetaHeader { xhdrs := make([]*v2session.XHeader, len(options.xHeaders)) for i := range options.xHeaders { - xhdrs[i] = &options.xHeaders[i].XHeader + xhdrs[i] = options.xHeaders[i].ToV2() } meta.SetXHeaders(xhdrs)