[#13] Client: Use code analyzers

Signed-off-by: Pavel Gross <p.gross@yadro.com>

src/FrostFS.SDK.Tests/ContainerTest.cs

@@ -1,12 +1,12 @@
 using FrostFS.SDK.ClientV2;
-using FrostFS.SDK.ClientV2.Mappers.GRPC;
 using FrostFS.SDK.ClientV2.Interfaces;
-using FrostFS.SDK.ClientV2;
+using FrostFS.SDK.ClientV2.Mappers.GRPC;
 using FrostFS.SDK.Cryptography;
 
-using Microsoft.Extensions.Options;
 using Google.Protobuf;
 
+using Microsoft.Extensions.Options;
+
 namespace FrostFS.SDK.Tests;
 
 public abstract class ContainerTestsBase
@@ -34,7 +34,7 @@ public abstract class ContainerTestsBase
 
     protected IFrostFSClient GetClient()
     {
-        return ClientV2.Client.GetTestInstance(
+        return ClientV2.FrostFSClient.GetTestInstance(
             Settings,
             null,
             new NetworkMocker(this.key).GetMock().Object,
@@ -45,17 +45,17 @@ public abstract class ContainerTestsBase
 }
 
 public class ContainerTest : ContainerTestsBase
-{   
+{
     [Fact]
     public async void CreateContainerTest()
     {
-        var param = new PrmContainerCreate(new FrostFsContainerInfo(BasicAcl.PublicRW, Mocker.PlacementPolicy));
+        var param = new PrmContainerCreate(new FrostFsContainerInfo(Mocker.PlacementPolicy));
 
         var result = await GetClient().CreateContainerAsync(param);
 
         Assert.NotNull(result);
-        Assert.NotNull(result.Value);
-        Assert.True(Base58.Encode(Mocker.ContainerGuid.ToBytes()) == result.Value);
+        Assert.NotNull(result.GetValue());
+        Assert.True(Base58.Encode(Mocker.ContainerGuid.ToBytes()) == result.GetValue());
     }
 
     [Fact]
@@ -63,14 +63,11 @@ public class ContainerTest : ContainerTestsBase
     {
         var cid = new FrostFsContainerId(Base58.Encode(Mocker.ContainerGuid.ToBytes()));
 
-        Mocker.Acl = BasicAcl.PublicRO;
-
         var result = await GetClient().GetContainerAsync(new PrmContainerGet(cid));
 
         Assert.NotNull(result);
-        Assert.Equal(Mocker.Acl, result.BasicAcl);
         Assert.Equal(Mocker.ContainerGuid, result.Nonce);
-        Assert.Equal(0, Mocker.PlacementPolicy.CompareTo(result.PlacementPolicy));
+        Assert.Equal(Mocker.PlacementPolicy, result.PlacementPolicy);
         Assert.Equal(Mocker.Version.ToString(), result.Version!.ToString());
     }
 
@@ -89,7 +86,7 @@ public class ContainerTest : ContainerTestsBase
         await foreach (var cid in result)
         {
             var val = Base58.Encode(ByteString.CopyFrom(Mocker.ContainerIds[i++]).ToByteArray());
-            Assert.Equal(val, cid.Value);
+            Assert.Equal(val, cid.GetValue());
         }
 
         Assert.Equal(3, i);
@@ -106,7 +103,7 @@ public class ContainerTest : ContainerTestsBase
         Assert.Single(Mocker.Requests);
 
         var request = Mocker.Requests.First();
-        
-        Assert.Equal(cid.ToMessage(), request.Request.Body.ContainerId);        
+
+        Assert.Equal(cid.ToMessage(), request.Request.Body.ContainerId);
     }
 }

src/FrostFS.SDK.Tests/MetricsInterceptor.cs

@@ -1,7 +1,7 @@
-using Grpc.Core;
-using Grpc.Core.Interceptors;
+using System.Diagnostics;
 
-using System.Diagnostics;
+using Grpc.Core;
+using Grpc.Core.Interceptors;
 
 namespace FrostFS.SDK.SmokeTests;
 
@@ -21,12 +21,12 @@ public class MetricsInterceptor() : Interceptor
             call.GetTrailers,
             call.Dispose);
     }
-  
+
     private static async Task<TResponse> HandleUnaryResponse<TResponse>(AsyncUnaryCall<TResponse> call)
     {
         var watch = new Stopwatch();
         watch.Start();
-      
+
         var response = await call.ResponseAsync;
 
         watch.Stop();
@@ -34,6 +34,6 @@ public class MetricsInterceptor() : Interceptor
         // Do something with call info
         // var elapsed = watch.ElapsedTicks * 1_000_000/Stopwatch.Frequency;
 
-        return response;    
+        return response;
     }
 }

src/FrostFS.SDK.Tests/Mocks/AsyncStreamReaderMock.cs

