prepare to rename neofs-proto to neofs-api

This commit is contained in:
Evgeniy Kulikov 2020-01-30 16:32:50 +03:00
parent b42537f8d8
commit 53af48372f
No known key found for this signature in database
GPG key ID: BF6AEE0A2A699BF2
70 changed files with 565 additions and 563 deletions

View file

@ -1,7 +1,7 @@
package service
import (
"github.com/nspcc-dev/neofs-proto/internal"
"github.com/nspcc-dev/neofs-api/internal"
"github.com/pkg/errors"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@ -94,7 +94,7 @@ func IRNonForwarding(role NodeRole) TTLCondition {
// ProcessRequestTTL validates and update ttl requests.
func ProcessRequestTTL(req MetaHeader, cond ...TTLCondition) error {
var ttl = req.GetTTL()
ttl := req.GetTTL()
if ttl == ZeroTTL {
return status.New(codes.InvalidArgument, ErrZeroTTL.Error()).Err()

View file

@ -95,7 +95,7 @@ func init() {
func init() { proto.RegisterFile("service/meta.proto", fileDescriptor_a638867e7b43457c) }
var fileDescriptor_a638867e7b43457c = []byte{
// 202 bytes of a gzipped FileDescriptorProto
// 204 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x4e, 0x2d, 0x2a,
0xcb, 0x4c, 0x4e, 0xd5, 0xcf, 0x4d, 0x2d, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62,
0x87, 0x8a, 0x49, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7,
@ -104,11 +104,11 @@ var fileDescriptor_a638867e7b43457c = []byte{
0x48, 0x4d, 0x4c, 0x49, 0x2d, 0x12, 0x12, 0xe0, 0x62, 0x0e, 0x09, 0xf1, 0x91, 0x60, 0x54, 0x60,
0xd4, 0xe0, 0x0d, 0x02, 0x31, 0x85, 0x44, 0xb8, 0x58, 0x5d, 0x0b, 0xf2, 0x93, 0x33, 0x24, 0x98,
0x14, 0x18, 0x35, 0x58, 0x82, 0x20, 0x1c, 0x21, 0x09, 0x2e, 0xf6, 0xb0, 0xd4, 0xa2, 0xe2, 0xcc,
0xfc, 0x3c, 0x09, 0x66, 0xb0, 0x5a, 0x18, 0xd7, 0xc9, 0xee, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f,
0xfc, 0x3c, 0x09, 0x66, 0xb0, 0x5a, 0x18, 0xd7, 0xc9, 0xe6, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f,
0xe4, 0x18, 0x6f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc6, 0x63, 0x39, 0x86, 0x28,
0x0d, 0x24, 0xb7, 0xe5, 0x15, 0x17, 0x24, 0x27, 0xeb, 0xa6, 0xa4, 0x96, 0xe9, 0xe7, 0xa5, 0xe6,
0xa7, 0x15, 0xeb, 0x42, 0x5c, 0x06, 0xf5, 0x45, 0x12, 0x1b, 0x98, 0x6b, 0x0c, 0x08, 0x00, 0x00,
0xff, 0xff, 0x6b, 0x83, 0x1d, 0xcf, 0xeb, 0x00, 0x00, 0x00,
0x35, 0x24, 0xb7, 0xe5, 0x15, 0x17, 0x24, 0x27, 0xeb, 0xa6, 0xa4, 0x96, 0xe9, 0xe7, 0xa5, 0xe6,
0xa7, 0x15, 0xeb, 0x26, 0x16, 0x64, 0xea, 0x43, 0xfd, 0x90, 0xc4, 0x06, 0x76, 0x9b, 0x31, 0x20,
0x00, 0x00, 0xff, 0xff, 0xa6, 0x4d, 0x59, 0x8e, 0xe9, 0x00, 0x00, 0x00,
}
func (m *RequestMetaHeader) Marshal() (dAtA []byte, err error) {

View file

@ -1,6 +1,6 @@
syntax = "proto3";
package service;
option go_package = "github.com/nspcc-dev/neofs-proto/service";
option go_package = "github.com/nspcc-dev/neofs-api/service";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";

View file

@ -4,9 +4,9 @@ import (
"crypto/ecdsa"
"sync"
"github.com/nspcc-dev/neofs-api/internal"
"github.com/nspcc-dev/neofs-api/refs"
crypto "github.com/nspcc-dev/neofs-crypto"
"github.com/nspcc-dev/neofs-proto/internal"
"github.com/nspcc-dev/neofs-proto/refs"
"github.com/pkg/errors"
)

View file

@ -179,7 +179,7 @@ func init() {
func init() { proto.RegisterFile("service/verify.proto", fileDescriptor_4bdd5bc50ec96238) }
var fileDescriptor_4bdd5bc50ec96238 = []byte{
// 270 bytes of a gzipped FileDescriptorProto
// 272 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x29, 0x4e, 0x2d, 0x2a,
0xcb, 0x4c, 0x4e, 0xd5, 0x2f, 0x4b, 0x2d, 0xca, 0x4c, 0xab, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9,
0x17, 0x62, 0x87, 0x8a, 0x4a, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7,
@ -192,11 +192,11 @@ var fileDescriptor_4bdd5bc50ec96238 = []byte{
0x13, 0x04, 0x17, 0x0b, 0x48, 0x4d, 0x2d, 0x92, 0x60, 0x82, 0x88, 0x81, 0xd8, 0x52, 0x93, 0x19,
0xb9, 0x38, 0xe1, 0xda, 0x85, 0x5c, 0x91, 0x74, 0x71, 0x1b, 0xa9, 0x13, 0xe9, 0x0a, 0x27, 0x8e,
0x13, 0xf7, 0xe4, 0x19, 0x2e, 0xdc, 0x93, 0x67, 0x84, 0x5a, 0x64, 0xcf, 0xc5, 0xe6, 0x5f, 0x94,
0x99, 0x9e, 0x99, 0x07, 0xb6, 0x8a, 0x78, 0x83, 0x82, 0xa0, 0xda, 0x9c, 0xec, 0x4e, 0x3c, 0x92,
0x99, 0x9e, 0x99, 0x07, 0xb6, 0x8a, 0x78, 0x83, 0x82, 0xa0, 0xda, 0x9c, 0x6c, 0x4e, 0x3c, 0x92,
0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc6, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x67, 0x3c,
0x96, 0x63, 0x88, 0xd2, 0x40, 0x0a, 0xf6, 0xbc, 0xe2, 0x82, 0xe4, 0x64, 0xdd, 0x94, 0xd4, 0x32,
0xfd, 0xbc, 0xd4, 0xfc, 0xb4, 0x62, 0x5d, 0x48, 0xa0, 0x43, 0xad, 0x49, 0x62, 0x03, 0x73, 0x8d,
0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x15, 0xf6, 0x5e, 0xc8, 0x01, 0x00, 0x00,
0x96, 0x63, 0x88, 0x52, 0x43, 0x0a, 0xf6, 0xbc, 0xe2, 0x82, 0xe4, 0x64, 0xdd, 0x94, 0xd4, 0x32,
0xfd, 0xbc, 0xd4, 0xfc, 0xb4, 0x62, 0xdd, 0xc4, 0x82, 0x4c, 0x7d, 0xa8, 0x25, 0x49, 0x6c, 0xe0,
0x60, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xfc, 0xec, 0x11, 0xc6, 0x01, 0x00, 0x00,
}
func (m *RequestVerificationHeader) Marshal() (dAtA []byte, err error) {

View file

@ -1,6 +1,6 @@
syntax = "proto3";
package service;
option go_package = "github.com/nspcc-dev/neofs-proto/service";
option go_package = "github.com/nspcc-dev/neofs-api/service";
import "github.com/gogo/protobuf/gogoproto/gogo.proto";

View file

@ -7,9 +7,9 @@ import (
"testing"
"github.com/gogo/protobuf/proto"
"github.com/nspcc-dev/neofs-api/refs"
crypto "github.com/nspcc-dev/neofs-crypto"
"github.com/nspcc-dev/neofs-crypto/test"
"github.com/nspcc-dev/neofs-proto/refs"
"github.com/pkg/errors"
"github.com/stretchr/testify/require"
)

View file

@ -92,28 +92,28 @@ func init() {
func init() { proto.RegisterFile("service/verify_test.proto", fileDescriptor_1effa83201a30d75) }
var fileDescriptor_1effa83201a30d75 = []byte{
// 322 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x31, 0x4f, 0xc3, 0x30,
0x10, 0x85, 0xeb, 0x52, 0x4a, 0x71, 0x90, 0x90, 0x0c, 0x43, 0xc9, 0x90, 0x46, 0x9d, 0xb2, 0x34,
0x91, 0x40, 0x48, 0x4c, 0x0c, 0x01, 0x21, 0x18, 0x58, 0x02, 0x62, 0x60, 0x41, 0x49, 0x7a, 0x0d,
0x96, 0x68, 0x5c, 0xe2, 0x4b, 0xa5, 0xfe, 0x13, 0x66, 0x7e, 0x4d, 0xc7, 0x8e, 0x88, 0xa1, 0x42,
0xe1, 0x8f, 0xa0, 0xd8, 0x06, 0x05, 0xd8, 0xfc, 0xde, 0xfb, 0x9e, 0xed, 0x3b, 0x7a, 0x20, 0xa1,
0x98, 0xf3, 0x14, 0x82, 0x39, 0x14, 0x7c, 0xb2, 0x78, 0x40, 0x90, 0xe8, 0xcf, 0x0a, 0x81, 0x82,
0x6d, 0x99, 0xc8, 0x66, 0xdf, 0xcc, 0x14, 0x30, 0xd6, 0xa1, 0xbd, 0xff, 0xbb, 0x67, 0xdc, 0x51,
0xc6, 0xf1, 0xb1, 0x4c, 0xfc, 0x54, 0x4c, 0x83, 0x4c, 0x64, 0x22, 0x50, 0x76, 0x52, 0x4e, 0x94,
0x52, 0x42, 0x9d, 0x34, 0x3e, 0x7c, 0x6d, 0x53, 0xeb, 0x16, 0x24, 0x46, 0xf0, 0x5c, 0x82, 0x44,
0x66, 0xd3, 0xde, 0x55, 0x8e, 0x17, 0x1c, 0x9e, 0xc6, 0x7d, 0xe2, 0x12, 0x6f, 0x33, 0xfa, 0xd1,
0xcc, 0xa5, 0xd6, 0x0d, 0x16, 0x3c, 0xcf, 0x74, 0xdc, 0x76, 0x89, 0xb7, 0x1d, 0x35, 0x2d, 0xe6,
0x50, 0x1a, 0x2e, 0x10, 0xa4, 0x06, 0x36, 0x5c, 0xe2, 0xed, 0x44, 0x0d, 0x87, 0x1d, 0x53, 0xeb,
0xac, 0x94, 0x28, 0xa6, 0x1a, 0xe8, 0xd4, 0x40, 0xb8, 0xf7, 0xbe, 0x1e, 0xec, 0xd6, 0x43, 0x37,
0xa2, 0xa8, 0xc9, 0xb1, 0x13, 0xda, 0xb9, 0x06, 0x8c, 0xfb, 0x89, 0x4b, 0x3c, 0xeb, 0xd0, 0xf6,
0xcd, 0xe0, 0xbe, 0xf9, 0x74, 0x9d, 0x5d, 0x42, 0x3c, 0x86, 0x22, 0xec, 0x2d, 0xd7, 0x83, 0xd6,
0x6a, 0x3d, 0x20, 0x91, 0x6a, 0xb0, 0x73, 0xda, 0xd5, 0x49, 0x3f, 0x55, 0xdd, 0xe1, 0xdf, 0xee,
0x5d, 0xbd, 0x3b, 0x9e, 0xc6, 0xc8, 0x45, 0xfe, 0xef, 0x0e, 0xd3, 0x0d, 0x4f, 0x97, 0x95, 0x43,
0x56, 0x95, 0x43, 0xde, 0x2a, 0x87, 0x7c, 0x54, 0x0e, 0x79, 0xf9, 0x74, 0x5a, 0xf7, 0x5e, 0x63,
0xd3, 0xb9, 0x9c, 0xa5, 0xe9, 0x68, 0x0c, 0xf3, 0x20, 0x07, 0x31, 0x91, 0x23, 0xbd, 0x67, 0xf3,
0x56, 0xd2, 0x55, 0xf2, 0xe8, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x37, 0x92, 0xd2, 0xea, 0x01,
0x00, 0x00,
// 326 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xb1, 0x4e, 0xf3, 0x30,
0x14, 0x85, 0xeb, 0xfe, 0xfd, 0x4b, 0x71, 0x90, 0x90, 0x0c, 0x43, 0xc9, 0x90, 0x46, 0x1d, 0x50,
0x96, 0x26, 0x12, 0x08, 0x89, 0x81, 0x29, 0x20, 0x04, 0x03, 0x4b, 0x40, 0x0c, 0x2c, 0x28, 0x49,
0x6f, 0x83, 0x25, 0x1a, 0x97, 0xf8, 0xa6, 0x52, 0xdf, 0x84, 0x99, 0xa7, 0xe9, 0xd8, 0x11, 0x31,
0x54, 0x28, 0xbc, 0x08, 0x8a, 0x6d, 0x50, 0x80, 0xcd, 0xf7, 0x9c, 0xef, 0xd8, 0xbe, 0x87, 0xee,
0x49, 0x28, 0xe6, 0x3c, 0x85, 0x60, 0x0e, 0x05, 0x9f, 0x2c, 0xee, 0x11, 0x24, 0xfa, 0xb3, 0x42,
0xa0, 0x60, 0x1b, 0xc6, 0xb2, 0xd9, 0x17, 0x33, 0x05, 0x8c, 0xb5, 0x69, 0xef, 0xfe, 0xcc, 0x19,
0x75, 0x94, 0x71, 0x7c, 0x28, 0x13, 0x3f, 0x15, 0xd3, 0x20, 0x13, 0x99, 0x08, 0x94, 0x9c, 0x94,
0x13, 0x35, 0xa9, 0x41, 0x9d, 0x34, 0x3e, 0x7c, 0x69, 0x53, 0xeb, 0x06, 0x24, 0x46, 0xf0, 0x54,
0x82, 0x44, 0x66, 0xd3, 0xde, 0x65, 0x8e, 0xe7, 0x1c, 0x1e, 0xc7, 0x7d, 0xe2, 0x12, 0xef, 0x7f,
0xf4, 0x3d, 0x33, 0x97, 0x5a, 0xd7, 0x58, 0xf0, 0x3c, 0xd3, 0x76, 0xdb, 0x25, 0xde, 0x66, 0xd4,
0x94, 0x98, 0x43, 0x69, 0xb8, 0x40, 0x90, 0x1a, 0xf8, 0xe7, 0x12, 0x6f, 0x2b, 0x6a, 0x28, 0xec,
0x88, 0x5a, 0xa7, 0xa5, 0x44, 0x31, 0xd5, 0x40, 0xa7, 0x06, 0xc2, 0x9d, 0xb7, 0xf5, 0x60, 0xbb,
0x5e, 0xba, 0x61, 0x45, 0x4d, 0x8e, 0x1d, 0xd3, 0xce, 0x15, 0x60, 0xdc, 0x4f, 0x5c, 0xe2, 0x59,
0x07, 0xb6, 0x6f, 0x16, 0xf7, 0xcd, 0xa7, 0x6b, 0xef, 0x02, 0xe2, 0x31, 0x14, 0x61, 0x6f, 0xb9,
0x1e, 0xb4, 0x56, 0xeb, 0x01, 0x89, 0x54, 0x82, 0x9d, 0xd1, 0xae, 0x76, 0xfa, 0xa9, 0xca, 0x0e,
0x7f, 0x67, 0x6f, 0xeb, 0xee, 0x78, 0x1a, 0x23, 0x17, 0xf9, 0x9f, 0x3b, 0x4c, 0x36, 0x3c, 0x59,
0x56, 0x0e, 0x59, 0x55, 0x0e, 0x79, 0xad, 0x1c, 0xf2, 0x5e, 0x39, 0xe4, 0xf9, 0xc3, 0x69, 0xdd,
0xed, 0x37, 0x9a, 0xce, 0xe5, 0x2c, 0x4d, 0x47, 0x63, 0x98, 0x07, 0x39, 0x88, 0x89, 0x1c, 0xc5,
0x33, 0x1e, 0x98, 0x97, 0x92, 0xae, 0x6a, 0xfa, 0xf0, 0x33, 0x00, 0x00, 0xff, 0xff, 0x04, 0x99,
0x63, 0xf2, 0xe8, 0x01, 0x00, 0x00,
}
func (m *TestRequest) Marshal() (dAtA []byte, err error) {

View file

@ -1,6 +1,6 @@
syntax = "proto3";
package service;
option go_package = "github.com/nspcc-dev/neofs-proto/service";
option go_package = "github.com/nspcc-dev/neofs-api/service";
import "service/meta.proto";
import "service/verify.proto";