From 13a80df882d9f0626ab28451e9a3ea108fd27658 Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Tue, 18 Aug 2020 14:26:53 +0300 Subject: [PATCH] Use common signature type Signed-off-by: Stanislav Bogatyrev --- container/service.proto | 14 +++++--------- object/service.proto | 5 +---- proto-docs/container.md | 9 ++++----- proto-docs/object.md | 1 - 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/container/service.proto b/container/service.proto index c498477..95c1668 100644 --- a/container/service.proto +++ b/container/service.proto @@ -49,12 +49,8 @@ message PutRequest { // Container to create in NeoFS. 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. - bytes signature = 3; + //Signature of stable-marshalled container according to RFC-6979. + neo.fs.v2.service.Signature signature =2; } // Body of container put request message. Body body = 1; @@ -98,7 +94,7 @@ message DeleteRequest { neo.fs.v2.refs.ContainerID container_id = 1; // 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 body = 1; @@ -220,7 +216,7 @@ message SetExtendedACLRequest { neo.fs.v2.acl.EACLTable eacl = 1; // 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 body = 1; @@ -282,7 +278,7 @@ message GetExtendedACLResponse { neo.fs.v2.acl.EACLTable eacl = 1; // 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 body = 1; diff --git a/object/service.proto b/object/service.proto index aad7466..1fd03a0 100644 --- a/object/service.proto +++ b/object/service.proto @@ -180,10 +180,7 @@ message DeleteRequest { message Body { // Carries the address of the object to be deleted. 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 body = 1; diff --git a/proto-docs/container.md b/proto-docs/container.md index 7d4f684..a757ed5 100644 --- a/proto-docs/container.md +++ b/proto-docs/container.md @@ -146,7 +146,7 @@ Request body | 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. | -| 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. | @@ -216,7 +216,7 @@ Response body | 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. | -| 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. | @@ -337,8 +337,7 @@ Request body | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | 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 | [bytes](#bytes) | | Signature of stable-marshalled container according to RFC-6979. | +| signature | [neo.fs.v2.service.Signature](#neo.fs.v2.service.Signature) | | Signature of stable-marshalled container according to RFC-6979. | @@ -387,7 +386,7 @@ Request body | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | 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. | diff --git a/proto-docs/object.md b/proto-docs/object.md index 365c10b..93e7f88 100644 --- a/proto-docs/object.md +++ b/proto-docs/object.md @@ -172,7 +172,6 @@ Request body | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | 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. |