@@ -20,7 +20,7 @@ public class AsyncStreamReaderMock(string key, FrostFsObjectHeader objectHeader)
         {
             var header = new Header
             {
-                ContainerId =  objectHeader.ContainerId.ToMessage(),
+                ContainerId = objectHeader.ContainerId.ToMessage(),
                 PayloadLength = objectHeader.PayloadLength,
                 Version = objectHeader.Version!.ToMessage(),
                 OwnerId = objectHeader.OwnerId!.ToMessage()

src/FrostFS.SDK.Tests/Mocks/ClientStreamWriter.cs

@@ -1,6 +1,7 @@
-using Grpc.Core;
 using FrostFS.SDK.ProtosV2.Interfaces;
 
+using Grpc.Core;
+
 namespace FrostFS.SDK.Tests;
 
 public class ClientStreamWriter : IClientStreamWriter<IRequest>
@@ -17,13 +18,13 @@ public class ClientStreamWriter : IClientStreamWriter<IRequest>
     public Task CompleteAsync()
     {
         CompletedTask = true;
-        return Task.CompletedTask;        
+        return Task.CompletedTask;
     }
 
     public Task WriteAsync(IRequest message)
     {
         Object.PutRequest pr = new((Object.PutRequest)message);
-        Messages.Add(pr);        
+        Messages.Add(pr);
         return Task.CompletedTask;
     }
 }

src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/ContainerServiceBase.cs

@@ -1,15 +1,17 @@
 using System.Security.Cryptography;
-using FrostFS.Container;
-using Moq;
 
+using FrostFS.Container;
+using FrostFS.Object;
+using FrostFS.SDK.ClientV2;
+using FrostFS.SDK.ClientV2.Mappers.GRPC;
 using FrostFS.SDK.Cryptography;
 using FrostFS.Session;
+
 using Google.Protobuf;
 
-using FrostFS.SDK.ClientV2;
-using FrostFS.Object;
 using Grpc.Core;
-using FrostFS.SDK.ClientV2.Mappers.GRPC;
+
+using Moq;
 
 namespace FrostFS.SDK.Tests;
 
@@ -18,11 +20,9 @@ public abstract class ServiceBase(string key)
     public string StringKey { get; private set; } = key;
     public ECDsa Key { get; private set; } = key.LoadWif();
     public FrostFsVersion Version { get; set; } = DefaultVersion;
-    public BasicAcl Acl { get; set; } = DefaultAcl;
     public FrostFsPlacementPolicy PlacementPolicy { get; set; } = DefaultPlacementPolicy;
 
     public static FrostFsVersion DefaultVersion { get; } = new(2, 13);
-    public static BasicAcl DefaultAcl { get; } = BasicAcl.PublicRW;
     public static FrostFsPlacementPolicy DefaultPlacementPolicy { get; } = new FrostFsPlacementPolicy(true, new FrostFsReplica(1));
 
     public Metadata Metadata { get; protected set; }
@@ -61,23 +61,23 @@ public abstract class ServiceBase(string key)
     }
 
     public ResponseMetaHeader ResponseMetaHeader => new()
-        {
-            Version = Version.ToMessage(),
-            Epoch = 100,
-            Ttl = 1
-        };
+    {
+        Version = Version.ToMessage(),
+        Epoch = 100,
+        Ttl = 1
+    };
 }
 
-public abstract class ContainerServiceBase(string key) : ServiceBase (key)
+public abstract class ContainerServiceBase(string key) : ServiceBase(key)
 {
     public Guid ContainerGuid { get; set; } = Guid.NewGuid();
-   
+
     public abstract Mock<ContainerService.ContainerServiceClient> GetMock();
 }
 
-public abstract class ObjectServiceBase(string key) : ServiceBase (key)
+public abstract class ObjectServiceBase(string key) : ServiceBase(key)
 {
-    public abstract Mock<ObjectService.ObjectServiceClient> GetMock(); 
-    
+    public abstract Mock<ObjectService.ObjectServiceClient> GetMock();
+
     public Guid ContainerGuid { get; set; } = Guid.NewGuid();
 }

src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/ContainerStub.cs

@@ -1,4 +1,5 @@
 using FrostFS.Container;
+
 using Moq;
 
 namespace FrostFS.SDK.Tests;

src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/GetContainerMock.cs

@@ -1,14 +1,15 @@
 using FrostFS.Container;
-using Google.Protobuf;
-using Grpc.Core;
-using Moq;
-
-using FrostFS.SDK.Cryptography;
-using FrostFS.SDK.ClientV2;
-
-using FrostFS.SDK.ClientV2.Mappers.GRPC;
-using FrostFS.Session;
 using FrostFS.Refs;
+using FrostFS.SDK.ClientV2;
+using FrostFS.SDK.ClientV2.Mappers.GRPC;
+using FrostFS.SDK.Cryptography;
+using FrostFS.Session;
+
+using Google.Protobuf;
+
+using Grpc.Core;
+
+using Moq;
 
 namespace FrostFS.SDK.Tests;
 
