[#1] Remove unnecessary layer

Signed-off-by: Ivan Pchelintsev <i.pchelintsev@yadro.com>
This commit is contained in:
Ivan Pchelintsev 2024-05-16 18:23:40 +03:00
parent b307c2c899
commit 6f24f567c1
11 changed files with 103 additions and 158 deletions

View file

@ -1,26 +1,28 @@
using FrostFS.Container;
using FrostFS.Refs;
using FrostFS.SDK.ClientV2.Mappers.GRPC;
using FrostFS.SDK.ModelsV2;
namespace FrostFS.SDK.ClientV2;
public partial class Client
{
public async Task<GetResponse> GetContainerAsync(ContainerID cid)
public async Task<ModelsV2.Container> GetContainerAsync(ContainerId cid)
{
var request = new GetRequest
{
Body = new GetRequest.Types.Body
{
ContainerId = cid
ContainerId = cid.ToGrpcMessage()
},
};
request.AddMetaHeader();
request.Sign(_key);
return await _containerServiceClient.GetAsync(request);
var response = await _containerServiceClient.GetAsync(request);
return response.Body.Container.ToModel();
}
public async Task<ListResponse> ListContainersAsync()
public async Task<ContainerId[]> ListContainersAsync()
{
var request = new ListRequest
{
@ -31,38 +33,43 @@ public partial class Client
};
request.AddMetaHeader();
request.Sign(_key);
return await _containerServiceClient.ListAsync(request);
var response = await _containerServiceClient.ListAsync(request);
return response.Body.ContainerIds.Select(
cid => ContainerId.FromHash(cid.Value.ToByteArray())
).ToArray();
}
public async Task<PutResponse> CreateContainerAsync(Container.Container container)
public async Task<ContainerId> CreateContainerAsync(ModelsV2.Container container)
{
container.OwnerId = _owner.ToGrpcMessage();
container.Version = Version.ToGrpcMessage();
var cntnr = container.ToGrpcMessage();
cntnr.OwnerId = _owner.ToGrpcMessage();
cntnr.Version = Version.ToGrpcMessage();
var request = new PutRequest
{
Body = new PutRequest.Types.Body
{
Container = container,
Signature = _key.SignRFC6979(container),
Container = cntnr,
Signature = _key.SignRFC6979(cntnr),
}
};
request.AddMetaHeader();
request.Sign(_key);
return await _containerServiceClient.PutAsync(request);
var response = await _containerServiceClient.PutAsync(request);
return ContainerId.FromHash(response.Body.ContainerId.Value.ToByteArray());
}
public async Task<DeleteResponse> DeleteContainerAsync(ContainerID cid)
public async Task DeleteContainerAsync(ContainerId cid)
{
var request = new DeleteRequest
{
Body = new DeleteRequest.Types.Body
{
ContainerId = cid,
Signature = _key.SignRFC6979(cid.Value)
ContainerId = cid.ToGrpcMessage(),
Signature = _key.SignRFC6979(cid.ToGrpcMessage().Value)
}
};
request.AddMetaHeader();
request.Sign(_key);
return await _containerServiceClient.DeleteAsync(request);
await _containerServiceClient.DeleteAsync(request);
}
}