Use common signature type

Signed-off-by: Stanislav Bogatyrev <stanislav@nspcc.ru>
This commit is contained in:
Stanislav Bogatyrev 2020-08-18 14:26:53 +03:00 committed by Alex Vanin
parent a78b8a1ea5
commit 13a80df882
4 changed files with 10 additions and 19 deletions

View file

@ -49,12 +49,8 @@ message PutRequest {
// Container to create in NeoFS. // Container to create in NeoFS.
container.Container container = 1; container.Container container = 1;
// Public Key of container owner. It can be public key of the owner
// or it can be public key that bound in neofs.id smart-contract.
bytes public_key = 2;
//Signature of stable-marshalled container according to RFC-6979. //Signature of stable-marshalled container according to RFC-6979.
bytes signature = 3; neo.fs.v2.service.Signature signature =2;
} }
// Body of container put request message. // Body of container put request message.
Body body = 1; Body body = 1;
@ -98,7 +94,7 @@ message DeleteRequest {
neo.fs.v2.refs.ContainerID container_id = 1; neo.fs.v2.refs.ContainerID container_id = 1;
// Signature of container id according to RFC-6979. // Signature of container id according to RFC-6979.
bytes signature = 2; neo.fs.v2.service.Signature signature = 2;
} }
// Body of container delete request message. // Body of container delete request message.
Body body = 1; Body body = 1;
@ -220,7 +216,7 @@ message SetExtendedACLRequest {
neo.fs.v2.acl.EACLTable eacl = 1; neo.fs.v2.acl.EACLTable eacl = 1;
// Signature of stable-marshalled Extended ACL according to RFC-6979. // Signature of stable-marshalled Extended ACL according to RFC-6979.
bytes signature = 2; neo.fs.v2.service.Signature signature = 2;
} }
// Body of set extended acl request message. // Body of set extended acl request message.
Body body = 1; Body body = 1;
@ -282,7 +278,7 @@ message GetExtendedACLResponse {
neo.fs.v2.acl.EACLTable eacl = 1; neo.fs.v2.acl.EACLTable eacl = 1;
// Signature of stable-marshalled Extended ACL according to RFC-6979. // Signature of stable-marshalled Extended ACL according to RFC-6979.
bytes signature = 2; neo.fs.v2.service.Signature signature = 2;
} }
// Body of get extended acl response message. // Body of get extended acl response message.
Body body = 1; Body body = 1;

View file

@ -180,9 +180,6 @@ message DeleteRequest {
message Body { message Body {
// Carries the address of the object to be deleted. // Carries the address of the object to be deleted.
neo.fs.v2.refs.Address address = 1; neo.fs.v2.refs.Address address = 1;
// Carries identifier the object owner.
neo.fs.v2.refs.OwnerID owner_id = 2;
} }
// Body of delete object request message. // Body of delete object request message.
Body body = 1; Body body = 1;

View file

@ -146,7 +146,7 @@ Request body
| Field | Type | Label | Description | | Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- | | ----- | ---- | ----- | ----------- |
| container_id | [neo.fs.v2.refs.ContainerID](#neo.fs.v2.refs.ContainerID) | | container_id carries identifier of the container to delete from NeoFS. | | container_id | [neo.fs.v2.refs.ContainerID](#neo.fs.v2.refs.ContainerID) | | container_id carries identifier of the container to delete from NeoFS. |
| signature | [bytes](#bytes) | | Signature of container id according to RFC-6979. | | signature | [neo.fs.v2.service.Signature](#neo.fs.v2.service.Signature) | | Signature of container id according to RFC-6979. |
<a name="neo.fs.v2.container.DeleteResponse"></a> <a name="neo.fs.v2.container.DeleteResponse"></a>
@ -216,7 +216,7 @@ Response body
| Field | Type | Label | Description | | Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- | | ----- | ---- | ----- | ----------- |
| eacl | [neo.fs.v2.acl.EACLTable](#neo.fs.v2.acl.EACLTable) | | Extended ACL that has been requested if it was set up. | | eacl | [neo.fs.v2.acl.EACLTable](#neo.fs.v2.acl.EACLTable) | | Extended ACL that has been requested if it was set up. |
| signature | [bytes](#bytes) | | Signature of stable-marshalled Extended ACL according to RFC-6979. | | signature | [neo.fs.v2.service.Signature](#neo.fs.v2.service.Signature) | | Signature of stable-marshalled Extended ACL according to RFC-6979. |
<a name="neo.fs.v2.container.GetRequest"></a> <a name="neo.fs.v2.container.GetRequest"></a>
@ -337,8 +337,7 @@ Request body
| Field | Type | Label | Description | | Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- | | ----- | ---- | ----- | ----------- |
| container | [Container](#neo.fs.v2.container.Container) | | Container to create in NeoFS. | | container | [Container](#neo.fs.v2.container.Container) | | Container to create in NeoFS. |
| public_key | [bytes](#bytes) | | Public Key of container owner. It can be public key of the owner or it can be public key that bound in neofs.id smart-contract. | | signature | [neo.fs.v2.service.Signature](#neo.fs.v2.service.Signature) | | Signature of stable-marshalled container according to RFC-6979. |
| signature | [bytes](#bytes) | | Signature of stable-marshalled container according to RFC-6979. |
<a name="neo.fs.v2.container.PutResponse"></a> <a name="neo.fs.v2.container.PutResponse"></a>
@ -387,7 +386,7 @@ Request body
| Field | Type | Label | Description | | Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- | | ----- | ---- | ----- | ----------- |
| eacl | [neo.fs.v2.acl.EACLTable](#neo.fs.v2.acl.EACLTable) | | Extended ACL to set for the container. | | eacl | [neo.fs.v2.acl.EACLTable](#neo.fs.v2.acl.EACLTable) | | Extended ACL to set for the container. |
| signature | [bytes](#bytes) | | Signature of stable-marshalled Extended ACL according to RFC-6979. | | signature | [neo.fs.v2.service.Signature](#neo.fs.v2.service.Signature) | | Signature of stable-marshalled Extended ACL according to RFC-6979. |
<a name="neo.fs.v2.container.SetExtendedACLResponse"></a> <a name="neo.fs.v2.container.SetExtendedACLResponse"></a>

View file

@ -172,7 +172,6 @@ Request body
| Field | Type | Label | Description | | Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- | | ----- | ---- | ----- | ----------- |
| address | [neo.fs.v2.refs.Address](#neo.fs.v2.refs.Address) | | Carries the address of the object to be deleted. | | address | [neo.fs.v2.refs.Address](#neo.fs.v2.refs.Address) | | Carries the address of the object to be deleted. |
| owner_id | [neo.fs.v2.refs.OwnerID](#neo.fs.v2.refs.OwnerID) | | Carries identifier the object owner. |
<a name="neo.fs.v2.object.DeleteResponse"></a> <a name="neo.fs.v2.object.DeleteResponse"></a>