@@ -67,8 +68,7 @@ public class ContainerMocker(string key) : ContainerServiceBase(key)
                 {
                     Version = grpcVersion,
                     Nonce = ByteString.CopyFrom(ContainerGuid.ToBytes()),
-                    BasicAcl = (uint)Acl,
-                    PlacementPolicy = PlacementPolicy.ToMessage()
+                    PlacementPolicy = PlacementPolicy.GetPolicy()
                 }
             },
             MetaHeader = ResponseMetaHeader
@@ -78,10 +78,10 @@ public class ContainerMocker(string key) : ContainerServiceBase(key)
 
         var getNoContainerResponse = new GetResponse
         {
-            Body = new (),
+            Body = new(),
             MetaHeader = new ResponseMetaHeader
-            { 
-                Status = new Status.Status 
+            {
+                Status = new Status.Status
                 {
                     Code = 3072,
                     Message = "container not found"
@@ -107,7 +107,7 @@ public class ContainerMocker(string key) : ContainerServiceBase(key)
                             Task.FromResult(ResponseMetaData),
                             () => new Grpc.Core.Status(StatusCode.NotFound, string.Empty),
                             () => ResponseMetaData,
-                            () => { });    
+                            () => { });
                     }
 
                     return new AsyncUnaryCall<GetResponse>(
@@ -115,7 +115,7 @@ public class ContainerMocker(string key) : ContainerServiceBase(key)
                         Task.FromResult(ResponseMetaData),
                         () => new Grpc.Core.Status(StatusCode.OK, string.Empty),
                         () => ResponseMetaData,
-                        () => { });                    
+                        () => { });
                 });
 
         var listResponse = new ListResponse

src/FrostFS.SDK.Tests/Mocks/ContainerServiceMocks/RequestData.cs

@@ -9,4 +9,3 @@ public class RequestData<T>(T request, Metadata m, DateTime? dt, CancellationTok
     public DateTime? Deadline => dt;
     public CancellationToken CancellationToken => ct;
 }
-       

src/FrostFS.SDK.Tests/Mocks/NetworkMocker.cs

@@ -1,8 +1,11 @@
-using Moq;
 using FrostFS.Netmap;
-using Grpc.Core;
+
 using Google.Protobuf;
 
+using Grpc.Core;
+
+using Moq;
+
 namespace FrostFS.SDK.Tests;
 
 public class NetworkMocker(string key) : ServiceBase(key)

src/FrostFS.SDK.Tests/Mocks/ObjectMock.cs

@@ -1,12 +1,16 @@
-using Google.Protobuf;
-using Grpc.Core;
-using Moq;
-using FrostFS.SDK.ClientV2;
-using FrostFS.Object;
-using FrostFS.SDK.ClientV2.Mappers.GRPC;
 using System.Security.Cryptography;
+
+using FrostFS.Object;
+using FrostFS.SDK.ClientV2;
+using FrostFS.SDK.ClientV2.Mappers.GRPC;
 using FrostFS.SDK.Cryptography;
 
+using Google.Protobuf;
+
+using Grpc.Core;
+
+using Moq;
+
 namespace FrostFS.SDK.Tests;
 
 public class ObjectMocker(string key) : ObjectServiceBase(key)
@@ -183,7 +187,7 @@ public class ObjectMocker(string key) : ObjectServiceBase(key)
                         () => { });
                 });
         }
-        
+
         return mock;
     }
 
@@ -195,7 +199,7 @@ public class ObjectMocker(string key) : ObjectServiceBase(key)
 
     public List<byte[]>? ResultObjectIds { get; set; }
 
-    public ClientStreamWriter? ClientStreamWriter { get; private set; } = new ();
+    public ClientStreamWriter? ClientStreamWriter { get; private set; } = new();
 
     public List<PutSingleRequest> PutSingleRequests { get; private set; } = [];
 

src/FrostFS.SDK.Tests/Mocks/SessionMock.cs

@@ -1,6 +1,9 @@
 using FrostFS.Session;
+
 using Google.Protobuf;
+
 using Grpc.Core;
+
 using Moq;
 
 namespace FrostFS.SDK.Tests;

src/FrostFS.SDK.Tests/NetworkTest.cs

@@ -1,3 +1,5 @@
+using System.Security.Cryptography;
+
 using FrostFS.Netmap;
 using FrostFS.SDK.ClientV2;
 using FrostFS.SDK.ClientV2.Interfaces;
@@ -8,8 +10,6 @@ using Google.Protobuf;
 
 using Microsoft.Extensions.Options;
 
-using System.Security.Cryptography;
-
 namespace FrostFS.SDK.Tests;
 
 public abstract class NetworkTestsBase
