Skip to content

Commit

Permalink
pool: Remove unused statisticUpdater
Browse files Browse the repository at this point in the history 
Signed-off-by: Evgenii Baidakov <[email protected]>
  • Loading branch information
@smallhive
smallhive committed Jun 26, 2023
1 parent ac44ce2 commit f2512e0
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion pool/accounting.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
//
// See details in [client.Client.BalanceGet].
func (p *Pool) BalanceGet(ctx context.Context, prm client.PrmBalanceGet) (accounting.Decimal, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return accounting.Decimal{}, err
}
Expand Down
12 changes: 6 additions & 6 deletions pool/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
//
// See details in [client.Client.ContainerPut].
func (p *Pool) ContainerPut(ctx context.Context, cont container.Container, prm client.PrmContainerPut) (cid.ID, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return cid.ID{}, err
}
Expand All @@ -26,7 +26,7 @@ func (p *Pool) ContainerPut(ctx context.Context, cont container.Container, prm c
//
// See details in [client.Client.ContainerGet].
func (p *Pool) ContainerGet(ctx context.Context, id cid.ID, prm client.PrmContainerGet) (container.Container, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return container.Container{}, err
}
Expand All @@ -38,7 +38,7 @@ func (p *Pool) ContainerGet(ctx context.Context, id cid.ID, prm client.PrmContai
//
// See details in [client.Client.ContainerList].
func (p *Pool) ContainerList(ctx context.Context, ownerID user.ID, prm client.PrmContainerList) ([]cid.ID, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return []cid.ID{}, err
}
Expand All @@ -50,7 +50,7 @@ func (p *Pool) ContainerList(ctx context.Context, ownerID user.ID, prm client.Pr
//
// See details in [client.Client.ContainerDelete].
func (p *Pool) ContainerDelete(ctx context.Context, id cid.ID, prm client.PrmContainerDelete) error {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return err
}
Expand All @@ -62,7 +62,7 @@ func (p *Pool) ContainerDelete(ctx context.Context, id cid.ID, prm client.PrmCon
//
// See details in [client.Client.ContainerEACL].
func (p *Pool) ContainerEACL(ctx context.Context, id cid.ID, prm client.PrmContainerEACL) (eacl.Table, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return eacl.Table{}, err
}
Expand All @@ -74,7 +74,7 @@ func (p *Pool) ContainerEACL(ctx context.Context, id cid.ID, prm client.PrmConta
//
// See details in [client.Client.ContainerSetEACL].
func (p *Pool) ContainerSetEACL(ctx context.Context, table eacl.Table, prm client.PrmContainerSetEACL) error {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions pool/netmap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
//
// See details in [client.Client.NetworkInfo].
func (p *Pool) NetworkInfo(ctx context.Context, prm client.PrmNetworkInfo) (netmap.NetworkInfo, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return netmap.NetworkInfo{}, err
}
Expand All @@ -23,7 +23,7 @@ func (p *Pool) NetworkInfo(ctx context.Context, prm client.PrmNetworkInfo) (netm
//
// See details in [client.Client.NetMapSnapshot].
func (p *Pool) NetMapSnapshot(ctx context.Context, prm client.PrmNetMapSnapshot) (netmap.NetMap, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return netmap.NetMap{}, err
}
Expand Down
14 changes: 7 additions & 7 deletions pool/object.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func (p *Pool) actualSigner(signer neofscrypto.Signer) neofscrypto.Signer {
//
// See details in [client.Client.ObjectPutInit].
func (p *Pool) ObjectPutInit(ctx context.Context, hdr object.Object, prm client.PrmObjectPutInit) (*client.ObjectWriter, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -58,7 +58,7 @@ func (p *Pool) ObjectPutInit(ctx context.Context, hdr object.Object, prm client.
// See details in [client.Client.ObjectGetInit].
func (p *Pool) ObjectGetInit(ctx context.Context, containerID cid.ID, objectID oid.ID, prm client.PrmObjectGet) (object.Object, *client.ObjectReader, error) {
var hdr object.Object
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return hdr, nil, err
}
Expand All @@ -80,7 +80,7 @@ func (p *Pool) ObjectGetInit(ctx context.Context, containerID cid.ID, objectID o
//
// See details in [client.Client.ObjectHead].
func (p *Pool) ObjectHead(ctx context.Context, containerID cid.ID, objectID oid.ID, prm client.PrmObjectHead) (*client.ResObjectHead, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return nil, err
}
Expand All @@ -102,7 +102,7 @@ func (p *Pool) ObjectHead(ctx context.Context, containerID cid.ID, objectID oid.
//
// See details in [client.Client.ObjectRangeInit].
func (p *Pool) ObjectRangeInit(ctx context.Context, containerID cid.ID, objectID oid.ID, offset, length uint64, prm client.PrmObjectRange) (*client.ObjectRangeReader, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return nil, err
}
Expand All @@ -124,7 +124,7 @@ func (p *Pool) ObjectRangeInit(ctx context.Context, containerID cid.ID, objectID
//
// See details in [client.Client.ObjectDelete].
func (p *Pool) ObjectDelete(ctx context.Context, containerID cid.ID, objectID oid.ID, prm client.PrmObjectDelete) (oid.ID, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return oid.ID{}, err
}
Expand All @@ -146,7 +146,7 @@ func (p *Pool) ObjectDelete(ctx context.Context, containerID cid.ID, objectID oi
//
// See details in [client.Client.ObjectHash].
func (p *Pool) ObjectHash(ctx context.Context, containerID cid.ID, objectID oid.ID, prm client.PrmObjectHash) ([][]byte, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return [][]byte{}, err
}
Expand All @@ -168,7 +168,7 @@ func (p *Pool) ObjectHash(ctx context.Context, containerID cid.ID, objectID oid.
//
// See details in [client.Client.ObjectSearchInit].
func (p *Pool) ObjectSearchInit(ctx context.Context, containerID cid.ID, prm client.PrmObjectSearch) (*client.ObjectListReader, error) {
c, _, err := p.sdkClient()
c, err := p.sdkClient()
if err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions pool/pool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2518,18 +2518,18 @@ func (p *Pool) FindSiblingByParentID(ctx context.Context, cnrID cid.ID, objID oi
return res, nil
}

func (p *Pool) sdkClient() (*sdkClient.Client, statisticUpdater, error) {
func (p *Pool) sdkClient() (*sdkClient.Client, error) {
conn, err := p.connection()
if err != nil {
return nil, nil, fmt.Errorf("connection: %w", err)
return nil, fmt.Errorf("connection: %w", err)
}

cl, err := conn.getClient()
if err != nil {
return nil, nil, fmt.Errorf("get client: %w", err)
return nil, fmt.Errorf("get client: %w", err)
}

return cl, conn, nil
return cl, nil
}

func (p *Pool) statisticMiddleware(nodeKey []byte, endpoint string, method stat.Method, duration time.Duration, err error) {
Expand Down
8 changes: 4 additions & 4 deletions pool/pool_aio_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func TestPoolInterfaceWithAIO(t *testing.T) {
defer cancel()

containerID = testCreateContainer(t, ctxTimeout, signer, cont, pool)
cl, _, err := pool.sdkClient()
cl, err := pool.sdkClient()

require.NoError(t, err)
require.NoError(t, isBucketCreated(ctxTimeout, cl, containerID))
Expand All @@ -183,7 +183,7 @@ func TestPoolInterfaceWithAIO(t *testing.T) {
defer cancel()

table := testSetEacl(t, ctxTimeout, signer, eaclTable, pool)
cl, _, err := pool.sdkClient()
cl, err := pool.sdkClient()

require.NoError(t, err)
require.NoError(t, isEACLCreated(ctxTimeout, cl, containerID, table))
Expand Down Expand Up @@ -226,7 +226,7 @@ func TestPoolInterfaceWithAIO(t *testing.T) {
defer cancel()

testDeleteObject(t, ctxTimeout, signer, containerID, objectID, pool)
cl, _, err := pool.sdkClient()
cl, err := pool.sdkClient()

require.NoError(t, err)
require.NoError(t, isObjectDeleted(ctxTimeout, cl, containerID, objectID))
Expand All @@ -237,7 +237,7 @@ func TestPoolInterfaceWithAIO(t *testing.T) {
defer cancel()

testDeleteContainer(t, ctxTimeout, signer, containerID, pool)
cl, _, err := pool.sdkClient()
cl, err := pool.sdkClient()

require.NoError(t, err)
require.NoError(t, isBucketDeleted(ctxTimeout, cl, containerID))
Expand Down

0 comments on commit f2512e0

Please sign in to comment.