acid-ant/frostfs-sdk-go
1
0
Fork 0
forked from TrueCloudLab/frostfs-sdk-go
Code Pull requests Activity

[#323] client: Remove initCallContextWithoutKey

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-08-23 20:12:12 +03:00 committed by fyrchik
parent 84888854ab
commit 2f843de3ed
4 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/common.go
View file

@ -288,11 +288,6 @@ func (x *contextCall) processCall() bool {
// initializes static cross-call parameters inherited from client. // initializes static cross-call parameters inherited from client.
func (c *Client) initCallContext(ctx *contextCall) { func (c *Client) initCallContext(ctx *contextCall) {
ctx.key = c.prm.key ctx.key = c.prm.key
c.initCallContextWithoutKey(ctx)
}
// initializes static cross-call parameters inherited from client except private key.
func (c *Client) initCallContextWithoutKey(ctx *contextCall) {
ctx.resolveAPIFailures = c.prm.resolveNeoFSErrors ctx.resolveAPIFailures = c.prm.resolveNeoFSErrors
ctx.callbackResp = c.prm.cbRespInfo ctx.callbackResp = c.prm.cbRespInfo
ctx.netMagic = c.prm.netMagic ctx.netMagic = c.prm.netMagic

4
client/object_delete.go
View file

@ -148,11 +148,9 @@ func (c *Client) ObjectDelete(ctx context.Context, prm PrmObjectDelete) (*ResObj
res ResObjectDelete res ResObjectDelete
) )
c.initCallContext(&cc)
if prm.keySet { if prm.keySet {
c.initCallContextWithoutKey(&cc)
cc.key = prm.key cc.key = prm.key
} else {
c.initCallContext(&cc)
} }
cc.req = &req cc.req = &req

4
client/object_get.go
View file

@ -499,11 +499,9 @@ func (c *Client) ObjectHead(ctx context.Context, prm PrmObjectHead) (*ResObjectH
res.idObj = prm.objID res.idObj = prm.objID
c.initCallContext(&cc)
if prm.keySet { if prm.keySet {
c.initCallContextWithoutKey(&cc)
cc.key = prm.key cc.key = prm.key
} else {
c.initCallContext(&cc)
} }
cc.req = &req cc.req = &req

4
client/session.go
View file

@ -110,11 +110,9 @@ func (c *Client) SessionCreate(ctx context.Context, prm PrmSessionCreate) (*ResS
res ResSessionCreate res ResSessionCreate
) )
c.initCallContext(&cc)
if prm.keySet { if prm.keySet {
c.initCallContextWithoutKey(&cc)
cc.key = prm.key cc.key = prm.key
} else {
c.initCallContext(&cc)
} }
cc.meta = prm.prmCommonMeta cc.meta = prm.prmCommonMeta