@@ -40,7 +40,7 @@ public abstract class NetworkTestsBase
 
     protected IFrostFSClient GetClient()
     {
-        return ClientV2.Client.GetTestInstance(
+        return ClientV2.FrostFSClient.GetTestInstance(
             Settings,
             null,
             Mocker.GetMock().Object,
@@ -88,9 +88,9 @@ public class NetworkTest : NetworkTestsBase
         }
 
         var validTimeoutFrom = DateTime.UtcNow.AddSeconds(20);
-        
+
         var result = await GetClient().GetNetworkSettingsAsync(param);
-        
+
         var validTimeoutTo = DateTime.UtcNow.AddSeconds(20);
 
         Assert.NotNull(result);
@@ -105,7 +105,7 @@ public class NetworkTest : NetworkTestsBase
         Assert.Equal(Mocker.Parameters["MaxECParityCount"], [(byte)result.MaxECParityCount]);
         Assert.Equal(Mocker.Parameters["MaxObjectSize"], [(byte)result.MaxObjectSize]);
         Assert.Equal(Mocker.Parameters["WithdrawFee"], [(byte)result.WithdrawFee]);
-       
+
         Assert.True(result.HomomorphicHashingDisabled);
         Assert.True(result.MaintenanceModeAllowed);
 
@@ -142,13 +142,13 @@ public class NetworkTest : NetworkTestsBase
 
         nodeInfo1.Addresses.Add("address1");
         nodeInfo1.Addresses.Add("address2");
-        nodeInfo1.Attributes.Add(new NodeInfo.Types.Attribute { Key = "key1", Value = "value1"});
+        nodeInfo1.Attributes.Add(new NodeInfo.Types.Attribute { Key = "key1", Value = "value1" });
         nodeInfo1.Attributes.Add(new NodeInfo.Types.Attribute { Key = "key2", Value = "value2" });
 
         var nodeInfo2 = new NodeInfo
         {
             State = NodeInfo.Types.State.Offline,
-            PublicKey = ByteString.CopyFrom([3,4,5])
+            PublicKey = ByteString.CopyFrom([3, 4, 5])
         };
 
         nodeInfo2.Addresses.Add("address3");
@@ -190,7 +190,7 @@ public class NetworkTest : NetworkTestsBase
         Assert.Equal(2, node1.Addresses.Count);
         Assert.Equal("address1", node1.Addresses.ElementAt(0));
         Assert.Equal("address2", node1.Addresses.ElementAt(1));
-        
+
         Assert.Equal(2, node1.Attributes.Count);
 
         Assert.Equal("key1", node1.Attributes.ElementAt(0).Key);
@@ -202,7 +202,7 @@ public class NetworkTest : NetworkTestsBase
         Assert.Equal(NodeState.Offline, node2.State);
         Assert.Single(node2.Addresses);
         Assert.Equal("address3", node2.Addresses.ElementAt(0));
-        
+
         Assert.Single(node2.Attributes);
 
         Assert.Equal("key3", node2.Attributes.ElementAt(0).Key);
@@ -241,10 +241,10 @@ public class NetworkTest : NetworkTestsBase
             },
             Version = new Refs.Version { Major = 2, Minor = 12 }
         };
-                
+
         body.NodeInfo.Addresses.Add("address1");
         body.NodeInfo.Addresses.Add("address2");
-        body.NodeInfo.Attributes.Add(new NodeInfo.Types.Attribute { Key = "key1", Value = "value1"});
+        body.NodeInfo.Attributes.Add(new NodeInfo.Types.Attribute { Key = "key1", Value = "value1" });
         body.NodeInfo.Attributes.Add(new NodeInfo.Types.Attribute { Key = "key2", Value = "value2" });
 
         Mocker.NodeInfoResponse = new LocalNodeInfoResponse { Body = body };
@@ -273,11 +273,11 @@ public class NetworkTest : NetworkTestsBase
         Assert.NotNull(result);
 
         Assert.Equal(NodeState.Online, result.State);
-        
+
         Assert.Equal(2, result.Addresses.Count);
         Assert.Equal("address1", result.Addresses.ElementAt(0));
         Assert.Equal("address2", result.Addresses.ElementAt(1));
-        
+
         Assert.Equal(2, result.Attributes.Count);
         Assert.Equal("value1", result.Attributes["key1"]);
         Assert.Equal("value2", result.Attributes["key2"]);

src/FrostFS.SDK.Tests/ObjectTest.cs

@@ -1,3 +1,6 @@
+using System.Security.Cryptography;
+using System.Text;
+
 using FrostFS.Refs;
 using FrostFS.SDK.ClientV2;
 using FrostFS.SDK.ClientV2.Interfaces;
@@ -9,9 +12,6 @@ using Google.Protobuf;
 
 using Microsoft.Extensions.Options;
 
-using System.Security.Cryptography;
-using System.Text;
-
 namespace FrostFS.SDK.Tests;
 
 public abstract class ObjectTestsBase
@@ -29,7 +29,7 @@ public abstract class ObjectTestsBase
     protected ObjectTestsBase()
     {
         var ecdsaKey = key.LoadWif();
-        
+
         Settings = Options.Create(new SingleOwnerClientSettings
         {
             Key = key,
@@ -46,17 +46,17 @@ public abstract class ObjectTestsBase
         ContainerId = new FrostFsContainerId(Base58.Encode(Mocker.ContainerGuid.ToBytes()));
 
         Mocker.ObjectHeader = new(
-            ContainerId, 
-            FrostFsObjectType.Regular, 
-            [new FrostFsAttribute("k", "v")],
+            ContainerId,
+            FrostFsObjectType.Regular,
+            [new FrostFsAttributePair("k", "v")],
             null,
             FrostFsOwner.FromKey(ecdsaKey),
             new FrostFsVersion(2, 13));
     }
 
     protected IFrostFSClient GetClient()
-    {   
-        return Client.GetTestInstance(
+    {
+        return FrostFSClient.GetTestInstance(
             Settings,
             null,
             NetworkMocker.GetMock().Object,
@@ -75,30 +75,32 @@ public class ObjectTest : ObjectTestsBase
 
         var ecdsaKey = key.LoadWif();
 
-        var ctx = new Context {
-                Key = ecdsaKey, 
-                OwnerId = FrostFsOwner.FromKey(ecdsaKey), 
-                Version = new FrostFsVersion(2, 13) };
+        var ctx = new Context
+        {
+            Key = ecdsaKey,
+            OwnerId = FrostFsOwner.FromKey(ecdsaKey),
+            Version = new FrostFsVersion(2, 13)
+        };
 
         var objectId = client.CalculateObjectId(Mocker.ObjectHeader!, ctx);
-               
+
         var result = await client.GetObjectAsync(new PrmObjectGet(ContainerId, objectId) { Context = ctx });
 
         Assert.NotNull(result);
 
-        Assert.Equal(Mocker.ObjectHeader!.ContainerId.Value, result.Header.ContainerId.Value);
+        Assert.Equal(Mocker.ObjectHeader!.ContainerId.GetValue(), result.Header.ContainerId.GetValue());
         Assert.Equal(Mocker.ObjectHeader!.OwnerId!.Value, result.Header.OwnerId!.Value);
         Assert.Equal(Mocker.ObjectHeader.PayloadLength, result.Header.PayloadLength);
         Assert.Single(result.Header.Attributes);
         Assert.Equal(Mocker.ObjectHeader.Attributes[0].Key, result.Header.Attributes[0].Key);
-        Assert.Equal(Mocker.ObjectHeader.Attributes[0].Value,result.Header.Attributes[0].Value);
+        Assert.Equal(Mocker.ObjectHeader.Attributes[0].Value, result.Header.Attributes[0].Value);
     }
 
     [Fact]
     public async void PutObjectTest()
     {
         Mocker.ResultObjectIds = new([SHA256.HashData([])]);
-       
+
         Random rnd = new();
         var bytes = new byte[1024];
         rnd.NextBytes(bytes);
@@ -119,20 +121,20 @@ public class ObjectTest : ObjectTestsBase
 
         Assert.NotNull(result);
         Assert.Equal(Mocker.ResultObjectIds.First(), result.ToHash());
-       
+
         Assert.True(Mocker.ClientStreamWriter.CompletedTask);
 
         Assert.Equal(0, body1!.Chunk.Length);
         Assert.Equal(Object.PutRequest.Types.Body.ObjectPartOneofCase.Init, body1!.ObjectPartCase);
 
         Assert.Equal(1024, body2!.Chunk.Length);
-        Assert.Equal(Object.PutRequest.Types.Body.ObjectPartOneofCase.Chunk, body2!.ObjectPartCase);       
+        Assert.Equal(Object.PutRequest.Types.Body.ObjectPartOneofCase.Chunk, body2!.ObjectPartCase);
     }
 
     [Fact]
     public async void ClientCutTest()
     {
-        NetworkMocker.Parameters = new Dictionary<string, byte[]>() { { "MaxObjectSize", [0x0, 0xa] } }; 
+        NetworkMocker.Parameters = new Dictionary<string, byte[]>() { { "MaxObjectSize", [0x0, 0xa] } };
 
         var blockSize = 2560;
         byte[] bytes = File.ReadAllBytes(@".\..\..\..\TestData\cat.jpg");
@@ -251,11 +253,11 @@ public class ObjectTest : ObjectTestsBase
         Assert.Equal(Mocker.ObjectId.ToMessage(), request.Body.Address.ObjectId);
 
         Assert.NotNull(response);
-        Assert.Equal(ContainerId.Value, response.ContainerId.Value);
+        Assert.Equal(ContainerId.GetValue(), response.ContainerId.GetValue());
 
         Assert.Equal(Mocker.ObjectHeader!.OwnerId!.Value, response.OwnerId!.Value);
         Assert.Equal(Mocker.ObjectHeader!.Version!.ToString(), response.Version!.ToString());
-     
+
         Assert.Equal(Mocker.HeadResponse!.PayloadLength, response.PayloadLength);
 
         Assert.Equal(FrostFsObjectType.Regular, response.ObjectType);

src/FrostFS.SDK.Tests/SessionTests.cs

@@ -1,3 +1,5 @@
+using System.Security.Cryptography;
+
 using FrostFS.SDK.ClientV2;
 using FrostFS.SDK.ClientV2.Interfaces;
 using FrostFS.SDK.ClientV2.Mappers.GRPC;
@@ -6,8 +8,6 @@ using FrostFS.SDK.Cryptography;
 
 using Microsoft.Extensions.Options;
 
-using System.Security.Cryptography;
-
 namespace FrostFS.SDK.Tests;
 
 public abstract class SessionTestsBase
@@ -16,7 +16,7 @@ public abstract class SessionTestsBase
 
     protected IOptions<SingleOwnerClientSettings> Settings { get; set; }
 
- 
+
     protected ECDsa ECDsaKey { get; set; }
     protected FrostFsOwner OwnerId { get; set; }
     protected SessionMocker Mocker { get; set; }
@@ -41,7 +41,7 @@ public abstract class SessionTestsBase
 
     protected IFrostFSClient GetClient()
     {
-        return ClientV2.Client.GetTestInstance(
+        return ClientV2.FrostFSClient.GetTestInstance(
             Settings,
             null,
             new NetworkMocker(this.key).GetMock().Object,
@@ -100,8 +100,8 @@ public class SessionTest : SessionTestsBase
         Assert.Equal(exp, Mocker.CreateSessionRequest.Body.Expiration);
         Assert.NotNull(Mocker.CreateSessionRequest.MetaHeader);
         Assert.Equal(Mocker.Version.ToMessage(), Mocker.CreateSessionRequest.MetaHeader.Version);
-       
-   
+
+
         Assert.Null(Mocker.Metadata);
 
         if (useContext)

src/FrostFS.SDK.Tests/SmokeTests.cs

@@ -11,16 +11,16 @@ namespace FrostFS.SDK.SmokeTests;
 
 public class SmokeTests : SmokeTestsBase
 {
-    private static readonly PrmWait lightWait = new (100, 1);
+    private static readonly PrmWait lightWait = new(100, 1);
 
     [Theory]
     [InlineData(false)]
     [InlineData(true)]
     public async void NetworkMapTest(bool isSingleOnwerClient)
     {
-        using var client = isSingleOnwerClient ? Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url)) : Client.GetInstance(GetOptions(this.url));
-        
-        PrmNetmapSnapshot? prm = isSingleOnwerClient ? default : new () { Context = Ctx };
+        using var client = isSingleOnwerClient ? FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url)) : FrostFSClient.GetInstance(GetOptions(this.url));
+
+        PrmNetmapSnapshot? prm = isSingleOnwerClient ? default : new() { Context = Ctx };
         var result = await client.GetNetmapSnapshotAsync(prm);
 
         Assert.True(result.Epoch > 0);
@@ -41,7 +41,7 @@ public class SmokeTests : SmokeTestsBase
     [InlineData(true)]
     public async void NodeInfoTest(bool isSingleOnwerClient)
     {
-        using var client = isSingleOnwerClient ? Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url)) : Client.GetInstance(GetOptions(this.url));
+        using var client = isSingleOnwerClient ? FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url)) : FrostFSClient.GetInstance(GetOptions(this.url));
 
         PrmNodeInfo? prm = isSingleOnwerClient ? default : new() { Context = Ctx };
 
@@ -63,9 +63,9 @@ public class SmokeTests : SmokeTestsBase
             Callback = (cs) => Console.WriteLine($"{cs.MethodName} took {cs.ElapsedMicroSeconds} microseconds")
         };
 
-        using var client = Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
+        using var client = FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
 
-        var result = await client.GetNodeInfoAsync();       
+        var result = await client.GetNodeInfoAsync();
     }
 
     [Theory]
@@ -73,7 +73,7 @@ public class SmokeTests : SmokeTestsBase
     [InlineData(true)]
     public async void GetSessionTest(bool isSingleOnwerClient)
     {
-        using var client = isSingleOnwerClient ? Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url)) : Client.GetInstance(GetOptions(this.url));
+        using var client = isSingleOnwerClient ? FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url)) : FrostFSClient.GetInstance(GetOptions(this.url));
 
         PrmSessionCreate? prm = isSingleOnwerClient ? new PrmSessionCreate(100) : new PrmSessionCreate(100) { Context = Ctx };
 
@@ -82,7 +82,7 @@ public class SmokeTests : SmokeTestsBase
         var session = new Session.SessionToken().Deserialize(token.Token);
 
         var ownerHash = Base58.Decode(OwnerId.Value);
-       
+
         Assert.NotNull(session);
         Assert.Null(session.Body.Container);
         Assert.Null(session.Body.Object);
@@ -96,14 +96,14 @@ public class SmokeTests : SmokeTestsBase
     [Fact]
     public async void CreateObjectWithSessionToken()
     {
-        using var client = Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
-       
+        using var client = FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
+
         await Cleanup(client);
 
         var token = await client.CreateSessionAsync(new PrmSessionCreate(int.MaxValue));
 
         var createContainerParam = new PrmContainerCreate(
-            new FrostFsContainerInfo(BasicAcl.PublicRW, new FrostFsPlacementPolicy(true, new FrostFsReplica(1))));
+            new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, new FrostFsReplica(1))));
 
         createContainerParam.XHeaders.Add("key1", "value1");
 
@@ -116,39 +116,44 @@ public class SmokeTests : SmokeTestsBase
             Header = new FrostFsObjectHeader(
                 containerId: containerId,
                 type: FrostFsObjectType.Regular,
-                [new FrostFsAttribute("fileName", "test")]),
+                [new FrostFsAttributePair("fileName", "test")]),
             Payload = new MemoryStream(bytes),
             ClientCut = false,
-            SessionToken = token        
+            SessionToken = token
         };
- 
-        var objectId = await client.PutObjectAsync(param);
 
-        var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId));
+        var objectId = await client.PutObjectAsync(param).ConfigureAwait(true);
+
+        var @object = await client.GetObjectAsync(new PrmObjectGet(containerId, objectId))
+            .ConfigureAwait(true);
 
         var downloadedBytes = new byte[@object.Header.PayloadLength];
         MemoryStream ms = new(downloadedBytes);
 
         ReadOnlyMemory<byte>? chunk = null;
-        while ((chunk = await @object.ObjectReader!.ReadChunk()) != null)
+        while ((chunk = await @object.ObjectReader!.ReadChunk().ConfigureAwait(true)) != null)
         {
             ms.Write(chunk.Value.Span);
         }
 
-        Assert.Equal(MD5.HashData(bytes), MD5.HashData(downloadedBytes));
+        Assert.Equal(SHA256.HashData(bytes), SHA256.HashData(downloadedBytes));
 
-        await Cleanup(client);
+        await Cleanup(client).ConfigureAwait(true);
     }
 
     [Fact]
     public async void FilterTest()
     {
-        using var client = Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
+        using var client = FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
+
+        //var prm = new PrmApeChainList(new FrostFsChainTarget(FrostFsTargetType.Namespace, "root"));
+
+        //var chains = await client.ListChainAsync(prm);
 
         await Cleanup(client);
 
         var createContainerParam = new PrmContainerCreate(
-           new FrostFsContainerInfo(BasicAcl.PublicRW, new FrostFsPlacementPolicy(true, new FrostFsReplica(1))))
+           new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, new FrostFsReplica(1))))
         {
             WaitParams = lightWait
         };
@@ -169,7 +174,7 @@ public class SmokeTests : SmokeTestsBase
             Header = new FrostFsObjectHeader(
                 containerId: containerId,
                 type: FrostFsObjectType.Regular,
-                [new FrostFsAttribute("fileName", "test")],
+                [new FrostFsAttributePair("fileName", "test")],
                 new FrostFsSplit()),
             Payload = new MemoryStream(bytes),
             ClientCut = false
@@ -189,7 +194,7 @@ public class SmokeTests : SmokeTestsBase
 
         await CheckFilter(client, containerId, new FilterBySplitId(FrostFsMatchType.Equals, param.Header.Split.SplitId));
 
-        await CheckFilter(client, containerId, new FilterByAttribute(FrostFsMatchType.Equals, "fileName", "test"));
+        await CheckFilter(client, containerId, new FilterByAttributePair(FrostFsMatchType.Equals, "fileName", "test"));
 
         await CheckFilter(client, containerId, new FilterByObjectId(FrostFsMatchType.Equals, objectId));
 
@@ -227,14 +232,14 @@ public class SmokeTests : SmokeTestsBase
     [InlineData(6 * 1024 * 1024 + 100)]
     public async void SimpleScenarioTest(int objectSize)
     {
-        using var client = Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
-       
+        using var client = FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
+
         await Cleanup(client);
 
         bool callbackInvoked = false;
         var ctx = new Context
         {
-           // Timeout = TimeSpan.FromSeconds(20),
+            // Timeout = TimeSpan.FromSeconds(20),
             Callback = new((CallStatistics cs) =>
             {
                 callbackInvoked = true;
@@ -243,7 +248,7 @@ public class SmokeTests : SmokeTestsBase
         };
 
         var createContainerParam = new PrmContainerCreate(
-            new FrostFsContainerInfo(BasicAcl.PublicRW, new FrostFsPlacementPolicy(true, new FrostFsReplica(1)),[new ("testKey", "testValue")]))
+            new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, new FrostFsReplica(1)), [new("testKey", "testValue")]))
         {
             Context = ctx
         };
@@ -261,7 +266,7 @@ public class SmokeTests : SmokeTestsBase
             Header = new FrostFsObjectHeader(
                 containerId: createdContainer,
                 type: FrostFsObjectType.Regular,
-                [new FrostFsAttribute("fileName", "test")]),
+                [new FrostFsAttributePair("fileName", "test")]),
             Payload = new MemoryStream(bytes),
             ClientCut = false,
             Context = new Context
@@ -272,7 +277,7 @@ public class SmokeTests : SmokeTestsBase
 
         var objectId = await client.PutObjectAsync(param);
 
-        var filter = new FilterByAttribute(FrostFsMatchType.Equals, "fileName", "test");
+        var filter = new FilterByAttributePair(FrostFsMatchType.Equals, "fileName", "test");
 
         bool hasObject = false;
         await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(createdContainer) { Filters = [filter] }))
@@ -315,7 +320,7 @@ public class SmokeTests : SmokeTestsBase
     [InlineData(6 * 1024 * 1024 + 100)]
     public async void SimpleScenarioWithSessionTest(int objectSize)
     {
-        using var client = Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
+        using var client = FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
 
         var token = await client.CreateSessionAsync(new PrmSessionCreate(int.MaxValue));
 
@@ -328,7 +333,7 @@ public class SmokeTests : SmokeTestsBase
         };
 
         var createContainerParam = new PrmContainerCreate(
-            new FrostFsContainerInfo(BasicAcl.PublicRW, new FrostFsPlacementPolicy(true, new FrostFsReplica(1))))
+            new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, new FrostFsReplica(1))))
         {
             Context = ctx
         };
@@ -345,7 +350,7 @@ public class SmokeTests : SmokeTestsBase
             Header = new FrostFsObjectHeader(
                 containerId: container,
                 type: FrostFsObjectType.Regular,
-                [new FrostFsAttribute("fileName", "test")]),
+                [new FrostFsAttributePair("fileName", "test")]),
             Payload = new MemoryStream(bytes),
             ClientCut = false,
             Context = new Context
@@ -357,7 +362,7 @@ public class SmokeTests : SmokeTestsBase
 
         var objectId = await client.PutObjectAsync(param);
 
-        var filter = new FilterByAttribute(FrostFsMatchType.Equals, "fileName", "test");
+        var filter = new FilterByAttributePair(FrostFsMatchType.Equals, "fileName", "test");
 
         bool hasObject = false;
         await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(container) { Filters = [filter], SessionToken = token }))
@@ -402,12 +407,12 @@ public class SmokeTests : SmokeTestsBase
     [InlineData(2 * 64 * 1024 * 1024 + 256)]
     [InlineData(200)]
     public async void ClientCutScenarioTest(int objectSize)
-    {        
-        using var client = Client.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
+    {
+        using var client = FrostFSClient.GetSingleOwnerInstance(GetSingleOwnerOptions(this.key, this.url));
 
         await Cleanup(client);
 
-        var createContainerParam = new PrmContainerCreate(new FrostFsContainerInfo(BasicAcl.PublicRW, new FrostFsPlacementPolicy(true, new FrostFsReplica(1))))
+        var createContainerParam = new PrmContainerCreate(new FrostFsContainerInfo(new FrostFsPlacementPolicy(true, new FrostFsReplica(1))))
         {
             WaitParams = lightWait
         };
@@ -431,14 +436,14 @@ public class SmokeTests : SmokeTestsBase
             Header = new FrostFsObjectHeader(
                 containerId: containerId,
                 type: FrostFsObjectType.Regular,
-                [new FrostFsAttribute("fileName", "test")]),
+                [new FrostFsAttributePair("fileName", "test")]),
             Payload = new MemoryStream(bytes),
             ClientCut = true
         };
 
         var objectId = await client.PutObjectAsync(param);
 
-        var filter = new FilterByAttribute(FrostFsMatchType.Equals, "fileName", "test");
+        var filter = new FilterByAttributePair(FrostFsMatchType.Equals, "fileName", "test");
 
         bool hasObject = false;
         await foreach (var objId in client.SearchObjectsAsync(new PrmObjectSearch(containerId, filter)))
@@ -476,16 +481,16 @@ public class SmokeTests : SmokeTestsBase
         IAsyncEnumerator<FrostFsContainerId>? enumerator = null;
         do
         {
-           if (deadline <= DateTime.UtcNow)
-           { 
-               Assert.Fail("Containers exist");
-               break;
-           }
+            if (deadline <= DateTime.UtcNow)
+            {
+                Assert.Fail("Containers exist");
+                break;
+            }
 
-           enumerator = client.ListContainersAsync().GetAsyncEnumerator();
-           await Task.Delay(500);        
+            enumerator = client.ListContainersAsync().GetAsyncEnumerator();
+            await Task.Delay(500);
         }
-        while (await enumerator!.MoveNextAsync());           
+        while (await enumerator!.MoveNextAsync());
     }
 
     private static byte[] GetRandomBytes(int size)

src/FrostFS.SDK.Tests/SmokeTestsBase.cs

@@ -8,6 +8,7 @@ namespace FrostFS.SDK.SmokeTests;
 public abstract class SmokeTestsBase
 {
     protected readonly string key = "KzPXA6669m2pf18XmUdoR8MnP1pi1PMmefiFujStVFnv7WR5SRmK";
+    
     protected readonly string url = "http://172.23.32.4:8080";
 
     protected ECDsa Key { get; }