From 923f84722a2fb4f3b718c0c9cc4d020bc98d7f4d Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Fri, 23 Dec 2022 20:35:35 +0300 Subject: [PATCH] Move to frostfs-node Signed-off-by: Pavel Karpy --- .github/workflows/go.yml | 2 +- Makefile | 16 +-- cmd/{neofs-adm => frostfs-adm}/README.md | 8 +- cmd/{neofs-adm => frostfs-adm}/docs/deploy.md | 20 ++-- .../docs/subnetwork-creation.md | 6 +- .../docs/subnetwork-usage.md | 14 +-- .../internal/modules/config/config.go | 6 +- .../internal/modules/config/config_test.go | 4 +- .../internal/modules/config/root.go | 10 +- .../internal/modules/config/util.go | 0 .../internal/modules/morph/balance.go | 8 +- .../internal/modules/morph/config.go | 4 +- .../internal/modules/morph/container.go | 6 +- .../internal/modules/morph/deploy.go | 6 +- .../internal/modules/morph/download.go | 4 +- .../internal/modules/morph/dump_hashes.go | 4 +- .../internal/modules/morph/epoch.go | 2 +- .../internal/modules/morph/generate.go | 4 +- .../internal/modules/morph/generate_test.go | 2 +- .../internal/modules/morph/group.go | 2 +- .../internal/modules/morph/initialize.go | 6 +- .../modules/morph/initialize_deploy.go | 12 +-- .../internal/modules/morph/initialize_nns.go | 16 +-- .../modules/morph/initialize_register.go | 0 .../modules/morph/initialize_roles.go | 0 .../internal/modules/morph/initialize_test.go | 6 +- .../modules/morph/initialize_transfer.go | 0 .../internal/modules/morph/internal/types.go | 0 .../modules/morph/internal/types.pb.go | Bin 6464 -> 6523 bytes .../modules/morph/internal/types.proto | 2 +- .../internal/modules/morph/local_client.go | 0 .../internal/modules/morph/n3client.go | 0 .../internal/modules/morph/notary.go | 0 .../internal/modules/morph/policy.go | 0 .../internal/modules/morph/remove_node.go | 4 +- .../internal/modules/morph/root.go | 0 .../internal/modules/morph/subnet.go | 20 ++-- .../internal/modules/morph/update.go | 0 .../internal/modules/root.go | 16 +-- .../internal/modules/storagecfg/config.go | 0 .../internal/modules/storagecfg/root.go | 8 +- cmd/{neofs-adm => frostfs-adm}/main.go | 2 +- .../docs/sessions.md | 4 +- .../internal/client/client.go | 18 ++-- .../internal/client/doc.go | 0 .../internal/client/prm.go | 10 +- .../internal/client/sdk.go | 12 +-- .../internal/common/eacl.go | 6 +- .../internal/common/epoch.go | 0 .../internal/common/exit.go | 2 +- .../internal/common/json.go | 0 .../internal/common/netmap.go | 2 +- .../internal/common/token.go | 2 +- .../internal/common/verbose.go | 4 +- .../internal/commonflags/api.go | 0 .../internal/commonflags/expiration.go | 0 .../internal/commonflags/flags.go | 0 .../internal/commonflags/json.go | 0 .../internal/commonflags/session.go | 0 .../internal/key/key_test.go | 2 +- .../internal/key/raw.go | 4 +- .../internal/key/wallet.go | 0 cmd/frostfs-cli/main.go | 7 ++ .../modules/accounting/balance.go | 14 +-- .../modules/accounting/root.go | 2 +- .../modules/acl/basic/print.go | 8 +- .../modules/acl/basic/root.go | 0 .../modules/acl/extended/create.go | 16 +-- .../modules/acl/extended/create_test.go | 4 +- .../modules/acl/extended/print.go | 6 +- .../modules/acl/extended/root.go | 0 .../modules/acl/root.go | 4 +- .../modules/bearer/create.go | 12 +-- .../modules/bearer/root.go | 0 cmd/frostfs-cli/modules/completion.go | 9 ++ .../modules/container/create.go | 18 ++-- .../modules/container/delete.go | 10 +- .../modules/container/get.go | 16 +-- .../modules/container/get_eacl.go | 8 +- .../modules/container/list.go | 12 +-- .../modules/container/list_objects.go | 16 +-- .../modules/container/nodes.go | 14 +-- .../modules/container/root.go | 2 +- .../modules/container/set_eacl.go | 8 +- .../modules/container/util.go | 8 +- .../modules/control/drop_objects.go | 8 +- .../modules/control/evacuate_shard.go | 8 +- .../modules/control/flush_cache.go | 8 +- .../modules/control/healthcheck.go | 14 +-- .../modules/control/root.go | 2 +- .../modules/control/set_netmap_status.go | 10 +- .../modules/control/shards.go | 0 .../modules/control/shards_dump.go | 8 +- .../modules/control/shards_list.go | 10 +- .../modules/control/shards_restore.go | 8 +- .../modules/control/shards_set_mode.go | 8 +- .../modules/control/synchronize_tree.go | 14 +-- .../modules/control/util.go | 16 +-- .../modules/netmap/get_epoch.go | 8 +- .../modules/netmap/netinfo.go | 8 +- .../modules/netmap/nodeinfo.go | 10 +- .../modules/netmap/root.go | 2 +- .../modules/netmap/snapshot.go | 8 +- .../modules/object/delete.go | 12 +-- .../modules/object/get.go | 14 +-- .../modules/object/hash.go | 14 +-- .../modules/object/head.go | 18 ++-- .../modules/object/lock.go | 18 ++-- .../modules/object/put.go | 16 +-- .../modules/object/range.go | 14 +-- .../modules/object/root.go | 2 +- .../modules/object/search.go | 14 +-- .../modules/object/util.go | 24 ++--- .../modules/root.go | 40 +++---- .../modules/session/create.go | 18 ++-- .../modules/session/root.go | 0 .../modules/storagegroup/delete.go | 14 +-- .../modules/storagegroup/get.go | 16 +-- .../modules/storagegroup/list.go | 14 +-- .../modules/storagegroup/put.go | 24 ++--- .../modules/storagegroup/root.go | 4 +- .../modules/storagegroup/util.go | 8 +- .../modules/tree/add.go | 10 +- .../modules/tree/add_by_path.go | 12 +-- .../modules/tree/client.go | 6 +- .../modules/tree/get_by_path.go | 12 +-- .../modules/tree/list.go | 10 +- .../modules/tree/root.go | 2 +- .../modules/util/acl.go | 4 +- .../modules/util/convert.go | 0 .../modules/util/convert_eacl.go | 4 +- .../modules/util/keyer.go | 4 +- .../modules/util/locode.go | 0 .../modules/util/locode_generate.go | 12 +-- .../modules/util/locode_info.go | 6 +- .../modules/util/root.go | 2 +- .../modules/util/sign.go | 0 .../modules/util/sign_bearer.go | 6 +- .../modules/util/sign_session.go | 8 +- cmd/{neofs-ir => frostfs-ir}/defaults.go | 6 +- cmd/{neofs-ir => frostfs-ir}/main.go | 10 +- .../internal/blobovnicza/inspect.go | 8 +- .../internal/blobovnicza/list.go | 6 +- .../internal/blobovnicza/root.go | 4 +- .../internal/errors.go | 0 .../internal/flags.go | 0 .../internal/meta/inspect.go | 10 +- .../internal/meta/list-garbage.go | 4 +- .../internal/meta/list-graveyard.go | 4 +- .../internal/meta/root.go | 4 +- .../internal/printers.go | 6 +- .../internal/writecache/inspect.go | 6 +- .../internal/writecache/list.go | 6 +- .../internal/writecache/root.go | 4 +- cmd/{neofs-lens => frostfs-lens}/root.go | 12 +-- .../accounting.go | 10 +- .../attributes.go | 4 +- cmd/{neofs-node => frostfs-node}/cache.go | 20 ++-- cmd/{neofs-node => frostfs-node}/config.go | 96 ++++++++--------- .../config/apiclient/config.go | 2 +- .../config/apiclient/config_test.go | 6 +- .../config/calls.go | 0 .../config/calls_test.go | 6 +- .../config/cast.go | 0 .../config/cast_test.go | 4 +- .../config/config.go | 2 +- .../config/contracts/config.go | 2 +- .../config/contracts/config_test.go | 6 +- .../config/control/config.go | 2 +- .../config/control/config_test.go | 6 +- .../config/engine/config.go | 6 +- .../config/engine/config_test.go | 16 +-- .../shard/blobstor/blobovnicza/config.go | 6 +- .../config/engine/shard/blobstor/config.go | 8 +- .../engine/shard/blobstor/fstree/config.go | 4 +- .../engine/shard/blobstor/storage/config.go | 2 +- .../config/engine/shard/boltdb/boltdb.go | 2 +- .../config/engine/shard/config.go | 14 +-- .../config/engine/shard/gc/config.go | 2 +- .../config/engine/shard/metabase/config.go | 4 +- .../config/engine/shard/pilorama/config.go | 2 +- .../config/engine/shard/writecache/config.go | 4 +- .../config/grpc/config.go | 2 +- .../config/grpc/config_test.go | 10 +- .../config/internal/env.go | 0 .../config/internal/env_test.go | 2 +- .../config/logger/config.go | 2 +- .../config/logger/config_test.go | 6 +- .../config/metrics/config.go | 2 +- .../config/metrics/config_test.go | 6 +- .../config/morph/config.go | 4 +- .../config/morph/config_test.go | 8 +- .../config/node/config.go | 8 +- .../config/node/config_test.go | 14 +-- .../config/node/wallet.json | 0 .../config/node/wallet.key | 0 .../config/object/config.go | 2 +- .../config/object/config_test.go | 6 +- .../config/opts.go | 0 .../config/policer/config.go | 2 +- .../config/policer/config_test.go | 6 +- .../config/profiler/config.go | 2 +- .../config/profiler/config_test.go | 6 +- .../config/replicator/config.go | 2 +- .../config/replicator/config_test.go | 6 +- .../config/test/config.go | 2 +- .../config/test/config.json | 0 .../config/test/config.yaml | 0 .../config/tree/config.go | 2 +- .../config/tree/config_test.go | 6 +- cmd/{neofs-node => frostfs-node}/container.go | 44 ++++---- cmd/{neofs-node => frostfs-node}/control.go | 10 +- cmd/{neofs-node => frostfs-node}/grpc.go | 4 +- cmd/{neofs-node => frostfs-node}/main.go | 8 +- cmd/{neofs-node => frostfs-node}/metrics.go | 4 +- cmd/{neofs-node => frostfs-node}/morph.go | 16 +-- cmd/{neofs-node => frostfs-node}/netmap.go | 28 ++--- .../notificator.go | 18 ++-- cmd/{neofs-node => frostfs-node}/object.go | 78 +++++++------- cmd/{neofs-node => frostfs-node}/pprof.go | 4 +- .../reputation.go | 52 ++++----- .../reputation/common/remote.go | 12 +-- .../reputation/common/util.go | 2 +- .../reputation/intermediate/calculator.go | 12 +-- .../reputation/intermediate/consumers.go | 12 +-- .../reputation/intermediate/contract.go | 14 +-- .../reputation/intermediate/daughters.go | 8 +- .../reputation/intermediate/remote.go | 16 +-- .../reputation/intermediate/storage.go | 8 +- .../reputation/internal/client/client.go | 8 +- .../reputation/internal/client/doc.go | 0 .../reputation/local/remote.go | 14 +-- .../reputation/local/storage.go | 14 +-- .../reputation/ticker/fixed.go | 0 .../reputation/ticker/fixed_test.go | 0 cmd/{neofs-node => frostfs-node}/session.go | 22 ++-- cmd/{neofs-node => frostfs-node}/timers.go | 2 +- cmd/{neofs-node => frostfs-node}/tree.go | 16 +-- cmd/{neofs-node => frostfs-node}/validate.go | 16 +-- .../validate_test.go | 4 +- cmd/{neofs-node => frostfs-node}/worker.go | 0 cmd/neofs-cli/main.go | 7 -- cmd/neofs-cli/modules/completion.go | 9 -- config/example/cli.yaml | 2 +- config/example/ir-control.yaml | 2 +- config/example/ir.env | 2 +- config/example/ir.yaml | 2 +- config/example/node-control.yaml | 2 +- config/example/node.env | 6 +- config/example/node.json | 10 +- config/example/node.yaml | 10 +- config/mainnet/README.md | 8 +- config/testnet/README.md | 20 ++-- config/testnet/docker-compose.yml | 6 +- config/testnet/prometheus.yml | 2 +- debian/changelog | 11 +- debian/control | 14 +-- debian/copyright | 8 +- debian/{neofs-cli.docs => frostfs-cli.docs} | 2 +- debian/frostfs-cli.install | 3 + ...eofs-cli.manpages => frostfs-cli.manpages} | 0 debian/frostfs-ir.dirs | 2 + debian/{neofs-ir.docs => frostfs-ir.docs} | 0 debian/frostfs-ir.install | 1 + ...{neofs-ir.postinst => frostfs-ir.postinst} | 22 ++-- debian/{neofs-ir.postrm => frostfs-ir.postrm} | 2 +- .../{neofs-ir.preinst => frostfs-ir.preinst} | 0 debian/{neofs-ir.prerm => frostfs-ir.prerm} | 0 .../{neofs-ir.service => frostfs-ir.service} | 8 +- debian/frostfs-storage.dirs | 3 + ...eofs-storage.docs => frostfs-storage.docs} | 0 debian/frostfs-storage.install | 1 + debian/frostfs-storage.postinst | 55 ++++++++++ ...-storage.postrm => frostfs-storage.postrm} | 2 +- ...torage.preinst => frostfs-storage.preinst} | 0 ...fs-storage.prerm => frostfs-storage.prerm} | 0 ...torage.service => frostfs-storage.service} | 8 +- debian/neofs-cli.install | 3 - debian/neofs-ir.dirs | 2 - debian/neofs-ir.install | 1 - debian/neofs-storage.dirs | 3 - debian/neofs-storage.install | 1 - debian/neofs-storage.postinst | 55 ---------- debian/rules | 32 +++--- docs/maintenance.md | 6 +- docs/release-instruction.md | 10 +- go.mod | 15 +-- go.sum | 27 ++--- pkg/core/client/client.go | 6 +- pkg/core/client/util.go | 4 +- pkg/core/container/delete.go | 4 +- pkg/core/container/storage.go | 16 +-- pkg/core/netmap/nodes.go | 2 +- pkg/core/netmap/storage.go | 2 +- pkg/core/object/address.go | 4 +- pkg/core/object/fmt.go | 22 ++-- pkg/core/object/fmt_test.go | 16 +-- pkg/core/object/object.go | 4 +- pkg/core/storagegroup/storagegroup.go | 10 +- pkg/core/version/version.go | 2 +- pkg/core/version/version_test.go | 4 +- pkg/innerring/bindings.go | 2 +- pkg/innerring/blocktimer.go | 14 +-- pkg/innerring/contracts.go | 12 +-- pkg/innerring/fetcher.go | 4 +- pkg/innerring/innerring.go | 100 +++++++++--------- pkg/innerring/internal/client/client.go | 16 +-- pkg/innerring/internal/client/doc.go | 4 +- pkg/innerring/internal/client/prm.go | 4 +- pkg/innerring/locode.go | 10 +- pkg/innerring/netmap.go | 4 +- pkg/innerring/notary.go | 4 +- pkg/innerring/processors/alphabet/handlers.go | 4 +- .../processors/alphabet/processor.go | 12 +-- pkg/innerring/processors/audit/handlers.go | 2 +- pkg/innerring/processors/audit/process.go | 20 ++-- pkg/innerring/processors/audit/processor.go | 12 +-- pkg/innerring/processors/audit/scheduler.go | 2 +- .../processors/audit/scheduler_test.go | 6 +- pkg/innerring/processors/balance/handlers.go | 4 +- .../processors/balance/process_assets.go | 4 +- pkg/innerring/processors/balance/processor.go | 12 +-- pkg/innerring/processors/container/common.go | 14 +-- .../processors/container/handlers.go | 4 +- .../processors/container/process_container.go | 16 +-- .../processors/container/process_eacl.go | 8 +- .../processors/container/processor.go | 12 +-- .../processors/governance/handlers.go | 4 +- .../processors/governance/process_update.go | 12 +-- .../processors/governance/processor.go | 24 ++--- pkg/innerring/processors/neofs/handlers.go | 30 +++--- .../processors/neofs/process_assets.go | 12 +-- .../processors/neofs/process_bind.go | 14 +-- .../processors/neofs/process_config.go | 8 +- pkg/innerring/processors/neofs/processor.go | 60 +++++------ .../processors/netmap/cleanup_table.go | 2 +- .../processors/netmap/cleanup_table_test.go | 2 +- pkg/innerring/processors/netmap/handlers.go | 8 +- .../netmap/nodevalidation/locode/calls.go | 4 +- .../nodevalidation/locode/calls_test.go | 8 +- .../netmap/nodevalidation/locode/deps.go | 4 +- .../netmap/nodevalidation/maddress/calls.go | 4 +- .../netmap/nodevalidation/state/validator.go | 4 +- .../nodevalidation/state/validator_test.go | 4 +- .../netmap/nodevalidation/subnet/calls.go | 6 +- .../netmap/nodevalidation/subnet/validator.go | 2 +- .../netmap/nodevalidation/validator.go | 4 +- .../processors/netmap/process_cleanup.go | 6 +- .../processors/netmap/process_epoch.go | 10 +- .../processors/netmap/process_peers.go | 12 +-- pkg/innerring/processors/netmap/processor.go | 16 +-- .../processors/reputation/handlers.go | 6 +- .../processors/reputation/process_put.go | 10 +- .../processors/reputation/processor.go | 10 +- .../processors/settlement/audit/calculate.go | 12 +-- .../processors/settlement/audit/calculator.go | 2 +- .../processors/settlement/audit/prm.go | 6 +- .../processors/settlement/basic/collect.go | 4 +- .../processors/settlement/basic/context.go | 8 +- .../processors/settlement/basic/distribute.go | 2 +- pkg/innerring/processors/settlement/calls.go | 4 +- .../processors/settlement/common/types.go | 4 +- .../processors/settlement/common/util.go | 2 +- pkg/innerring/processors/settlement/deps.go | 2 +- pkg/innerring/processors/settlement/events.go | 2 +- .../processors/settlement/handlers.go | 2 +- pkg/innerring/processors/settlement/opts.go | 2 +- .../processors/settlement/processor.go | 6 +- pkg/innerring/processors/subnet/common.go | 2 +- .../processors/subnet/common_test.go | 2 +- pkg/innerring/processors/subnet/put.go | 6 +- pkg/innerring/processors/subnet/put_test.go | 8 +- pkg/innerring/rpc.go | 40 +++---- pkg/innerring/settlement.go | 36 +++---- pkg/innerring/state.go | 10 +- pkg/innerring/subnet.go | 20 ++-- .../blobovnicza/blobovnicza.go | 2 +- .../blobovnicza/blobovnicza_test.go | 6 +- .../blobovnicza/control.go | 2 +- .../blobovnicza/delete.go | 4 +- .../blobovnicza/errors.go | 2 +- .../blobovnicza/exists.go | 2 +- pkg/local_object_storage/blobovnicza/get.go | 4 +- .../blobovnicza/get_test.go | 2 +- .../blobovnicza/iterate.go | 2 +- .../blobovnicza/iterate_test.go | 2 +- pkg/local_object_storage/blobovnicza/put.go | 4 +- .../blobstor/blobovniczatree/blobovnicza.go | 12 +-- .../blobstor/blobovniczatree/control.go | 2 +- .../blobstor/blobovniczatree/delete.go | 8 +- .../blobstor/blobovniczatree/errors.go | 4 +- .../blobstor/blobovniczatree/exists.go | 4 +- .../blobstor/blobovniczatree/exists_test.go | 8 +- .../blobstor/blobovniczatree/generic_test.go | 6 +- .../blobstor/blobovniczatree/get.go | 10 +- .../blobstor/blobovniczatree/get_range.go | 10 +- .../blobstor/blobovniczatree/iterate.go | 8 +- .../blobstor/blobovniczatree/option.go | 6 +- .../blobstor/blobovniczatree/put.go | 4 +- pkg/local_object_storage/blobstor/blobstor.go | 10 +- .../blobstor/blobstor_test.go | 14 +-- .../blobstor/common/delete.go | 2 +- .../blobstor/common/errors.go | 2 +- .../blobstor/common/exists.go | 2 +- .../blobstor/common/get.go | 4 +- .../blobstor/common/get_range.go | 4 +- .../blobstor/common/iterate.go | 2 +- .../blobstor/common/put.go | 4 +- .../blobstor/common/storage.go | 2 +- .../blobstor/compression/compress.go | 2 +- pkg/local_object_storage/blobstor/delete.go | 4 +- pkg/local_object_storage/blobstor/exists.go | 2 +- .../blobstor/exists_test.go | 12 +-- .../blobstor/fstree/control.go | 2 +- .../blobstor/fstree/fstree.go | 16 +-- .../blobstor/fstree/fstree_test.go | 2 +- .../blobstor/fstree/generic_test.go | 4 +- .../blobstor/generic_test.go | 2 +- pkg/local_object_storage/blobstor/get.go | 6 +- .../blobstor/get_range.go | 6 +- .../blobstor/internal/blobstortest/common.go | 12 +-- .../blobstor/internal/blobstortest/control.go | 4 +- .../blobstor/internal/blobstortest/delete.go | 6 +- .../blobstor/internal/blobstortest/exists.go | 4 +- .../blobstor/internal/blobstortest/get.go | 6 +- .../internal/blobstortest/get_range.go | 6 +- .../blobstor/internal/blobstortest/iterate.go | 4 +- pkg/local_object_storage/blobstor/iterate.go | 4 +- .../blobstor/iterate_test.go | 6 +- pkg/local_object_storage/blobstor/logger.go | 6 +- pkg/local_object_storage/blobstor/mode.go | 2 +- pkg/local_object_storage/blobstor/put.go | 8 +- pkg/local_object_storage/engine/container.go | 4 +- pkg/local_object_storage/engine/control.go | 4 +- .../engine/control_test.go | 12 +-- pkg/local_object_storage/engine/delete.go | 8 +- .../engine/delete_test.go | 14 +-- pkg/local_object_storage/engine/dump.go | 2 +- pkg/local_object_storage/engine/engine.go | 10 +- .../engine/engine_test.go | 32 +++--- pkg/local_object_storage/engine/error_test.go | 20 ++-- pkg/local_object_storage/engine/evacuate.go | 12 +-- .../engine/evacuate_test.go | 20 ++-- pkg/local_object_storage/engine/exists.go | 8 +- pkg/local_object_storage/engine/get.go | 12 +-- pkg/local_object_storage/engine/head.go | 12 +-- pkg/local_object_storage/engine/head_test.go | 8 +- pkg/local_object_storage/engine/info.go | 2 +- pkg/local_object_storage/engine/inhume.go | 10 +- .../engine/inhume_test.go | 8 +- pkg/local_object_storage/engine/list.go | 4 +- pkg/local_object_storage/engine/list_test.go | 6 +- pkg/local_object_storage/engine/lock.go | 12 +-- pkg/local_object_storage/engine/lock_test.go | 22 ++-- pkg/local_object_storage/engine/put.go | 14 +-- pkg/local_object_storage/engine/range.go | 12 +-- pkg/local_object_storage/engine/restore.go | 2 +- pkg/local_object_storage/engine/select.go | 8 +- pkg/local_object_storage/engine/shards.go | 10 +- pkg/local_object_storage/engine/tree.go | 6 +- pkg/local_object_storage/engine/tree_test.go | 6 +- pkg/local_object_storage/engine/writecache.go | 2 +- pkg/local_object_storage/internal/log/log.go | 2 +- .../internal/storagetest/storage.go | 2 +- .../metabase/containers.go | 2 +- .../metabase/containers_test.go | 10 +- pkg/local_object_storage/metabase/control.go | 6 +- .../metabase/control_test.go | 8 +- pkg/local_object_storage/metabase/counter.go | 4 +- .../metabase/counter_test.go | 10 +- pkg/local_object_storage/metabase/db.go | 8 +- pkg/local_object_storage/metabase/db_test.go | 26 ++--- pkg/local_object_storage/metabase/delete.go | 10 +- .../metabase/delete_test.go | 14 +-- pkg/local_object_storage/metabase/errors.go | 4 +- pkg/local_object_storage/metabase/exists.go | 12 +-- .../metabase/exists_test.go | 12 +-- .../metabase/generic_test.go | 2 +- pkg/local_object_storage/metabase/get.go | 10 +- pkg/local_object_storage/metabase/get_test.go | 14 +-- .../metabase/graveyard.go | 2 +- .../metabase/graveyard_test.go | 8 +- pkg/local_object_storage/metabase/inhume.go | 8 +- .../metabase/inhume_test.go | 10 +- .../metabase/iterators.go | 10 +- .../metabase/iterators_test.go | 12 +-- pkg/local_object_storage/metabase/list.go | 10 +- .../metabase/list_test.go | 10 +- pkg/local_object_storage/metabase/lock.go | 10 +- .../metabase/lock_test.go | 16 +-- pkg/local_object_storage/metabase/mode.go | 2 +- pkg/local_object_storage/metabase/movable.go | 2 +- .../metabase/movable_test.go | 6 +- pkg/local_object_storage/metabase/put.go | 12 +-- pkg/local_object_storage/metabase/put_test.go | 12 +-- pkg/local_object_storage/metabase/select.go | 8 +- .../metabase/select_test.go | 18 ++-- .../metabase/storage_id.go | 2 +- .../metabase/storage_id_test.go | 6 +- pkg/local_object_storage/metabase/util.go | 6 +- pkg/local_object_storage/metabase/version.go | 2 +- pkg/local_object_storage/pilorama/boltdb.go | 6 +- pkg/local_object_storage/pilorama/forest.go | 4 +- .../pilorama/forest_test.go | 6 +- .../pilorama/generic_test.go | 2 +- .../pilorama/interface.go | 6 +- pkg/local_object_storage/pilorama/types.go | 2 +- pkg/local_object_storage/shard/container.go | 2 +- pkg/local_object_storage/shard/control.go | 12 +-- .../shard/control_test.go | 32 +++--- pkg/local_object_storage/shard/delete.go | 8 +- pkg/local_object_storage/shard/delete_test.go | 8 +- pkg/local_object_storage/shard/dump.go | 6 +- pkg/local_object_storage/shard/dump_test.go | 26 ++--- pkg/local_object_storage/shard/errors.go | 4 +- pkg/local_object_storage/shard/exists.go | 6 +- pkg/local_object_storage/shard/gc.go | 12 +-- pkg/local_object_storage/shard/get.go | 16 +-- pkg/local_object_storage/shard/get_test.go | 10 +- pkg/local_object_storage/shard/head.go | 6 +- pkg/local_object_storage/shard/head_test.go | 8 +- pkg/local_object_storage/shard/id.go | 2 +- pkg/local_object_storage/shard/info.go | 10 +- pkg/local_object_storage/shard/inhume.go | 4 +- pkg/local_object_storage/shard/inhume_test.go | 8 +- pkg/local_object_storage/shard/list.go | 8 +- pkg/local_object_storage/shard/list_test.go | 6 +- pkg/local_object_storage/shard/lock.go | 6 +- pkg/local_object_storage/shard/lock_test.go | 24 ++--- .../shard/metrics_test.go | 16 +-- pkg/local_object_storage/shard/mode.go | 4 +- pkg/local_object_storage/shard/move.go | 4 +- pkg/local_object_storage/shard/put.go | 8 +- pkg/local_object_storage/shard/range.go | 14 +-- pkg/local_object_storage/shard/range_test.go | 18 ++-- pkg/local_object_storage/shard/reload_test.go | 26 ++--- pkg/local_object_storage/shard/restore.go | 4 +- pkg/local_object_storage/shard/select.go | 8 +- pkg/local_object_storage/shard/shard.go | 16 +-- pkg/local_object_storage/shard/shard_test.go | 32 +++--- .../shard/shutdown_test.go | 10 +- pkg/local_object_storage/shard/tree.go | 6 +- pkg/local_object_storage/util/splitinfo.go | 2 +- .../util/splitinfo_test.go | 6 +- pkg/local_object_storage/writecache/delete.go | 6 +- pkg/local_object_storage/writecache/flush.go | 12 +-- .../writecache/flush_test.go | 30 +++--- .../writecache/generic_test.go | 4 +- pkg/local_object_storage/writecache/get.go | 10 +- pkg/local_object_storage/writecache/init.go | 10 +- .../writecache/iterate.go | 4 +- pkg/local_object_storage/writecache/mode.go | 4 +- .../writecache/options.go | 10 +- pkg/local_object_storage/writecache/put.go | 4 +- .../writecache/storage.go | 12 +-- .../writecache/writecache.go | 12 +-- pkg/metrics/metrics.go | 2 +- pkg/morph/client/audit/client.go | 2 +- pkg/morph/client/audit/get_result.go | 4 +- pkg/morph/client/audit/list_results.go | 4 +- pkg/morph/client/audit/put_result.go | 4 +- pkg/morph/client/audit/result_test.go | 8 +- pkg/morph/client/balance/balanceOf.go | 4 +- pkg/morph/client/balance/burn.go | 2 +- pkg/morph/client/balance/client.go | 2 +- pkg/morph/client/balance/decimals.go | 2 +- pkg/morph/client/balance/lock.go | 2 +- pkg/morph/client/balance/mint.go | 2 +- pkg/morph/client/balance/transfer.go | 4 +- pkg/morph/client/client.go | 14 +-- pkg/morph/client/constructor.go | 2 +- pkg/morph/client/container/client.go | 2 +- pkg/morph/client/container/delete.go | 4 +- pkg/morph/client/container/eacl.go | 14 +-- pkg/morph/client/container/eacl_set.go | 6 +- pkg/morph/client/container/estimations.go | 2 +- pkg/morph/client/container/get.go | 16 +-- pkg/morph/client/container/list.go | 6 +- pkg/morph/client/container/load.go | 8 +- pkg/morph/client/container/put.go | 10 +- pkg/morph/client/neofs/bind.go | 4 +- pkg/morph/client/neofs/cheque.go | 4 +- pkg/morph/client/neofs/client.go | 4 +- pkg/morph/client/neofsid/addrm_keys.go | 2 +- pkg/morph/client/neofsid/client.go | 2 +- pkg/morph/client/neofsid/keys.go | 4 +- pkg/morph/client/netmap/add_peer.go | 6 +- pkg/morph/client/netmap/client.go | 4 +- pkg/morph/client/netmap/config.go | 2 +- pkg/morph/client/netmap/epoch.go | 2 +- pkg/morph/client/netmap/innerring.go | 2 +- pkg/morph/client/netmap/netmap.go | 6 +- pkg/morph/client/netmap/netmap_test.go | 4 +- pkg/morph/client/netmap/new_epoch.go | 2 +- pkg/morph/client/netmap/snapshot.go | 4 +- pkg/morph/client/netmap/update_state.go | 6 +- pkg/morph/client/nns.go | 26 ++--- pkg/morph/client/notary.go | 2 +- pkg/morph/client/reputation/client.go | 2 +- pkg/morph/client/reputation/get.go | 4 +- pkg/morph/client/reputation/list.go | 2 +- pkg/morph/client/reputation/put.go | 4 +- pkg/morph/client/subnet/admin.go | 2 +- pkg/morph/client/subnet/client.go | 2 +- pkg/morph/client/subnet/clients.go | 2 +- pkg/morph/client/subnet/delete.go | 2 +- pkg/morph/client/subnet/get.go | 2 +- pkg/morph/client/subnet/node.go | 2 +- pkg/morph/client/subnet/nodes.go | 2 +- pkg/morph/client/subnet/put.go | 2 +- pkg/morph/event/balance/lock.go | 4 +- pkg/morph/event/balance/lock_test.go | 2 +- pkg/morph/event/container/delete.go | 6 +- pkg/morph/event/container/delete_notary.go | 2 +- pkg/morph/event/container/delete_test.go | 4 +- pkg/morph/event/container/eacl.go | 4 +- pkg/morph/event/container/eacl_notary.go | 2 +- pkg/morph/event/container/eacl_test.go | 2 +- pkg/morph/event/container/estimates.go | 4 +- pkg/morph/event/container/estimates_test.go | 2 +- pkg/morph/event/container/put.go | 6 +- pkg/morph/event/container/put_notary.go | 2 +- pkg/morph/event/container/put_test.go | 4 +- pkg/morph/event/listener.go | 6 +- pkg/morph/event/neofs/bind.go | 6 +- pkg/morph/event/neofs/bind_test.go | 4 +- pkg/morph/event/neofs/cheque.go | 8 +- pkg/morph/event/neofs/cheque_test.go | 4 +- pkg/morph/event/neofs/config.go | 6 +- pkg/morph/event/neofs/config_test.go | 4 +- pkg/morph/event/neofs/deposit.go | 8 +- pkg/morph/event/neofs/deposit_test.go | 4 +- pkg/morph/event/neofs/ir_update.go | 6 +- pkg/morph/event/neofs/ir_update_test.go | 4 +- pkg/morph/event/neofs/unbind.go | 4 +- pkg/morph/event/neofs/unbind_test.go | 4 +- pkg/morph/event/neofs/withdraw.go | 8 +- pkg/morph/event/neofs/withdraw_test.go | 4 +- pkg/morph/event/netmap/add_peer.go | 4 +- pkg/morph/event/netmap/add_peer_notary.go | 2 +- pkg/morph/event/netmap/add_peer_test.go | 2 +- pkg/morph/event/netmap/epoch.go | 4 +- pkg/morph/event/netmap/epoch_test.go | 2 +- pkg/morph/event/netmap/update_peer.go | 6 +- pkg/morph/event/netmap/update_peer_notary.go | 2 +- pkg/morph/event/netmap/update_peer_test.go | 4 +- pkg/morph/event/notary_preparator.go | 2 +- pkg/morph/event/notary_preparator_test.go | 2 +- pkg/morph/event/reputation/put.go | 6 +- pkg/morph/event/reputation/put_notary.go | 2 +- pkg/morph/event/reputation/put_test.go | 6 +- pkg/morph/event/rolemanagement/designate.go | 2 +- pkg/morph/event/subnet/delete.go | 4 +- pkg/morph/event/subnet/delete_test.go | 2 +- pkg/morph/event/subnet/put.go | 4 +- pkg/morph/event/subnet/put_test.go | 2 +- pkg/morph/event/subnet/remove_node.go | 4 +- pkg/morph/event/subnet/remove_node_test.go | 4 +- pkg/morph/event/utils.go | 6 +- pkg/morph/subscriber/subscriber.go | 4 +- pkg/morph/timer/block_test.go | 2 +- pkg/network/address.go | 2 +- pkg/network/address_test.go | 2 +- pkg/network/cache/client.go | 6 +- pkg/network/cache/multi.go | 8 +- pkg/network/group.go | 2 +- pkg/network/group_test.go | 8 +- .../transport/accounting/grpc/service.go | 6 +- .../transport/container/grpc/service.go | 6 +- pkg/network/transport/netmap/grpc/service.go | 6 +- pkg/network/transport/object/grpc/get.go | 4 +- pkg/network/transport/object/grpc/range.go | 4 +- pkg/network/transport/object/grpc/search.go | 4 +- pkg/network/transport/object/grpc/service.go | 8 +- .../transport/reputation/grpc/service.go | 6 +- pkg/network/transport/session/grpc/service.go | 6 +- pkg/network/validation.go | 2 +- pkg/network/validation_test.go | 2 +- pkg/services/accounting/executor.go | 2 +- pkg/services/accounting/morph/executor.go | 8 +- pkg/services/accounting/response.go | 6 +- pkg/services/accounting/server.go | 2 +- pkg/services/accounting/sign.go | 4 +- pkg/services/audit/auditor/context.go | 16 +-- pkg/services/audit/auditor/pdp.go | 10 +- pkg/services/audit/auditor/pop.go | 6 +- pkg/services/audit/auditor/por.go | 14 +-- pkg/services/audit/auditor/util.go | 2 +- pkg/services/audit/report.go | 6 +- pkg/services/audit/task.go | 8 +- pkg/services/audit/taskmanager/listen.go | 4 +- pkg/services/audit/taskmanager/manager.go | 8 +- pkg/services/audit/taskmanager/push.go | 2 +- .../announcement/load/controller/calls.go | 4 +- .../load/controller/calls_test.go | 6 +- .../announcement/load/controller/deps.go | 2 +- .../announcement/load/controller/opts.go | 2 +- .../announcement/load/controller/util.go | 2 +- .../announcement/load/route/calls.go | 4 +- .../container/announcement/load/route/deps.go | 4 +- .../container/announcement/load/route/opts.go | 2 +- .../load/route/placement/calls.go | 6 +- .../announcement/load/route/placement/deps.go | 4 +- .../announcement/load/route/router.go | 2 +- .../container/announcement/load/route/util.go | 2 +- .../announcement/load/storage/storage.go | 4 +- .../announcement/load/storage/storage_test.go | 4 +- pkg/services/container/executor.go | 4 +- pkg/services/container/morph/executor.go | 18 ++-- pkg/services/container/morph/executor_test.go | 28 ++--- pkg/services/container/response.go | 6 +- pkg/services/container/server.go | 2 +- pkg/services/container/sign.go | 4 +- pkg/services/control/convert.go | 4 +- pkg/services/control/ir/convert.go | 4 +- pkg/services/control/ir/rpc.go | 4 +- pkg/services/control/ir/server/calls.go | 2 +- pkg/services/control/ir/server/deps.go | 2 +- pkg/services/control/ir/server/sign.go | 14 +-- pkg/services/control/ir/service.pb.go | Bin 14528 -> 14529 bytes pkg/services/control/ir/service.proto | 2 +- pkg/services/control/ir/service_grpc.pb.go | Bin 3853 -> 3854 bytes pkg/services/control/ir/service_neofs.pb.go | Bin 5249 -> 5256 bytes pkg/services/control/ir/service_test.go | 2 +- pkg/services/control/ir/types.pb.go | Bin 7733 -> 7734 bytes pkg/services/control/ir/types.proto | 2 +- pkg/services/control/ir/types_neofs.pb.go | Bin 1055 -> 1062 bytes pkg/services/control/rpc.go | 4 +- pkg/services/control/server/dump.go | 4 +- pkg/services/control/server/evacuate.go | 14 +-- pkg/services/control/server/flush_cache.go | 4 +- pkg/services/control/server/gc.go | 6 +- pkg/services/control/server/healthcheck.go | 2 +- pkg/services/control/server/helpers.go | 2 +- pkg/services/control/server/list_shards.go | 6 +- pkg/services/control/server/restore.go | 4 +- pkg/services/control/server/server.go | 10 +- .../control/server/set_netmap_status.go | 2 +- pkg/services/control/server/set_shard_mode.go | 4 +- pkg/services/control/server/sign.go | 14 +-- .../control/server/syncronize_tree.go | 4 +- pkg/services/control/service.pb.go | Bin 111678 -> 111679 bytes pkg/services/control/service.proto | 2 +- pkg/services/control/service_grpc.pb.go | Bin 18212 -> 18213 bytes pkg/services/control/service_neofs.pb.go | Bin 52785 -> 52792 bytes pkg/services/control/service_test.go | 2 +- pkg/services/control/types.pb.go | Bin 29344 -> 29345 bytes pkg/services/control/types.proto | 2 +- pkg/services/control/types_neofs.pb.go | Bin 6910 -> 6917 bytes pkg/services/control/types_test.go | 6 +- pkg/services/netmap/executor.go | 10 +- pkg/services/netmap/response.go | 6 +- pkg/services/netmap/server.go | 2 +- pkg/services/netmap/sign.go | 4 +- pkg/services/notificator/deps.go | 2 +- pkg/services/notificator/nats/options.go | 2 +- pkg/services/notificator/nats/service.go | 4 +- pkg/services/notificator/service.go | 4 +- pkg/services/object/acl/acl.go | 28 ++--- pkg/services/object/acl/acl_test.go | 16 +-- pkg/services/object/acl/eacl/v2/eacl_test.go | 14 +-- pkg/services/object/acl/eacl/v2/headers.go | 18 ++-- pkg/services/object/acl/eacl/v2/localstore.go | 6 +- pkg/services/object/acl/eacl/v2/object.go | 10 +- pkg/services/object/acl/eacl/v2/opts.go | 6 +- pkg/services/object/acl/eacl/v2/xheader.go | 4 +- pkg/services/object/acl/v2/classifier.go | 14 +-- pkg/services/object/acl/v2/errors.go | 2 +- pkg/services/object/acl/v2/opts.go | 8 +- pkg/services/object/acl/v2/request.go | 14 +-- pkg/services/object/acl/v2/service.go | 20 ++-- pkg/services/object/acl/v2/types.go | 2 +- pkg/services/object/acl/v2/util.go | 20 ++-- pkg/services/object/acl/v2/util_test.go | 18 ++-- pkg/services/object/common.go | 4 +- pkg/services/object/delete/delete.go | 2 +- pkg/services/object/delete/exec.go | 12 +-- pkg/services/object/delete/local.go | 4 +- pkg/services/object/delete/prm.go | 4 +- pkg/services/object/delete/service.go | 18 ++-- pkg/services/object/delete/util.go | 10 +- pkg/services/object/delete/v2/service.go | 4 +- pkg/services/object/delete/v2/util.go | 10 +- pkg/services/object/get/assemble.go | 6 +- pkg/services/object/get/container.go | 2 +- pkg/services/object/get/exec.go | 16 +-- pkg/services/object/get/get.go | 4 +- pkg/services/object/get/get_test.go | 30 +++--- pkg/services/object/get/local.go | 4 +- pkg/services/object/get/prm.go | 8 +- pkg/services/object/get/remote.go | 6 +- pkg/services/object/get/service.go | 18 ++-- pkg/services/object/get/util.go | 14 +-- pkg/services/object/get/v2/service.go | 10 +- pkg/services/object/get/v2/streamer.go | 6 +- pkg/services/object/get/v2/util.go | 46 ++++---- pkg/services/object/head/prm.go | 2 +- pkg/services/object/head/remote.go | 14 +-- pkg/services/object/internal/client/client.go | 16 +-- pkg/services/object/internal/key.go | 4 +- pkg/services/object/metrics.go | 4 +- pkg/services/object/put/distributed.go | 14 +-- pkg/services/object/put/local.go | 8 +- pkg/services/object/put/prm.go | 10 +- pkg/services/object/put/remote.go | 16 +-- pkg/services/object/put/res.go | 2 +- pkg/services/object/put/service.go | 14 +-- pkg/services/object/put/streamer.go | 16 +-- pkg/services/object/put/v2/service.go | 6 +- pkg/services/object/put/v2/streamer.go | 20 ++-- pkg/services/object/put/v2/util.go | 10 +- pkg/services/object/put/validation.go | 10 +- pkg/services/object/response.go | 6 +- pkg/services/object/search/container.go | 2 +- pkg/services/object/search/exec.go | 10 +- pkg/services/object/search/prm.go | 10 +- pkg/services/object/search/search_test.go | 22 ++-- pkg/services/object/search/service.go | 16 +-- pkg/services/object/search/util.go | 16 +-- pkg/services/object/search/v2/service.go | 8 +- pkg/services/object/search/v2/streamer.go | 8 +- pkg/services/object/search/v2/util.go | 30 +++--- pkg/services/object/server.go | 4 +- pkg/services/object/sign.go | 4 +- pkg/services/object/transport_splitter.go | 4 +- pkg/services/object/util/chain.go | 4 +- pkg/services/object/util/key.go | 8 +- pkg/services/object/util/key_test.go | 20 ++-- pkg/services/object/util/log.go | 4 +- pkg/services/object/util/placement.go | 14 +-- pkg/services/object/util/prm.go | 6 +- .../object_manager/placement/netmap.go | 8 +- .../object_manager/placement/traverser.go | 10 +- .../placement/traverser_test.go | 12 +-- .../object_manager/storagegroup/collect.go | 14 +-- .../object_manager/storagegroup/search.go | 2 +- .../object_manager/tombstone/checker.go | 8 +- .../object_manager/tombstone/constructor.go | 2 +- .../object_manager/tombstone/source/source.go | 12 +-- .../object_manager/transformer/fmt.go | 10 +- .../object_manager/transformer/transformer.go | 8 +- .../object_manager/transformer/types.go | 4 +- pkg/services/policer/check.go | 18 ++-- pkg/services/policer/check_test.go | 2 +- pkg/services/policer/policer.go | 16 +-- pkg/services/policer/process.go | 10 +- pkg/services/policer/queue.go | 4 +- pkg/services/replicator/process.go | 6 +- pkg/services/replicator/replicator.go | 6 +- pkg/services/replicator/task.go | 6 +- pkg/services/reputation/common/deps.go | 4 +- pkg/services/reputation/common/managers.go | 10 +- .../reputation/common/router/calls.go | 4 +- pkg/services/reputation/common/router/deps.go | 4 +- pkg/services/reputation/common/router/opts.go | 2 +- .../reputation/common/router/router.go | 4 +- pkg/services/reputation/common/router/util.go | 4 +- .../eigentrust/calculator/calculator.go | 6 +- .../reputation/eigentrust/calculator/calls.go | 6 +- .../reputation/eigentrust/calculator/deps.go | 6 +- .../reputation/eigentrust/calculator/opts.go | 2 +- .../reputation/eigentrust/controller/calls.go | 2 +- .../eigentrust/controller/controller.go | 2 +- .../reputation/eigentrust/controller/opts.go | 2 +- .../reputation/eigentrust/iteration.go | 2 +- .../reputation/eigentrust/routes/builder.go | 4 +- .../reputation/eigentrust/routes/calls.go | 4 +- .../eigentrust/storage/consumers/calls.go | 8 +- .../eigentrust/storage/daughters/calls.go | 6 +- .../reputation/local/controller/calls.go | 6 +- .../reputation/local/controller/controller.go | 2 +- .../reputation/local/controller/deps.go | 4 +- .../reputation/local/controller/opts.go | 2 +- .../reputation/local/controller/util.go | 2 +- .../reputation/local/routes/builder.go | 4 +- pkg/services/reputation/local/routes/calls.go | 4 +- .../reputation/local/storage/calls.go | 4 +- pkg/services/reputation/rpc/response.go | 6 +- pkg/services/reputation/rpc/server.go | 2 +- pkg/services/reputation/rpc/sign.go | 4 +- pkg/services/reputation/trust.go | 2 +- pkg/services/session/executor.go | 4 +- pkg/services/session/response.go | 6 +- pkg/services/session/server.go | 2 +- pkg/services/session/sign.go | 4 +- .../session/storage/persistent/executor.go | 6 +- .../storage/persistent/executor_test.go | 6 +- .../session/storage/persistent/options.go | 2 +- .../session/storage/persistent/storage.go | 6 +- .../session/storage/persistent/util.go | 2 +- .../session/storage/temporary/executor.go | 6 +- .../session/storage/temporary/storage.go | 4 +- pkg/services/tree/cache.go | 2 +- pkg/services/tree/container.go | 8 +- pkg/services/tree/drop.go | 2 +- pkg/services/tree/getsubtree_test.go | 4 +- pkg/services/tree/options.go | 10 +- pkg/services/tree/redirect.go | 2 +- pkg/services/tree/replicator.go | 6 +- pkg/services/tree/service.go | 10 +- pkg/services/tree/service.pb.go | Bin 118636 -> 118637 bytes pkg/services/tree/service.proto | 2 +- pkg/services/tree/service_grpc.pb.go | Bin 18231 -> 18232 bytes pkg/services/tree/service_neofs.pb.go | Bin 57224 -> 57231 bytes pkg/services/tree/signature.go | 28 ++--- pkg/services/tree/signature_test.go | 24 ++--- pkg/services/tree/sync.go | 8 +- pkg/services/tree/types.pb.go | Bin 9843 -> 9844 bytes pkg/services/tree/types.proto | 2 +- pkg/services/tree/types_neofs.pb.go | Bin 3011 -> 3018 bytes pkg/services/util/response/client_stream.go | 2 +- pkg/services/util/response/server_stream.go | 2 +- pkg/services/util/response/service.go | 10 +- pkg/services/util/response/unary.go | 2 +- pkg/services/util/sign.go | 6 +- pkg/util/attributes/parser.go | 2 +- pkg/util/attributes/parser_test.go | 4 +- pkg/util/locode/column/coordinates.go | 2 +- pkg/util/locode/column/country.go | 2 +- pkg/util/locode/column/location.go | 2 +- pkg/util/locode/db/airports/calls.go | 4 +- pkg/util/locode/db/boltdb/calls.go | 4 +- .../locode/db/continents/geojson/calls.go | 2 +- pkg/util/locode/db/country.go | 2 +- pkg/util/locode/db/db.go | 2 +- pkg/util/locode/db/location.go | 2 +- pkg/util/locode/db/point.go | 2 +- pkg/util/locode/db/point_test.go | 2 +- pkg/util/locode/db/record.go | 4 +- pkg/util/locode/table/csv/calls.go | 4 +- pkg/util/logger/test/logger.go | 2 +- pkg/util/precision/converter_test.go | 2 +- pkg/util/salt_test.go | 2 +- pkg/util/state/storage_test.go | 2 +- 934 files changed, 3407 insertions(+), 3398 deletions(-) rename cmd/{neofs-adm => frostfs-adm}/README.md (93%) rename cmd/{neofs-adm => frostfs-adm}/docs/deploy.md (88%) rename cmd/{neofs-adm => frostfs-adm}/docs/subnetwork-creation.md (85%) rename cmd/{neofs-adm => frostfs-adm}/docs/subnetwork-usage.md (92%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/config/config.go (95%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/config/config_test.go (93%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/config/root.go (59%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/config/util.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/balance.go (97%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/config.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/container.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/deploy.go (97%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/download.go (89%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/dump_hashes.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/epoch.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/generate.go (97%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/generate_test.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/group.go (96%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/initialize.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/initialize_deploy.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/initialize_nns.go (96%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/initialize_register.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/initialize_roles.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/initialize_test.go (94%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/initialize_transfer.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/internal/types.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/internal/types.pb.go (60%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/internal/types.proto (77%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/local_client.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/n3client.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/notary.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/policy.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/remove_node.go (94%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/root.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/subnet.go (98%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/morph/update.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/root.go (75%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/storagecfg/config.go (100%) rename cmd/{neofs-adm => frostfs-adm}/internal/modules/storagecfg/root.go (97%) rename cmd/{neofs-adm => frostfs-adm}/main.go (59%) rename cmd/{neofs-cli => frostfs-cli}/docs/sessions.md (93%) rename cmd/{neofs-cli => frostfs-cli}/internal/client/client.go (97%) rename cmd/{neofs-cli => frostfs-cli}/internal/client/doc.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/client/prm.go (86%) rename cmd/{neofs-cli => frostfs-cli}/internal/client/sdk.go (84%) rename cmd/{neofs-cli => frostfs-cli}/internal/common/eacl.go (86%) rename cmd/{neofs-cli => frostfs-cli}/internal/common/epoch.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/common/exit.go (92%) rename cmd/{neofs-cli => frostfs-cli}/internal/common/json.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/common/netmap.go (95%) rename cmd/{neofs-cli => frostfs-cli}/internal/common/token.go (96%) rename cmd/{neofs-cli => frostfs-cli}/internal/common/verbose.go (88%) rename cmd/{neofs-cli => frostfs-cli}/internal/commonflags/api.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/commonflags/expiration.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/commonflags/flags.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/commonflags/json.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/commonflags/session.go (100%) rename cmd/{neofs-cli => frostfs-cli}/internal/key/key_test.go (97%) rename cmd/{neofs-cli => frostfs-cli}/internal/key/raw.go (91%) rename cmd/{neofs-cli => frostfs-cli}/internal/key/wallet.go (100%) create mode 100644 cmd/frostfs-cli/main.go rename cmd/{neofs-cli => frostfs-cli}/modules/accounting/balance.go (80%) rename cmd/{neofs-cli => frostfs-cli}/modules/accounting/root.go (89%) rename cmd/{neofs-cli => frostfs-cli}/modules/acl/basic/print.go (75%) rename cmd/{neofs-cli => frostfs-cli}/modules/acl/basic/root.go (100%) rename cmd/{neofs-cli => frostfs-cli}/modules/acl/extended/create.go (82%) rename cmd/{neofs-cli => frostfs-cli}/modules/acl/extended/create_test.go (95%) rename cmd/{neofs-cli => frostfs-cli}/modules/acl/extended/print.go (84%) rename cmd/{neofs-cli => frostfs-cli}/modules/acl/extended/root.go (100%) rename cmd/{neofs-cli => frostfs-cli}/modules/acl/root.go (58%) rename cmd/{neofs-cli => frostfs-cli}/modules/bearer/create.go (90%) rename cmd/{neofs-cli => frostfs-cli}/modules/bearer/root.go (100%) create mode 100644 cmd/frostfs-cli/modules/completion.go rename cmd/{neofs-cli => frostfs-cli}/modules/container/create.go (91%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/delete.go (88%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/get.go (87%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/get_eacl.go (83%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/list.go (83%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/list_objects.go (80%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/nodes.go (76%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/root.go (94%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/set_eacl.go (89%) rename cmd/{neofs-cli => frostfs-cli}/modules/container/util.go (84%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/drop_objects.go (83%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/evacuate_shard.go (84%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/flush_cache.go (81%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/healthcheck.go (79%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/root.go (92%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/set_netmap_status.go (86%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/shards.go (100%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/shards_dump.go (85%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/shards_list.go (88%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/shards_restore.go (85%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/shards_set_mode.go (94%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/synchronize_tree.go (78%) rename cmd/{neofs-cli => frostfs-cli}/modules/control/util.go (75%) rename cmd/{neofs-cli => frostfs-cli}/modules/netmap/get_epoch.go (67%) rename cmd/{neofs-cli => frostfs-cli}/modules/netmap/netinfo.go (86%) rename cmd/{neofs-cli => frostfs-cli}/modules/netmap/nodeinfo.go (80%) rename cmd/{neofs-cli => frostfs-cli}/modules/netmap/root.go (87%) rename cmd/{neofs-cli => frostfs-cli}/modules/netmap/snapshot.go (69%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/delete.go (81%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/get.go (87%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/hash.go (86%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/head.go (89%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/lock.go (82%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/put.go (92%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/range.go (89%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/root.go (92%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/search.go (87%) rename cmd/{neofs-cli => frostfs-cli}/modules/object/util.go (94%) rename cmd/{neofs-cli => frostfs-cli}/modules/root.go (66%) rename cmd/{neofs-cli => frostfs-cli}/modules/session/create.go (86%) rename cmd/{neofs-cli => frostfs-cli}/modules/session/root.go (100%) rename cmd/{neofs-cli => frostfs-cli}/modules/storagegroup/delete.go (67%) rename cmd/{neofs-cli => frostfs-cli}/modules/storagegroup/get.go (74%) rename cmd/{neofs-cli => frostfs-cli}/modules/storagegroup/list.go (65%) rename cmd/{neofs-cli => frostfs-cli}/modules/storagegroup/put.go (80%) rename cmd/{neofs-cli => frostfs-cli}/modules/storagegroup/root.go (84%) rename cmd/{neofs-cli => frostfs-cli}/modules/storagegroup/util.go (77%) rename cmd/{neofs-cli => frostfs-cli}/modules/tree/add.go (85%) rename cmd/{neofs-cli => frostfs-cli}/modules/tree/add_by_path.go (85%) rename cmd/{neofs-cli => frostfs-cli}/modules/tree/client.go (83%) rename cmd/{neofs-cli => frostfs-cli}/modules/tree/get_by_path.go (85%) rename cmd/{neofs-cli => frostfs-cli}/modules/tree/list.go (78%) rename cmd/{neofs-cli => frostfs-cli}/modules/tree/root.go (90%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/acl.go (98%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/convert.go (100%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/convert_eacl.go (91%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/keyer.go (94%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/locode.go (100%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/locode_generate.go (85%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/locode_info.go (86%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/root.go (89%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/sign.go (100%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/sign_bearer.go (86%) rename cmd/{neofs-cli => frostfs-cli}/modules/util/sign_session.go (86%) rename cmd/{neofs-ir => frostfs-ir}/defaults.go (96%) rename cmd/{neofs-ir => frostfs-ir}/main.go (90%) rename cmd/{neofs-lens => frostfs-lens}/internal/blobovnicza/inspect.go (79%) rename cmd/{neofs-lens => frostfs-lens}/internal/blobovnicza/list.go (76%) rename cmd/{neofs-lens => frostfs-lens}/internal/blobovnicza/root.go (77%) rename cmd/{neofs-lens => frostfs-lens}/internal/errors.go (100%) rename cmd/{neofs-lens => frostfs-lens}/internal/flags.go (100%) rename cmd/{neofs-lens => frostfs-lens}/internal/meta/inspect.go (82%) rename cmd/{neofs-lens => frostfs-lens}/internal/meta/list-garbage.go (82%) rename cmd/{neofs-lens => frostfs-lens}/internal/meta/list-graveyard.go (84%) rename cmd/{neofs-lens => frostfs-lens}/internal/meta/root.go (83%) rename cmd/{neofs-lens => frostfs-lens}/internal/printers.go (89%) rename cmd/{neofs-lens => frostfs-lens}/internal/writecache/inspect.go (79%) rename cmd/{neofs-lens => frostfs-lens}/internal/writecache/list.go (76%) rename cmd/{neofs-lens => frostfs-lens}/internal/writecache/root.go (77%) rename cmd/{neofs-lens => frostfs-lens}/root.go (70%) rename cmd/{neofs-node => frostfs-node}/accounting.go (60%) rename cmd/{neofs-node => frostfs-node}/attributes.go (59%) rename cmd/{neofs-node => frostfs-node}/cache.go (93%) rename cmd/{neofs-node => frostfs-node}/config.go (87%) rename cmd/{neofs-node => frostfs-node}/config/apiclient/config.go (95%) rename cmd/{neofs-node => frostfs-node}/config/apiclient/config_test.go (79%) rename cmd/{neofs-node => frostfs-node}/config/calls.go (100%) rename cmd/{neofs-node => frostfs-node}/config/calls_test.go (88%) rename cmd/{neofs-node => frostfs-node}/config/cast.go (100%) rename cmd/{neofs-node => frostfs-node}/config/cast_test.go (96%) rename cmd/{neofs-node => frostfs-node}/config/config.go (94%) rename cmd/{neofs-node => frostfs-node}/config/contracts/config.go (96%) rename cmd/{neofs-node => frostfs-node}/config/contracts/config_test.go (88%) rename cmd/{neofs-node => frostfs-node}/config/control/config.go (95%) rename cmd/{neofs-node => frostfs-node}/config/control/config_test.go (81%) rename cmd/{neofs-node => frostfs-node}/config/engine/config.go (90%) rename cmd/{neofs-node => frostfs-node}/config/engine/config_test.go (88%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/blobstor/blobovnicza/config.go (89%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/blobstor/config.go (68%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/blobstor/fstree/config.go (86%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/blobstor/storage/config.go (93%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/boltdb/boltdb.go (95%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/config.go (82%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/gc/config.go (95%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/metabase/config.go (81%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/pilorama/config.go (96%) rename cmd/{neofs-node => frostfs-node}/config/engine/shard/writecache/config.go (94%) rename cmd/{neofs-node => frostfs-node}/config/grpc/config.go (97%) rename cmd/{neofs-node => frostfs-node}/config/grpc/config_test.go (73%) rename cmd/{neofs-node => frostfs-node}/config/internal/env.go (100%) rename cmd/{neofs-node => frostfs-node}/config/internal/env_test.go (73%) rename cmd/{neofs-node => frostfs-node}/config/logger/config.go (86%) rename cmd/{neofs-node => frostfs-node}/config/logger/config_test.go (71%) rename cmd/{neofs-node => frostfs-node}/config/metrics/config.go (94%) rename cmd/{neofs-node => frostfs-node}/config/metrics/config_test.go (80%) rename cmd/{neofs-node => frostfs-node}/config/morph/config.go (95%) rename cmd/{neofs-node => frostfs-node}/config/morph/config_test.go (80%) rename cmd/{neofs-node => frostfs-node}/config/node/config.go (96%) rename cmd/{neofs-node => frostfs-node}/config/node/config_test.go (92%) rename cmd/{neofs-node => frostfs-node}/config/node/wallet.json (100%) rename cmd/{neofs-node => frostfs-node}/config/node/wallet.key (100%) rename cmd/{neofs-node => frostfs-node}/config/object/config.go (93%) rename cmd/{neofs-node => frostfs-node}/config/object/config_test.go (72%) rename cmd/{neofs-node => frostfs-node}/config/opts.go (100%) rename cmd/{neofs-node => frostfs-node}/config/policer/config.go (89%) rename cmd/{neofs-node => frostfs-node}/config/policer/config_test.go (72%) rename cmd/{neofs-node => frostfs-node}/config/profiler/config.go (94%) rename cmd/{neofs-node => frostfs-node}/config/profiler/config_test.go (80%) rename cmd/{neofs-node => frostfs-node}/config/replicator/config.go (91%) rename cmd/{neofs-node => frostfs-node}/config/replicator/config_test.go (75%) rename cmd/{neofs-node => frostfs-node}/config/test/config.go (95%) rename cmd/{neofs-node => frostfs-node}/config/test/config.json (100%) rename cmd/{neofs-node => frostfs-node}/config/test/config.yaml (100%) rename cmd/{neofs-node => frostfs-node}/config/tree/config.go (95%) rename cmd/{neofs-node => frostfs-node}/config/tree/config_test.go (80%) rename cmd/{neofs-node => frostfs-node}/container.go (91%) rename cmd/{neofs-node => frostfs-node}/control.go (85%) rename cmd/{neofs-node => frostfs-node}/grpc.go (95%) rename cmd/{neofs-node => frostfs-node}/main.go (93%) rename cmd/{neofs-node => frostfs-node}/metrics.go (85%) rename cmd/{neofs-node => frostfs-node}/morph.go (94%) rename cmd/{neofs-node => frostfs-node}/netmap.go (92%) rename cmd/{neofs-node => frostfs-node}/notificator.go (86%) rename cmd/{neofs-node => frostfs-node}/object.go (83%) rename cmd/{neofs-node => frostfs-node}/pprof.go (84%) rename cmd/{neofs-node => frostfs-node}/reputation.go (81%) rename cmd/{neofs-node => frostfs-node}/reputation/common/remote.go (86%) rename cmd/{neofs-node => frostfs-node}/reputation/common/util.go (94%) rename cmd/{neofs-node => frostfs-node}/reputation/intermediate/calculator.go (75%) rename cmd/{neofs-node => frostfs-node}/reputation/intermediate/consumers.go (76%) rename cmd/{neofs-node => frostfs-node}/reputation/intermediate/contract.go (87%) rename cmd/{neofs-node => frostfs-node}/reputation/intermediate/daughters.go (80%) rename cmd/{neofs-node => frostfs-node}/reputation/intermediate/remote.go (82%) rename cmd/{neofs-node => frostfs-node}/reputation/intermediate/storage.go (83%) rename cmd/{neofs-node => frostfs-node}/reputation/internal/client/client.go (92%) rename cmd/{neofs-node => frostfs-node}/reputation/internal/client/doc.go (100%) rename cmd/{neofs-node => frostfs-node}/reputation/local/remote.go (81%) rename cmd/{neofs-node => frostfs-node}/reputation/local/storage.go (78%) rename cmd/{neofs-node => frostfs-node}/reputation/ticker/fixed.go (100%) rename cmd/{neofs-node => frostfs-node}/reputation/ticker/fixed_test.go (100%) rename cmd/{neofs-node => frostfs-node}/session.go (63%) rename cmd/{neofs-node => frostfs-node}/timers.go (90%) rename cmd/{neofs-node => frostfs-node}/tree.go (80%) rename cmd/{neofs-node => frostfs-node}/validate.go (80%) rename cmd/{neofs-node => frostfs-node}/validate_test.go (87%) rename cmd/{neofs-node => frostfs-node}/worker.go (100%) delete mode 100644 cmd/neofs-cli/main.go delete mode 100644 cmd/neofs-cli/modules/completion.go rename debian/{neofs-cli.docs => frostfs-cli.docs} (63%) create mode 100644 debian/frostfs-cli.install rename debian/{neofs-cli.manpages => frostfs-cli.manpages} (100%) create mode 100644 debian/frostfs-ir.dirs rename debian/{neofs-ir.docs => frostfs-ir.docs} (100%) create mode 100644 debian/frostfs-ir.install rename debian/{neofs-ir.postinst => frostfs-ir.postinst} (54%) rename debian/{neofs-ir.postrm => frostfs-ir.postrm} (96%) rename debian/{neofs-ir.preinst => frostfs-ir.preinst} (100%) rename debian/{neofs-ir.prerm => frostfs-ir.prerm} (100%) rename debian/{neofs-ir.service => frostfs-ir.service} (55%) create mode 100644 debian/frostfs-storage.dirs rename debian/{neofs-storage.docs => frostfs-storage.docs} (100%) create mode 100644 debian/frostfs-storage.install create mode 100644 debian/frostfs-storage.postinst rename debian/{neofs-storage.postrm => frostfs-storage.postrm} (95%) rename debian/{neofs-storage.preinst => frostfs-storage.preinst} (100%) rename debian/{neofs-storage.prerm => frostfs-storage.prerm} (100%) rename debian/{neofs-storage.service => frostfs-storage.service} (53%) delete mode 100644 debian/neofs-cli.install delete mode 100644 debian/neofs-ir.dirs delete mode 100644 debian/neofs-ir.install delete mode 100644 debian/neofs-storage.dirs delete mode 100644 debian/neofs-storage.install delete mode 100644 debian/neofs-storage.postinst diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 66a50c933..439ecbe26 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -1,4 +1,4 @@ -name: neofs-node tests +name: frostfs-node tests on: push: diff --git a/Makefile b/Makefile index ac01f0a9e..2133e1fef 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL = bash REPO ?= $(shell go list -m) VERSION ?= $(shell git describe --tags --dirty --match "v*" --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop") -HUB_IMAGE ?= nspccdev/neofs +HUB_IMAGE ?= truecloudlab/frostfs HUB_TAG ?= "$(shell echo ${VERSION} | sed 's/^v//')" GO_VERSION ?= 1.17 @@ -29,7 +29,7 @@ PKG_VERSION ?= $(shell echo $(VERSION) | sed "s/^v//" | \ prepare-release debpackage # To build a specific binary, use it's name prefix with bin/ as a target -# For example `make bin/neofs-node` will build only storage node binary +# For example `make bin/frostfs-node` will build only storage node binary # Just `make` will build all possible binaries all: $(DIRS) $(BINS) @@ -50,7 +50,7 @@ $(DIRS): # Prepare binaries and archives for release .ONESHELL: prepare-release: docker/all - @for file in `ls -1 $(BIN)/neofs-*`; do + @for file in `ls -1 $(BIN)/frostfs-*`; do cp $$file $(RELEASE)/`basename $$file`-$(ARCH) strip $(RELEASE)/`basename $$file`-$(ARCH) tar -czf $(RELEASE)/`basename $$file`-$(ARCH).tar.gz $(RELEASE)/`basename $$file`-$(ARCH) @@ -67,17 +67,17 @@ dep: # Regenerate proto files: protoc: - @GOPRIVATE=github.com/nspcc-dev go mod vendor + @GOPRIVATE=github.com/TrueCloudLab go mod vendor # Install specific version for protobuf lib @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/golang/protobuf | xargs go install -v - @GOBIN=$(abspath $(BIN)) go install -mod=mod -v github.com/nspcc-dev/neofs-api-go/v2/util/protogen + @GOBIN=$(abspath $(BIN)) go install -mod=mod -v github.com/TrueCloudLab/frostfs-api-go/v2/util/protogen # Protoc generate @for f in `find . -type f -name '*.proto' -not -path './vendor/*'`; do \ echo "⇒ Processing $$f "; \ protoc \ --proto_path=.:./vendor:/usr/local/include \ - --plugin=protoc-gen-go-neofs=$(BIN)/protogen \ - --go-neofs_out=. --go-neofs_opt=paths=source_relative \ + --plugin=protoc-gen-go-frostfs=$(BIN)/protogen \ + --go-frostfs_out=. --go-frostfs_opt=paths=source_relative \ --go_out=. --go_opt=paths=source_relative \ --go-grpc_opt=require_unimplemented_servers=false \ --go-grpc_out=. --go-grpc_opt=paths=source_relative $$f; \ @@ -152,7 +152,7 @@ clean: # Package for Debian debpackage: - dch --package neofs-node \ + dch --package frostfs-node \ --controlmaint \ --newversion $(PKG_VERSION) \ --distribution $(OS_RELEASE) \ diff --git a/cmd/neofs-adm/README.md b/cmd/frostfs-adm/README.md similarity index 93% rename from cmd/neofs-adm/README.md rename to cmd/frostfs-adm/README.md index a80d114e2..13bcd1117 100644 --- a/cmd/neofs-adm/README.md +++ b/cmd/frostfs-adm/README.md @@ -10,15 +10,15 @@ Storage nodes. ## Build -To build binary locally, use `make bin/neofs-adm` command. +To build binary locally, use `make bin/frostfs-adm` command. -For clean build inside a docker container, use `make docker/bin/neofs-adm`. +For clean build inside a docker container, use `make docker/bin/frostfs-adm`. Build docker image with `make image-adm`. -At NeoFS private install deployment, neofs-adm requires compiled NeoFS +At NeoFS private install deployment, frostfs-adm requires compiled NeoFS contracts. Find them in the latest release of -[neofs-contract repository](https://github.com/nspcc-dev/neofs-contract/releases). +[frostfs-contract repository](https://github.com/TrueCloudLab/frostfs-contract/releases). ## Commands diff --git a/cmd/neofs-adm/docs/deploy.md b/cmd/frostfs-adm/docs/deploy.md similarity index 88% rename from cmd/neofs-adm/docs/deploy.md rename to cmd/frostfs-adm/docs/deploy.md index 40f23945f..75d964d23 100644 --- a/cmd/neofs-adm/docs/deploy.md +++ b/cmd/frostfs-adm/docs/deploy.md @@ -2,15 +2,15 @@ This is a short guide on how to deploy a private NeoFS storage network on bare metal without docker images. This guide does not cover details on how to start -consensus, Alphabet, or Storage nodes. This guide covers only `neofs-adm` +consensus, Alphabet, or Storage nodes. This guide covers only `frostfs-adm` related configuration details. ## Prerequisites To follow this guide you need: - latest released version of [neo-go](https://github.com/nspcc-dev/neo-go/releases) (v0.97.2 at the moment), -- latest released version of [neofs-adm](https://github.com/nspcc-dev/neofs-node/releases) utility (v0.25.1 at the moment), -- latest released version of compiled [neofs-contract](https://github.com/nspcc-dev/neofs-contract/releases) (v0.11.0 at the moment). +- latest released version of [frostfs-adm](https://github.com/TrueCloudLab/frostfs-node/releases) utility (v0.25.1 at the moment), +- latest released version of compiled [frostfs-contract](https://github.com/TrueCloudLab/frostfs-contract/releases) (v0.11.0 at the moment). ## Step 1: Prepare network configuration @@ -19,12 +19,12 @@ Alphabet nodes and any number of Storage nodes. While the number of Storage nodes can be scaled almost infinitely, the number of consensus and Alphabet nodes can't be changed so easily right now. Consider this before going any further. -It is easier to use`neofs-adm` with a predefined configuration. First, create +It is easier to use`frostfs-adm` with a predefined configuration. First, create a network configuration file. In this example, there is going to be only one consensus / Alphabet node in the network. ``` -$ neofs-adm config init --path foo.network.yml +$ frostfs-adm config init --path foo.network.yml Initial config file saved to foo.network.yml $ cat foo.network.yml @@ -57,7 +57,7 @@ wallets will be used for Alphabet nodes. Make sure, that dir for alphabet wallets already exists. ``` -$ neofs-adm -c foo.network.yml morph generate-alphabet --size 1 +$ frostfs-adm -c foo.network.yml morph generate-alphabet --size 1 size: 1 alphabet-wallets: /home/user/deploy/alphabet-wallets wallet[0]: hunter2 @@ -121,9 +121,9 @@ and possible overload issues. Use archive with compiled NeoFS contracts to initialize the sidechain. ``` -$ tar -xzvf neofs-contract-v0.11.0.tar.gz +$ tar -xzvf frostfs-contract-v0.11.0.tar.gz -$ ./neofs-adm -c foo.network.yml morph init --contracts ./neofs-contract-v0.11.0 +$ ./frostfs-adm -c foo.network.yml morph init --contracts ./frostfs-contract-v0.11.0 Stage 1: transfer GAS to alphabet nodes. Waiting for transactions to persist... Stage 2: set notary and alphabet nodes in designate contract. @@ -177,7 +177,7 @@ contracts: Generate a new wallet for a Storage node. ``` -$ neofs-adm -c foo.network.yml morph generate-storage-wallet --storage-wallet ./sn01.json --initial-gas 10.0 +$ frostfs-adm -c foo.network.yml morph generate-storage-wallet --storage-wallet ./sn01.json --initial-gas 10.0 New password > Waiting for transactions to persist... @@ -200,7 +200,7 @@ The storage node will be included in the network map in the next NeoFS epoch. To speed up this process, you can increment epoch counter immediately. ``` -$ neofs-adm -c foo.network.yml morph force-new-epoch +$ frostfs-adm -c foo.network.yml morph force-new-epoch Current epoch: 8, increase to 9. Waiting for transactions to persist... ``` diff --git a/cmd/neofs-adm/docs/subnetwork-creation.md b/cmd/frostfs-adm/docs/subnetwork-creation.md similarity index 85% rename from cmd/neofs-adm/docs/subnetwork-creation.md rename to cmd/frostfs-adm/docs/subnetwork-creation.md index 52435d9bf..4655f31ab 100644 --- a/cmd/neofs-adm/docs/subnetwork-creation.md +++ b/cmd/frostfs-adm/docs/subnetwork-creation.md @@ -8,13 +8,13 @@ deployed and the sidechain contains a deployed `subnet` contract. To follow this guide, you need: - neo-go sidechain RPC endpoint; -- latest released version of [neofs-adm](https://github.com/nspcc-dev/neofs-node/releases); +- latest released version of [frostfs-adm](https://github.com/TrueCloudLab/frostfs-node/releases); - wallet with NeoFS account. ## Creation ```shell -$ neofs-adm morph subnet create \ +$ frostfs-adm morph subnet create \ -r \ -w \ --notary @@ -31,7 +31,7 @@ of the just created subnetwork. You can check if your subnetwork was created successfully: ```shell -$ neofs-adm morph subnet get \ +$ frostfs-adm morph subnet get \ -r \ --subnet Owner: NUc734PMJXiqa2J9jRtvskU3kCdyyuSN8Q diff --git a/cmd/neofs-adm/docs/subnetwork-usage.md b/cmd/frostfs-adm/docs/subnetwork-usage.md similarity index 92% rename from cmd/neofs-adm/docs/subnetwork-usage.md rename to cmd/frostfs-adm/docs/subnetwork-usage.md index 511fc2f20..54ddd312e 100644 --- a/cmd/neofs-adm/docs/subnetwork-usage.md +++ b/cmd/frostfs-adm/docs/subnetwork-usage.md @@ -7,7 +7,7 @@ deployed, and the sidechain contains a deployed `subnet` contract. ## Prerequisites - neo-go sidechain RPC endpoint; -- latest released version of [neofs-adm](https://github.com/nspcc-dev/neofs-node/releases); +- latest released version of [frostfs-adm](https://github.com/TrueCloudLab/frostfs-node/releases); - [created](subnetwork-creation.md) subnetwork; - wallet with the account that owns the subnetwork; - public key of the Storage Node; @@ -21,7 +21,7 @@ the whitelist of the nodes which can be included to a subnetwork. Only the subne owner is allowed to add and remove node administrators from the subnetwork. ```shell -$ neofs-adm morph subnet admin add \ +$ frostfs-adm morph subnet admin add \ -r \ -w \ --admin \ @@ -37,7 +37,7 @@ the list of the allowed nodes. Node is not required to be bootstrapped at the moment of its inclusion. ```shell -$ neofs-adm morph subnet node add \ +$ frostfs-adm morph subnet node add \ -r \ -w \ --node \ @@ -55,7 +55,7 @@ subnetwork. Only the subnet owner is allowed to add and remove client administrators from the subnetwork. ```shell -$ neofs-adm morph subnet admin add \ +$ frostfs-adm morph subnet admin add \ -r \ -w \ --admin \ @@ -72,7 +72,7 @@ positive integer number. ## Add client ```shell -$ neofs-adm morph subnet client add \ +$ frostfs-adm morph subnet client add \ -r \ -w \ --client \ @@ -129,9 +129,9 @@ To create a container in a private network, your wallet must be added to the client whitelist by the client admins or the subnet owners: ```shell -$ neofs-cli container create \ +$ frostfs-cli container create \ --policy 'REP 1' \ -w \ - -r s01.neofs.devenv:8080 \ + -r s01.frostfs.devenv:8080 \ --subnet ``` diff --git a/cmd/neofs-adm/internal/modules/config/config.go b/cmd/frostfs-adm/internal/modules/config/config.go similarity index 95% rename from cmd/neofs-adm/internal/modules/config/config.go rename to cmd/frostfs-adm/internal/modules/config/config.go index b01681016..5f4ebc428 100644 --- a/cmd/neofs-adm/internal/modules/config/config.go +++ b/cmd/frostfs-adm/internal/modules/config/config.go @@ -7,8 +7,8 @@ import ( "path/filepath" "text/template" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/cli/input" - "github.com/nspcc-dev/neofs-node/pkg/innerring" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -41,7 +41,7 @@ network: container: {{ .ContainerFee}} container_alias: {{ .ContainerAliasFee }} withdraw: {{ .WithdrawFee}} -# if credentials section is omitted, then neofs-adm will require manual password input +# if credentials section is omitted, then frostfs-adm will require manual password input credentials: contract: password # wallet for contract group signature{{ range.Glagolitics}} {{.}}: password{{end}} @@ -99,7 +99,7 @@ func defaultConfigPath() (string, error) { return "", fmt.Errorf("getting home dir path: %w", err) } - return filepath.Join(home, ".neofs", "adm", "config.yml"), nil + return filepath.Join(home, ".frostfs", "adm", "config.yml"), nil } // generateConfigExample builds .yml representation of the config file. It is diff --git a/cmd/neofs-adm/internal/modules/config/config_test.go b/cmd/frostfs-adm/internal/modules/config/config_test.go similarity index 93% rename from cmd/neofs-adm/internal/modules/config/config_test.go rename to cmd/frostfs-adm/internal/modules/config/config_test.go index 313890f5f..c49b2cb50 100644 --- a/cmd/neofs-adm/internal/modules/config/config_test.go +++ b/cmd/frostfs-adm/internal/modules/config/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/nspcc-dev/neofs-node/pkg/innerring" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/spf13/viper" "github.com/stretchr/testify/require" ) @@ -13,7 +13,7 @@ import ( func TestGenerateConfigExample(t *testing.T) { const ( n = 10 - appDir = "/home/example/.neofs" + appDir = "/home/example/.frostfs" ) configText, err := generateConfigExample(appDir, n) diff --git a/cmd/neofs-adm/internal/modules/config/root.go b/cmd/frostfs-adm/internal/modules/config/root.go similarity index 59% rename from cmd/neofs-adm/internal/modules/config/root.go rename to cmd/frostfs-adm/internal/modules/config/root.go index 48a3b0c1c..b9c3f2e8c 100644 --- a/cmd/neofs-adm/internal/modules/config/root.go +++ b/cmd/frostfs-adm/internal/modules/config/root.go @@ -10,14 +10,14 @@ var ( // RootCmd is a root command of config section. RootCmd = &cobra.Command{ Use: "config", - Short: "Section for neofs-adm config related commands", + Short: "Section for frostfs-adm config related commands", } initCmd = &cobra.Command{ Use: "init", - Short: "Initialize basic neofs-adm configuration file", - Example: `neofs-adm config init -neofs-adm config init --path .config/neofs-adm.yml`, + Short: "Initialize basic frostfs-adm configuration file", + Example: `frostfs-adm config init +frostfs-adm config init --path .config/frostfs-adm.yml`, RunE: initConfig, } ) @@ -25,5 +25,5 @@ neofs-adm config init --path .config/neofs-adm.yml`, func init() { RootCmd.AddCommand(initCmd) - initCmd.Flags().String(configPathFlag, "", "Path to config (default ~/.neofs/adm/config.yml)") + initCmd.Flags().String(configPathFlag, "", "Path to config (default ~/.frostfs/adm/config.yml)") } diff --git a/cmd/neofs-adm/internal/modules/config/util.go b/cmd/frostfs-adm/internal/modules/config/util.go similarity index 100% rename from cmd/neofs-adm/internal/modules/config/util.go rename to cmd/frostfs-adm/internal/modules/config/util.go diff --git a/cmd/neofs-adm/internal/modules/morph/balance.go b/cmd/frostfs-adm/internal/modules/morph/balance.go similarity index 97% rename from cmd/neofs-adm/internal/modules/morph/balance.go rename to cmd/frostfs-adm/internal/modules/morph/balance.go index 5f928a004..72022aa3d 100644 --- a/cmd/neofs-adm/internal/modules/morph/balance.go +++ b/cmd/frostfs-adm/internal/modules/morph/balance.go @@ -6,6 +6,8 @@ import ( "fmt" "math/big" + "github.com/TrueCloudLab/frostfs-contract/nns" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" @@ -21,8 +23,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neo-go/pkg/vm/vmstate" - "github.com/nspcc-dev/neofs-contract/nns" - "github.com/nspcc-dev/neofs-sdk-go/netmap" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -66,7 +66,7 @@ func dumpBalances(cmd *cobra.Command, _ []string) error { return fmt.Errorf("can't get NNS contract info: %w", err) } - nmHash, err = nnsResolveHash(inv, nnsCs.Hash, netmapContract+".neofs") + nmHash, err = nnsResolveHash(inv, nnsCs.Hash, netmapContract+".frostfs") if err != nil { return fmt.Errorf("can't get netmap contract hash: %w", err) } @@ -116,7 +116,7 @@ func dumpBalances(cmd *cobra.Command, _ []string) error { } if dumpProxy { - h, err := nnsResolveHash(inv, nnsCs.Hash, proxyContract+".neofs") + h, err := nnsResolveHash(inv, nnsCs.Hash, proxyContract+".frostfs") if err != nil { return fmt.Errorf("can't get hash of the proxy contract: %w", err) } diff --git a/cmd/neofs-adm/internal/modules/morph/config.go b/cmd/frostfs-adm/internal/modules/morph/config.go similarity index 98% rename from cmd/neofs-adm/internal/modules/morph/config.go rename to cmd/frostfs-adm/internal/modules/morph/config.go index 1d3fb25cf..20ac0bc3e 100644 --- a/cmd/neofs-adm/internal/modules/morph/config.go +++ b/cmd/frostfs-adm/internal/modules/morph/config.go @@ -35,7 +35,7 @@ func dumpNetworkConfig(cmd *cobra.Command, _ []string) error { return fmt.Errorf("can't get NNS contract info: %w", err) } - nmHash, err := nnsResolveHash(inv, cs.Hash, netmapContract+".neofs") + nmHash, err := nnsResolveHash(inv, cs.Hash, netmapContract+".frostfs") if err != nil { return fmt.Errorf("can't get netmap contract hash: %w", err) } @@ -109,7 +109,7 @@ func setConfigCmd(cmd *cobra.Command, args []string) error { return fmt.Errorf("can't get NNS contract info: %w", err) } - nmHash, err := nnsResolveHash(wCtx.ReadOnlyInvoker, cs.Hash, netmapContract+".neofs") + nmHash, err := nnsResolveHash(wCtx.ReadOnlyInvoker, cs.Hash, netmapContract+".frostfs") if err != nil { return fmt.Errorf("can't get netmap contract hash: %w", err) } diff --git a/cmd/neofs-adm/internal/modules/morph/container.go b/cmd/frostfs-adm/internal/modules/morph/container.go similarity index 98% rename from cmd/neofs-adm/internal/modules/morph/container.go rename to cmd/frostfs-adm/internal/modules/morph/container.go index 811d71be0..26ff90e9a 100644 --- a/cmd/neofs-adm/internal/modules/morph/container.go +++ b/cmd/frostfs-adm/internal/modules/morph/container.go @@ -7,6 +7,7 @@ import ( "os" "sort" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/crypto/hash" "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/rpcclient/invoker" @@ -15,7 +16,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -33,7 +33,7 @@ func getContainerContractHash(cmd *cobra.Command, inv *invoker.Invoker, c Client if err != nil { return util.Uint160{}, fmt.Errorf("can't get NNS contract state: %w", err) } - ch, err = nnsResolveHash(inv, nnsCs.Hash, containerContract+".neofs") + ch, err = nnsResolveHash(inv, nnsCs.Hash, containerContract+".frostfs") if err != nil { return util.Uint160{}, err } @@ -169,7 +169,7 @@ func restoreContainers(cmd *cobra.Command, _ []string) error { return fmt.Errorf("can't get NNS contract state: %w", err) } - ch, err := nnsResolveHash(wCtx.ReadOnlyInvoker, nnsCs.Hash, containerContract+".neofs") + ch, err := nnsResolveHash(wCtx.ReadOnlyInvoker, nnsCs.Hash, containerContract+".frostfs") if err != nil { return fmt.Errorf("can't fetch container contract hash: %w", err) } diff --git a/cmd/neofs-adm/internal/modules/morph/deploy.go b/cmd/frostfs-adm/internal/modules/morph/deploy.go similarity index 97% rename from cmd/neofs-adm/internal/modules/morph/deploy.go rename to cmd/frostfs-adm/internal/modules/morph/deploy.go index 1b5708aa5..62170f098 100644 --- a/cmd/neofs-adm/internal/modules/morph/deploy.go +++ b/cmd/frostfs-adm/internal/modules/morph/deploy.go @@ -6,6 +6,7 @@ import ( "os" "strings" + "github.com/TrueCloudLab/frostfs-contract/nns" "github.com/nspcc-dev/neo-go/cli/cmdargs" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/encoding/address" @@ -15,7 +16,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag" "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-contract/nns" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -35,7 +35,7 @@ Optionally, arguments can be provided to be passed to a contract's _deploy funct The syntax is the same as for 'neo-go contract testinvokefunction' command. Compiled contract file name must contain '_contract.nef' suffix. Contract's manifest file name must be 'config.json'. -NNS name is taken by stripping '_contract.nef' from the NEF file (similar to neofs contracts).`, +NNS name is taken by stripping '_contract.nef' from the NEF file (similar to frostfs contracts).`, PreRun: func(cmd *cobra.Command, _ []string) { _ = viper.BindPFlag(alphabetWalletsFlag, cmd.Flags().Lookup(alphabetWalletsFlag)) _ = viper.BindPFlag(endpointFlag, cmd.Flags().Lookup(endpointFlag)) @@ -54,7 +54,7 @@ func init() { _ = deployCmd.MarkFlagFilename(contractPathFlag) ff.Bool(updateFlag, false, "Update an existing contract") - ff.String(customZoneFlag, "neofs", "Custom zone for NNS") + ff.String(customZoneFlag, "frostfs", "Custom zone for NNS") } func deployContractCmd(cmd *cobra.Command, args []string) error { diff --git a/cmd/neofs-adm/internal/modules/morph/download.go b/cmd/frostfs-adm/internal/modules/morph/download.go similarity index 89% rename from cmd/neofs-adm/internal/modules/morph/download.go rename to cmd/frostfs-adm/internal/modules/morph/download.go index 25e04fe14..3c50c0b34 100644 --- a/cmd/neofs-adm/internal/modules/morph/download.go +++ b/cmd/frostfs-adm/internal/modules/morph/download.go @@ -14,7 +14,7 @@ import ( func downloadContractsFromGithub(cmd *cobra.Command) (io.ReadCloser, error) { gcl := github.NewClient(nil) - release, _, err := gcl.Repositories.GetLatestRelease(context.Background(), "nspcc-dev", "neofs-contract") + release, _, err := gcl.Repositories.GetLatestRelease(context.Background(), "nspcc-dev", "frostfs-contract") if err != nil { return nil, fmt.Errorf("can't fetch release info: %w", err) } @@ -23,7 +23,7 @@ func downloadContractsFromGithub(cmd *cobra.Command) (io.ReadCloser, error) { var url string for _, a := range release.Assets { - if strings.HasPrefix(a.GetName(), "neofs-contract") { + if strings.HasPrefix(a.GetName(), "frostfs-contract") { url = a.GetBrowserDownloadURL() break } diff --git a/cmd/neofs-adm/internal/modules/morph/dump_hashes.go b/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go similarity index 98% rename from cmd/neofs-adm/internal/modules/morph/dump_hashes.go rename to cmd/frostfs-adm/internal/modules/morph/dump_hashes.go index 738b3590d..4b7d579d1 100644 --- a/cmd/neofs-adm/internal/modules/morph/dump_hashes.go +++ b/cmd/frostfs-adm/internal/modules/morph/dump_hashes.go @@ -6,6 +6,7 @@ import ( "strings" "text/tabwriter" + "github.com/TrueCloudLab/frostfs-contract/nns" "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/rpcclient/invoker" "github.com/nspcc-dev/neo-go/pkg/rpcclient/unwrap" @@ -15,7 +16,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neo-go/pkg/vm/vmstate" - "github.com/nspcc-dev/neofs-contract/nns" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -83,7 +83,7 @@ func dumpContractHashes(cmd *cobra.Command, _ []string) error { for _, ctrName := range contractList { bw.Reset() emit.AppCall(bw.BinWriter, cs.Hash, "resolve", callflag.ReadOnly, - ctrName+".neofs", int64(nns.TXT)) + ctrName+".frostfs", int64(nns.TXT)) res, err := c.InvokeScript(bw.Bytes(), nil) if err != nil { diff --git a/cmd/neofs-adm/internal/modules/morph/epoch.go b/cmd/frostfs-adm/internal/modules/morph/epoch.go similarity index 98% rename from cmd/neofs-adm/internal/modules/morph/epoch.go rename to cmd/frostfs-adm/internal/modules/morph/epoch.go index cd39d0560..608ff6b43 100644 --- a/cmd/neofs-adm/internal/modules/morph/epoch.go +++ b/cmd/frostfs-adm/internal/modules/morph/epoch.go @@ -24,7 +24,7 @@ func forceNewEpochCmd(cmd *cobra.Command, args []string) error { return fmt.Errorf("can't get NNS contract info: %w", err) } - nmHash, err := nnsResolveHash(wCtx.ReadOnlyInvoker, cs.Hash, netmapContract+".neofs") + nmHash, err := nnsResolveHash(wCtx.ReadOnlyInvoker, cs.Hash, netmapContract+".frostfs") if err != nil { return fmt.Errorf("can't get netmap contract hash: %w", err) } diff --git a/cmd/neofs-adm/internal/modules/morph/generate.go b/cmd/frostfs-adm/internal/modules/morph/generate.go similarity index 97% rename from cmd/neofs-adm/internal/modules/morph/generate.go rename to cmd/frostfs-adm/internal/modules/morph/generate.go index 71224acdc..52ffddb60 100644 --- a/cmd/neofs-adm/internal/modules/morph/generate.go +++ b/cmd/frostfs-adm/internal/modules/morph/generate.go @@ -6,6 +6,8 @@ import ( "os" "path/filepath" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/address" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" @@ -17,8 +19,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/cmd/neofs-adm/internal/modules/config" - "github.com/nspcc-dev/neofs-node/pkg/innerring" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-adm/internal/modules/morph/generate_test.go b/cmd/frostfs-adm/internal/modules/morph/generate_test.go similarity index 98% rename from cmd/neofs-adm/internal/modules/morph/generate_test.go rename to cmd/frostfs-adm/internal/modules/morph/generate_test.go index 5749a14ff..d2478c02f 100644 --- a/cmd/neofs-adm/internal/modules/morph/generate_test.go +++ b/cmd/frostfs-adm/internal/modules/morph/generate_test.go @@ -9,11 +9,11 @@ import ( "strconv" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/cli/input" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/smartcontract" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/pkg/innerring" "github.com/spf13/viper" "github.com/stretchr/testify/require" "golang.org/x/term" diff --git a/cmd/neofs-adm/internal/modules/morph/group.go b/cmd/frostfs-adm/internal/modules/morph/group.go similarity index 96% rename from cmd/neofs-adm/internal/modules/morph/group.go rename to cmd/frostfs-adm/internal/modules/morph/group.go index ee887272b..cd30e1bea 100644 --- a/cmd/neofs-adm/internal/modules/morph/group.go +++ b/cmd/frostfs-adm/internal/modules/morph/group.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/smartcontract/manifest" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/cmd/neofs-adm/internal/modules/config" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-adm/internal/modules/morph/initialize.go b/cmd/frostfs-adm/internal/modules/morph/initialize.go similarity index 98% rename from cmd/neofs-adm/internal/modules/morph/initialize.go rename to cmd/frostfs-adm/internal/modules/morph/initialize.go index ab8fef1a4..2c742d82d 100644 --- a/cmd/neofs-adm/internal/modules/morph/initialize.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize.go @@ -7,6 +7,9 @@ import ( "path/filepath" "time" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/native/nativenames" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/transaction" @@ -16,9 +19,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/vmstate" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/cmd/neofs-adm/internal/modules/config" - "github.com/nspcc-dev/neofs-node/pkg/innerring" - morphClient "github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go b/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go similarity index 98% rename from cmd/neofs-adm/internal/modules/morph/initialize_deploy.go rename to cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go index 871c02b4b..1c80df007 100644 --- a/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_deploy.go @@ -12,6 +12,10 @@ import ( "path/filepath" "strings" + "github.com/TrueCloudLab/frostfs-contract/common" + "github.com/TrueCloudLab/frostfs-contract/nns" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/encoding/address" @@ -27,10 +31,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/nspcc-dev/neo-go/pkg/vm/vmstate" - "github.com/nspcc-dev/neofs-contract/common" - "github.com/nspcc-dev/neofs-contract/nns" - "github.com/nspcc-dev/neofs-node/pkg/innerring" - morphClient "github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/spf13/viper" ) @@ -227,7 +227,7 @@ func (c *initializeContext) updateContracts() error { cs := c.getContract(ctrName) method := updateMethodName - ctrHash, err := nnsResolveHash(c.ReadOnlyInvoker, nnsHash, ctrName+".neofs") + ctrHash, err := nnsResolveHash(c.ReadOnlyInvoker, nnsHash, ctrName+".frostfs") if err != nil { if errors.Is(err, errMissingNNSRecord) { // if contract not found we deploy it instead of update @@ -261,7 +261,7 @@ func (c *initializeContext) updateContracts() error { if method == deployMethodName { // same actions are done in initializeContext.setNNS, can be unified - domain := ctrName + ".neofs" + domain := ctrName + ".frostfs" script, ok, err := c.nnsRegisterDomainScript(nnsHash, cs.Hash, domain) if err != nil { return err diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_nns.go b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go similarity index 96% rename from cmd/neofs-adm/internal/modules/morph/initialize_nns.go rename to cmd/frostfs-adm/internal/modules/morph/initialize_nns.go index 980fc7b06..06b902b26 100644 --- a/cmd/neofs-adm/internal/modules/morph/initialize_nns.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_nns.go @@ -7,6 +7,8 @@ import ( "strconv" "time" + "github.com/TrueCloudLab/frostfs-contract/nns" + morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/address" @@ -20,8 +22,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neo-go/pkg/vm/vmstate" - "github.com/nspcc-dev/neofs-contract/nns" - morphClient "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) const defaultExpirationTime = 10 * 365 * 24 * time.Hour / time.Second @@ -32,13 +32,13 @@ func (c *initializeContext) setNNS() error { return err } - ok, err := c.nnsRootRegistered(nnsCs.Hash, "neofs") + ok, err := c.nnsRootRegistered(nnsCs.Hash, "frostfs") if err != nil { return err } else if !ok { bw := io.NewBufBinWriter() emit.AppCall(bw.BinWriter, nnsCs.Hash, "register", callflag.All, - "neofs", c.CommitteeAcc.Contract.ScriptHash(), + "frostfs", c.CommitteeAcc.Contract.ScriptHash(), "ops@nspcc.ru", int64(3600), int64(600), int64(defaultExpirationTime), int64(3600)) emit.Opcodes(bw.BinWriter, opcode.ASSERT) if err := c.sendCommitteeTx(bw.Bytes(), true); err != nil { @@ -63,7 +63,7 @@ func (c *initializeContext) setNNS() error { for _, ctrName := range contractList { cs := c.getContract(ctrName) - domain := ctrName + ".neofs" + domain := ctrName + ".frostfs" if err := c.nnsRegisterDomain(nnsCs.Hash, cs.Hash, domain); err != nil { return err } @@ -125,15 +125,15 @@ func (c *initializeContext) emitUpdateNNSGroupScript(bw *io.BufBinWriter, nnsHas emit.Opcodes(bw.BinWriter, opcode.ASSERT) } - emit.AppCall(bw.BinWriter, nnsHash, "deleteRecords", callflag.All, "group.neofs", int64(nns.TXT)) + emit.AppCall(bw.BinWriter, nnsHash, "deleteRecords", callflag.All, "group.frostfs", int64(nns.TXT)) emit.AppCall(bw.BinWriter, nnsHash, "addRecord", callflag.All, - "group.neofs", int64(nns.TXT), hex.EncodeToString(pub.Bytes())) + "group.frostfs", int64(nns.TXT), hex.EncodeToString(pub.Bytes())) return false, isAvail, nil } func getAlphabetNNSDomain(i int) string { - return alphabetContract + strconv.FormatUint(uint64(i), 10) + ".neofs" + return alphabetContract + strconv.FormatUint(uint64(i), 10) + ".frostfs" } // wrapRegisterScriptWithPrice wraps a given script with `getPrice`/`setPrice` calls for NNS. diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_register.go b/cmd/frostfs-adm/internal/modules/morph/initialize_register.go similarity index 100% rename from cmd/neofs-adm/internal/modules/morph/initialize_register.go rename to cmd/frostfs-adm/internal/modules/morph/initialize_register.go diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_roles.go b/cmd/frostfs-adm/internal/modules/morph/initialize_roles.go similarity index 100% rename from cmd/neofs-adm/internal/modules/morph/initialize_roles.go rename to cmd/frostfs-adm/internal/modules/morph/initialize_roles.go diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_test.go b/cmd/frostfs-adm/internal/modules/morph/initialize_test.go similarity index 94% rename from cmd/neofs-adm/internal/modules/morph/initialize_test.go rename to cmd/frostfs-adm/internal/modules/morph/initialize_test.go index 2fadfc4a1..02d0021ee 100644 --- a/cmd/neofs-adm/internal/modules/morph/initialize_test.go +++ b/cmd/frostfs-adm/internal/modules/morph/initialize_test.go @@ -7,23 +7,23 @@ import ( "strconv" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" "github.com/nspcc-dev/neo-go/pkg/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/pkg/innerring" "github.com/spf13/viper" "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" ) const ( - contractsPath = "../../../../../../neofs-contract/neofs-contract-v0.16.0.tar.gz" + contractsPath = "../../../../../../frostfs-contract/frostfs-contract-v0.16.0.tar.gz" protoFileName = "proto.yml" ) func TestInitialize(t *testing.T) { - // This test needs neofs-contract tarball, so it is skipped by default. + // This test needs frostfs-contract tarball, so it is skipped by default. // It is here for performing local testing after the changes. t.Skip() diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_transfer.go b/cmd/frostfs-adm/internal/modules/morph/initialize_transfer.go similarity index 100% rename from cmd/neofs-adm/internal/modules/morph/initialize_transfer.go rename to cmd/frostfs-adm/internal/modules/morph/initialize_transfer.go diff --git a/cmd/neofs-adm/internal/modules/morph/internal/types.go b/cmd/frostfs-adm/internal/modules/morph/internal/types.go similarity index 100% rename from cmd/neofs-adm/internal/modules/morph/internal/types.go rename to cmd/frostfs-adm/internal/modules/morph/internal/types.go diff --git a/cmd/neofs-adm/internal/modules/morph/internal/types.pb.go b/cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go similarity index 60% rename from cmd/neofs-adm/internal/modules/morph/internal/types.pb.go rename to cmd/frostfs-adm/internal/modules/morph/internal/types.pb.go index 6d43c96aa3450dcd7aca62295faa253e873a826d..62e41763f7ccc3307bc6965190d81944985cc980 100644 GIT binary patch delta 415 zcmX?L^xJ4cBWqewesRgfmVn8AjPesNRd3E^^kaqyPCh7Zz4<4LH6s$Yh%Ft)UC3uO zS&X9@D!Gu)X!1D@Z745M!gjMICqFA((rR)mpCp{;1!q}J*5DUH;+6ADA@R=f%fNY# zll26Y;5@s@69vSPcrOJ6p**0YCtC;_!sU!7&lk*x@HPtyB_dpJJb8sM!U*HZUxmfs znv5nph&Uh&+`La@0!(9|*k-sgklE~$9mN%(B7#Czljp&C2gQTnDvc(4NWhFwl<{6>NgZh|daUSywkYn>d7HdWnfl9V?n1Iz} zd5&hNq|xM?9NJK})n;c-Ayyb?@)SNvINL#hohL0bCpA7fHzgioj}Kf@o`Y@jBz_S% z|0%x=ob4c>iNt1^yhcDAh0i7^2<3y^Z3$-|5X^_Ovn9DU7YeDsoNqk&tT4 --out ./blank_token +$ frostfs-cli session create --rpc-endpoint --out ./blank_token ``` After this example command remote node holds session private key while its public part is written into the session token encoded into the output file. @@ -49,7 +49,7 @@ original client, and the CLI uses it only for reading. Ready token MUST have: To sign the session token, exec: ```shell -$ neofs-cli --wallet util sign session-token --from ./blank_token --to ./token +$ frostfs-cli --wallet util sign session-token --from ./blank_token --to ./token ``` Once the token is signed, it MUST NOT be modified. diff --git a/cmd/neofs-cli/internal/client/client.go b/cmd/frostfs-cli/internal/client/client.go similarity index 97% rename from cmd/neofs-cli/internal/client/client.go rename to cmd/frostfs-cli/internal/client/client.go index 90056d9f5..37781572d 100644 --- a/cmd/neofs-cli/internal/client/client.go +++ b/cmd/frostfs-cli/internal/client/client.go @@ -7,15 +7,15 @@ import ( "fmt" "io" - "github.com/nspcc-dev/neofs-sdk-go/accounting" - "github.com/nspcc-dev/neofs-sdk-go/client" - containerSDK "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/version" + "github.com/TrueCloudLab/frostfs-sdk-go/accounting" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/version" ) // BalanceOfPrm groups parameters of BalanceOf operation. diff --git a/cmd/neofs-cli/internal/client/doc.go b/cmd/frostfs-cli/internal/client/doc.go similarity index 100% rename from cmd/neofs-cli/internal/client/doc.go rename to cmd/frostfs-cli/internal/client/doc.go diff --git a/cmd/neofs-cli/internal/client/prm.go b/cmd/frostfs-cli/internal/client/prm.go similarity index 86% rename from cmd/neofs-cli/internal/client/prm.go rename to cmd/frostfs-cli/internal/client/prm.go index 90f585dba..46a10044f 100644 --- a/cmd/neofs-cli/internal/client/prm.go +++ b/cmd/frostfs-cli/internal/client/prm.go @@ -3,11 +3,11 @@ package internal import ( "io" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/client" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" ) // here are small structures with public setters to share between parameter structures diff --git a/cmd/neofs-cli/internal/client/sdk.go b/cmd/frostfs-cli/internal/client/sdk.go similarity index 84% rename from cmd/neofs-cli/internal/client/sdk.go rename to cmd/frostfs-cli/internal/client/sdk.go index 94ff1d005..853bc979a 100644 --- a/cmd/neofs-cli/internal/client/sdk.go +++ b/cmd/frostfs-cli/internal/client/sdk.go @@ -8,17 +8,17 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-sdk-go/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-sdk-go/client" "github.com/spf13/cobra" "github.com/spf13/viper" ) var errInvalidEndpoint = errors.New("provided RPC endpoint is incorrect") -// GetSDKClientByFlag returns default neofs-sdk-go client using the specified flag for the address. +// GetSDKClientByFlag returns default frostfs-sdk-go client using the specified flag for the address. // On error, outputs to stderr of cmd and exits with non-zero code. func GetSDKClientByFlag(cmd *cobra.Command, key *ecdsa.PrivateKey, endpointFlag string) *client.Client { cli, err := getSDKClientByFlag(key, endpointFlag) @@ -38,7 +38,7 @@ func getSDKClientByFlag(key *ecdsa.PrivateKey, endpointFlag string) (*client.Cli return GetSDKClient(key, addr) } -// GetSDKClient returns default neofs-sdk-go client. +// GetSDKClient returns default frostfs-sdk-go client. func GetSDKClient(key *ecdsa.PrivateKey, addr network.Address) (*client.Client, error) { var ( c client.Client diff --git a/cmd/neofs-cli/internal/common/eacl.go b/cmd/frostfs-cli/internal/common/eacl.go similarity index 86% rename from cmd/neofs-cli/internal/common/eacl.go rename to cmd/frostfs-cli/internal/common/eacl.go index 052eb6920..6573742e4 100644 --- a/cmd/neofs-cli/internal/common/eacl.go +++ b/cmd/frostfs-cli/internal/common/eacl.go @@ -4,9 +4,9 @@ import ( "errors" "os" - "github.com/nspcc-dev/neofs-node/pkg/core/version" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - versionSDK "github.com/nspcc-dev/neofs-sdk-go/version" + "github.com/TrueCloudLab/frostfs-node/pkg/core/version" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + versionSDK "github.com/TrueCloudLab/frostfs-sdk-go/version" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/internal/common/epoch.go b/cmd/frostfs-cli/internal/common/epoch.go similarity index 100% rename from cmd/neofs-cli/internal/common/epoch.go rename to cmd/frostfs-cli/internal/common/epoch.go diff --git a/cmd/neofs-cli/internal/common/exit.go b/cmd/frostfs-cli/internal/common/exit.go similarity index 92% rename from cmd/neofs-cli/internal/common/exit.go rename to cmd/frostfs-cli/internal/common/exit.go index 1b616e081..cae477889 100644 --- a/cmd/neofs-cli/internal/common/exit.go +++ b/cmd/frostfs-cli/internal/common/exit.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - sdkstatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + sdkstatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/internal/common/json.go b/cmd/frostfs-cli/internal/common/json.go similarity index 100% rename from cmd/neofs-cli/internal/common/json.go rename to cmd/frostfs-cli/internal/common/json.go diff --git a/cmd/neofs-cli/internal/common/netmap.go b/cmd/frostfs-cli/internal/common/netmap.go similarity index 95% rename from cmd/neofs-cli/internal/common/netmap.go rename to cmd/frostfs-cli/internal/common/netmap.go index 92093ffce..0cd5beed2 100644 --- a/cmd/neofs-cli/internal/common/netmap.go +++ b/cmd/frostfs-cli/internal/common/netmap.go @@ -3,7 +3,7 @@ package common import ( "encoding/hex" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/internal/common/token.go b/cmd/frostfs-cli/internal/common/token.go similarity index 96% rename from cmd/neofs-cli/internal/common/token.go rename to cmd/frostfs-cli/internal/common/token.go index 3df7278ee..d2f238636 100644 --- a/cmd/neofs-cli/internal/common/token.go +++ b/cmd/frostfs-cli/internal/common/token.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/nspcc-dev/neofs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/internal/common/verbose.go b/cmd/frostfs-cli/internal/common/verbose.go similarity index 88% rename from cmd/neofs-cli/internal/common/verbose.go rename to cmd/frostfs-cli/internal/common/verbose.go index 48399a123..92d9651dc 100644 --- a/cmd/neofs-cli/internal/common/verbose.go +++ b/cmd/frostfs-cli/internal/common/verbose.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-sdk-go/checksum" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-sdk-go/checksum" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-cli/internal/commonflags/api.go b/cmd/frostfs-cli/internal/commonflags/api.go similarity index 100% rename from cmd/neofs-cli/internal/commonflags/api.go rename to cmd/frostfs-cli/internal/commonflags/api.go diff --git a/cmd/neofs-cli/internal/commonflags/expiration.go b/cmd/frostfs-cli/internal/commonflags/expiration.go similarity index 100% rename from cmd/neofs-cli/internal/commonflags/expiration.go rename to cmd/frostfs-cli/internal/commonflags/expiration.go diff --git a/cmd/neofs-cli/internal/commonflags/flags.go b/cmd/frostfs-cli/internal/commonflags/flags.go similarity index 100% rename from cmd/neofs-cli/internal/commonflags/flags.go rename to cmd/frostfs-cli/internal/commonflags/flags.go diff --git a/cmd/neofs-cli/internal/commonflags/json.go b/cmd/frostfs-cli/internal/commonflags/json.go similarity index 100% rename from cmd/neofs-cli/internal/commonflags/json.go rename to cmd/frostfs-cli/internal/commonflags/json.go diff --git a/cmd/neofs-cli/internal/commonflags/session.go b/cmd/frostfs-cli/internal/commonflags/session.go similarity index 100% rename from cmd/neofs-cli/internal/commonflags/session.go rename to cmd/frostfs-cli/internal/commonflags/session.go diff --git a/cmd/neofs-cli/internal/key/key_test.go b/cmd/frostfs-cli/internal/key/key_test.go similarity index 97% rename from cmd/neofs-cli/internal/key/key_test.go rename to cmd/frostfs-cli/internal/key/key_test.go index d3a41eee5..f14515056 100644 --- a/cmd/neofs-cli/internal/key/key_test.go +++ b/cmd/frostfs-cli/internal/key/key_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/nspcc-dev/neo-go/cli/input" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" "github.com/spf13/viper" "github.com/stretchr/testify/require" "golang.org/x/term" diff --git a/cmd/neofs-cli/internal/key/raw.go b/cmd/frostfs-cli/internal/key/raw.go similarity index 91% rename from cmd/neofs-cli/internal/key/raw.go rename to cmd/frostfs-cli/internal/key/raw.go index 27e02da64..74d373b8a 100644 --- a/cmd/neofs-cli/internal/key/raw.go +++ b/cmd/frostfs-cli/internal/key/raw.go @@ -6,10 +6,10 @@ import ( "fmt" "os" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-cli/internal/key/wallet.go b/cmd/frostfs-cli/internal/key/wallet.go similarity index 100% rename from cmd/neofs-cli/internal/key/wallet.go rename to cmd/frostfs-cli/internal/key/wallet.go diff --git a/cmd/frostfs-cli/main.go b/cmd/frostfs-cli/main.go new file mode 100644 index 000000000..40dfbe0a6 --- /dev/null +++ b/cmd/frostfs-cli/main.go @@ -0,0 +1,7 @@ +package main + +import cmd "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules" + +func main() { + cmd.Execute() +} diff --git a/cmd/neofs-cli/modules/accounting/balance.go b/cmd/frostfs-cli/modules/accounting/balance.go similarity index 80% rename from cmd/neofs-cli/modules/accounting/balance.go rename to cmd/frostfs-cli/modules/accounting/balance.go index 2864d0fcb..6bfc87259 100644 --- a/cmd/neofs-cli/modules/accounting/balance.go +++ b/cmd/frostfs-cli/modules/accounting/balance.go @@ -3,14 +3,14 @@ package accounting import ( "math/big" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/util/precision" + "github.com/TrueCloudLab/frostfs-sdk-go/accounting" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/util/precision" - "github.com/nspcc-dev/neofs-sdk-go/accounting" - "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-cli/modules/accounting/root.go b/cmd/frostfs-cli/modules/accounting/root.go similarity index 89% rename from cmd/neofs-cli/modules/accounting/root.go rename to cmd/frostfs-cli/modules/accounting/root.go index 4fba3f1ee..98d564f88 100644 --- a/cmd/neofs-cli/modules/accounting/root.go +++ b/cmd/frostfs-cli/modules/accounting/root.go @@ -1,7 +1,7 @@ package accounting import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-cli/modules/acl/basic/print.go b/cmd/frostfs-cli/modules/acl/basic/print.go similarity index 75% rename from cmd/neofs-cli/modules/acl/basic/print.go rename to cmd/frostfs-cli/modules/acl/basic/print.go index 68df86cb1..2f0b32512 100644 --- a/cmd/neofs-cli/modules/acl/basic/print.go +++ b/cmd/frostfs-cli/modules/acl/basic/print.go @@ -1,16 +1,16 @@ package basic import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" "github.com/spf13/cobra" ) var printACLCmd = &cobra.Command{ Use: "print", Short: "Pretty print basic ACL from the HEX representation", - Example: `neofs-cli acl basic print 0x1C8C8CCC`, + Example: `frostfs-cli acl basic print 0x1C8C8CCC`, Long: `Pretty print basic ACL from the HEX representation. Few roles have exclusive default access to set of operation, even if particular bit deny it. Container have access to the operations of the data replication mechanism: diff --git a/cmd/neofs-cli/modules/acl/basic/root.go b/cmd/frostfs-cli/modules/acl/basic/root.go similarity index 100% rename from cmd/neofs-cli/modules/acl/basic/root.go rename to cmd/frostfs-cli/modules/acl/basic/root.go diff --git a/cmd/neofs-cli/modules/acl/extended/create.go b/cmd/frostfs-cli/modules/acl/extended/create.go similarity index 82% rename from cmd/neofs-cli/modules/acl/extended/create.go rename to cmd/frostfs-cli/modules/acl/extended/create.go index 53d74ecb7..c363cd266 100644 --- a/cmd/neofs-cli/modules/acl/extended/create.go +++ b/cmd/frostfs-cli/modules/acl/extended/create.go @@ -6,11 +6,11 @@ import ( "os" "strings" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/spf13/cobra" ) @@ -30,7 +30,7 @@ Filter consists of : Key is a valid unicode string corresponding to object or request header key. Well-known system object headers start with '$Object:' prefix. User defined headers start without prefix. - Read more about filter keys at github.com/nspcc-dev/neofs-api/blob/master/proto-docs/acl.md#message-eaclrecordfilter + Read more about filter keys at github.com/TrueCloudLab/frostfs-api/blob/master/proto-docs/acl.md#message-eaclrecordfilter Match is '=' for matching and '!=' for non-matching filter. Value is a valid unicode string corresponding to object or request header value. @@ -42,8 +42,8 @@ Target is When both '--rule' and '--file' arguments are used, '--rule' records will be placed higher in resulting extended ACL table. `, - Example: `neofs-cli acl extended create --cid EutHBsdT1YCzHxjCfQHnLPL1vFrkSyLSio4vkphfnEk -f rules.txt --out table.json -neofs-cli acl extended create --cid EutHBsdT1YCzHxjCfQHnLPL1vFrkSyLSio4vkphfnEk -r 'allow get obj:Key=Value others' -r 'deny put others'`, + Example: `frostfs-cli acl extended create --cid EutHBsdT1YCzHxjCfQHnLPL1vFrkSyLSio4vkphfnEk -f rules.txt --out table.json +frostfs-cli acl extended create --cid EutHBsdT1YCzHxjCfQHnLPL1vFrkSyLSio4vkphfnEk -r 'allow get obj:Key=Value others' -r 'deny put others'`, Run: createEACL, } diff --git a/cmd/neofs-cli/modules/acl/extended/create_test.go b/cmd/frostfs-cli/modules/acl/extended/create_test.go similarity index 95% rename from cmd/neofs-cli/modules/acl/extended/create_test.go rename to cmd/frostfs-cli/modules/acl/extended/create_test.go index 16d4cc023..213bc8aa8 100644 --- a/cmd/neofs-cli/modules/acl/extended/create_test.go +++ b/cmd/frostfs-cli/modules/acl/extended/create_test.go @@ -3,8 +3,8 @@ package extended import ( "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util" - "github.com/nspcc-dev/neofs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-cli/modules/acl/extended/print.go b/cmd/frostfs-cli/modules/acl/extended/print.go similarity index 84% rename from cmd/neofs-cli/modules/acl/extended/print.go rename to cmd/frostfs-cli/modules/acl/extended/print.go index 6a0694e85..1072791cd 100644 --- a/cmd/neofs-cli/modules/acl/extended/print.go +++ b/cmd/frostfs-cli/modules/acl/extended/print.go @@ -4,9 +4,9 @@ import ( "os" "strings" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util" - "github.com/nspcc-dev/neofs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/acl/extended/root.go b/cmd/frostfs-cli/modules/acl/extended/root.go similarity index 100% rename from cmd/neofs-cli/modules/acl/extended/root.go rename to cmd/frostfs-cli/modules/acl/extended/root.go diff --git a/cmd/neofs-cli/modules/acl/root.go b/cmd/frostfs-cli/modules/acl/root.go similarity index 58% rename from cmd/neofs-cli/modules/acl/root.go rename to cmd/frostfs-cli/modules/acl/root.go index 83867cf6a..61443cda5 100644 --- a/cmd/neofs-cli/modules/acl/root.go +++ b/cmd/frostfs-cli/modules/acl/root.go @@ -1,8 +1,8 @@ package acl import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/acl/basic" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/acl/extended" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl/basic" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl/extended" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/bearer/create.go b/cmd/frostfs-cli/modules/bearer/create.go similarity index 90% rename from cmd/neofs-cli/modules/bearer/create.go rename to cmd/frostfs-cli/modules/bearer/create.go index c437ce3f7..163821085 100644 --- a/cmd/neofs-cli/modules/bearer/create.go +++ b/cmd/frostfs-cli/modules/bearer/create.go @@ -7,12 +7,12 @@ import ( "os" "time" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - eaclSDK "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/user" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/bearer/root.go b/cmd/frostfs-cli/modules/bearer/root.go similarity index 100% rename from cmd/neofs-cli/modules/bearer/root.go rename to cmd/frostfs-cli/modules/bearer/root.go diff --git a/cmd/frostfs-cli/modules/completion.go b/cmd/frostfs-cli/modules/completion.go new file mode 100644 index 000000000..bfcc3146a --- /dev/null +++ b/cmd/frostfs-cli/modules/completion.go @@ -0,0 +1,9 @@ +package cmd + +import ( + "github.com/TrueCloudLab/frostfs-node/pkg/util/autocomplete" +) + +func init() { + rootCmd.AddCommand(autocomplete.Command("frostfs-cli")) +} diff --git a/cmd/neofs-cli/modules/container/create.go b/cmd/frostfs-cli/modules/container/create.go similarity index 91% rename from cmd/neofs-cli/modules/container/create.go rename to cmd/frostfs-cli/modules/container/create.go index 5653232d1..5eaa808bb 100644 --- a/cmd/neofs-cli/modules/container/create.go +++ b/cmd/frostfs-cli/modules/container/create.go @@ -7,15 +7,15 @@ import ( "strings" "time" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-sdk-go/container" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/delete.go b/cmd/frostfs-cli/modules/container/delete.go similarity index 88% rename from cmd/neofs-cli/modules/container/delete.go rename to cmd/frostfs-cli/modules/container/delete.go index f4311d9b1..049d8fb19 100644 --- a/cmd/neofs-cli/modules/container/delete.go +++ b/cmd/frostfs-cli/modules/container/delete.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/get.go b/cmd/frostfs-cli/modules/container/get.go similarity index 87% rename from cmd/neofs-cli/modules/container/get.go rename to cmd/frostfs-cli/modules/container/get.go index 846b8a8c4..37dcb25bd 100644 --- a/cmd/neofs-cli/modules/container/get.go +++ b/cmd/frostfs-cli/modules/container/get.go @@ -6,14 +6,14 @@ import ( "encoding/json" "os" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util" - "github.com/nspcc-dev/neofs-sdk-go/container" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/get_eacl.go b/cmd/frostfs-cli/modules/container/get_eacl.go similarity index 83% rename from cmd/neofs-cli/modules/container/get_eacl.go rename to cmd/frostfs-cli/modules/container/get_eacl.go index 482977b17..e8cbf1f19 100644 --- a/cmd/neofs-cli/modules/container/get_eacl.go +++ b/cmd/frostfs-cli/modules/container/get_eacl.go @@ -3,10 +3,10 @@ package container import ( "os" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/list.go b/cmd/frostfs-cli/modules/container/list.go similarity index 83% rename from cmd/neofs-cli/modules/container/list.go rename to cmd/frostfs-cli/modules/container/list.go index 39a788132..c0f1283e9 100644 --- a/cmd/neofs-cli/modules/container/list.go +++ b/cmd/frostfs-cli/modules/container/list.go @@ -3,12 +3,12 @@ package container import ( "strings" - "github.com/nspcc-dev/neofs-api-go/v2/container" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/list_objects.go b/cmd/frostfs-cli/modules/container/list_objects.go similarity index 80% rename from cmd/neofs-cli/modules/container/list_objects.go rename to cmd/frostfs-cli/modules/container/list_objects.go index 74c1f955f..0cbe807d0 100644 --- a/cmd/neofs-cli/modules/container/list_objects.go +++ b/cmd/frostfs-cli/modules/container/list_objects.go @@ -3,14 +3,14 @@ package container import ( "strings" - v2object "github.com/nspcc-dev/neofs-api-go/v2/object" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/nodes.go b/cmd/frostfs-cli/modules/container/nodes.go similarity index 76% rename from cmd/neofs-cli/modules/container/nodes.go rename to cmd/frostfs-cli/modules/container/nodes.go index b142154fb..351f0c611 100644 --- a/cmd/neofs-cli/modules/container/nodes.go +++ b/cmd/frostfs-cli/modules/container/nodes.go @@ -3,13 +3,13 @@ package container import ( "crypto/sha256" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - containerAPI "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + containerAPI "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/root.go b/cmd/frostfs-cli/modules/container/root.go similarity index 94% rename from cmd/neofs-cli/modules/container/root.go rename to cmd/frostfs-cli/modules/container/root.go index 14225f367..fe789e186 100644 --- a/cmd/neofs-cli/modules/container/root.go +++ b/cmd/frostfs-cli/modules/container/root.go @@ -1,7 +1,7 @@ package container import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/set_eacl.go b/cmd/frostfs-cli/modules/container/set_eacl.go similarity index 89% rename from cmd/neofs-cli/modules/container/set_eacl.go rename to cmd/frostfs-cli/modules/container/set_eacl.go index fb5f39e69..a5791d5dd 100644 --- a/cmd/neofs-cli/modules/container/set_eacl.go +++ b/cmd/frostfs-cli/modules/container/set_eacl.go @@ -5,10 +5,10 @@ import ( "errors" "time" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/container/util.go b/cmd/frostfs-cli/modules/container/util.go similarity index 84% rename from cmd/neofs-cli/modules/container/util.go rename to cmd/frostfs-cli/modules/container/util.go index d9128c495..d8ec9dc99 100644 --- a/cmd/neofs-cli/modules/container/util.go +++ b/cmd/frostfs-cli/modules/container/util.go @@ -3,10 +3,10 @@ package container import ( "errors" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/drop_objects.go b/cmd/frostfs-cli/modules/control/drop_objects.go similarity index 83% rename from cmd/neofs-cli/modules/control/drop_objects.go rename to cmd/frostfs-cli/modules/control/drop_objects.go index 955c45d1f..90bfaca38 100644 --- a/cmd/neofs-cli/modules/control/drop_objects.go +++ b/cmd/frostfs-cli/modules/control/drop_objects.go @@ -1,10 +1,10 @@ package control import ( - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/evacuate_shard.go b/cmd/frostfs-cli/modules/control/evacuate_shard.go similarity index 84% rename from cmd/neofs-cli/modules/control/evacuate_shard.go rename to cmd/frostfs-cli/modules/control/evacuate_shard.go index dd82cefd4..89366f418 100644 --- a/cmd/neofs-cli/modules/control/evacuate_shard.go +++ b/cmd/frostfs-cli/modules/control/evacuate_shard.go @@ -1,10 +1,10 @@ package control import ( - "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/flush_cache.go b/cmd/frostfs-cli/modules/control/flush_cache.go similarity index 81% rename from cmd/neofs-cli/modules/control/flush_cache.go rename to cmd/frostfs-cli/modules/control/flush_cache.go index 31ef9c978..fdf33244e 100644 --- a/cmd/neofs-cli/modules/control/flush_cache.go +++ b/cmd/frostfs-cli/modules/control/flush_cache.go @@ -1,10 +1,10 @@ package control import ( - "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/healthcheck.go b/cmd/frostfs-cli/modules/control/healthcheck.go similarity index 79% rename from cmd/neofs-cli/modules/control/healthcheck.go rename to cmd/frostfs-cli/modules/control/healthcheck.go index 7d5f50b8f..1183f23c2 100644 --- a/cmd/neofs-cli/modules/control/healthcheck.go +++ b/cmd/frostfs-cli/modules/control/healthcheck.go @@ -3,13 +3,13 @@ package control import ( "crypto/ecdsa" - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" - ircontrol "github.com/nspcc-dev/neofs-node/pkg/services/control/ir" - ircontrolsrv "github.com/nspcc-dev/neofs-node/pkg/services/control/ir/server" - "github.com/nspcc-dev/neofs-sdk-go/client" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + ircontrol "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" + ircontrolsrv "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir/server" + "github.com/TrueCloudLab/frostfs-sdk-go/client" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/root.go b/cmd/frostfs-cli/modules/control/root.go similarity index 92% rename from cmd/neofs-cli/modules/control/root.go rename to cmd/frostfs-cli/modules/control/root.go index 660be7793..dd3560111 100644 --- a/cmd/neofs-cli/modules/control/root.go +++ b/cmd/frostfs-cli/modules/control/root.go @@ -1,7 +1,7 @@ package control import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-cli/modules/control/set_netmap_status.go b/cmd/frostfs-cli/modules/control/set_netmap_status.go similarity index 86% rename from cmd/neofs-cli/modules/control/set_netmap_status.go rename to cmd/frostfs-cli/modules/control/set_netmap_status.go index b0c5c12c6..13429d044 100644 --- a/cmd/neofs-cli/modules/control/set_netmap_status.go +++ b/cmd/frostfs-cli/modules/control/set_netmap_status.go @@ -3,11 +3,11 @@ package control import ( "fmt" - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/shards.go b/cmd/frostfs-cli/modules/control/shards.go similarity index 100% rename from cmd/neofs-cli/modules/control/shards.go rename to cmd/frostfs-cli/modules/control/shards.go diff --git a/cmd/neofs-cli/modules/control/shards_dump.go b/cmd/frostfs-cli/modules/control/shards_dump.go similarity index 85% rename from cmd/neofs-cli/modules/control/shards_dump.go rename to cmd/frostfs-cli/modules/control/shards_dump.go index 4b04a323d..00339a61e 100644 --- a/cmd/neofs-cli/modules/control/shards_dump.go +++ b/cmd/frostfs-cli/modules/control/shards_dump.go @@ -1,10 +1,10 @@ package control import ( - "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/shards_list.go b/cmd/frostfs-cli/modules/control/shards_list.go similarity index 88% rename from cmd/neofs-cli/modules/control/shards_list.go rename to cmd/frostfs-cli/modules/control/shards_list.go index d8711d69a..8fb8cd239 100644 --- a/cmd/neofs-cli/modules/control/shards_list.go +++ b/cmd/frostfs-cli/modules/control/shards_list.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/mr-tron/base58" - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/shards_restore.go b/cmd/frostfs-cli/modules/control/shards_restore.go similarity index 85% rename from cmd/neofs-cli/modules/control/shards_restore.go rename to cmd/frostfs-cli/modules/control/shards_restore.go index b61ccee97..66370dbfc 100644 --- a/cmd/neofs-cli/modules/control/shards_restore.go +++ b/cmd/frostfs-cli/modules/control/shards_restore.go @@ -1,10 +1,10 @@ package control import ( - "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/shards_set_mode.go b/cmd/frostfs-cli/modules/control/shards_set_mode.go similarity index 94% rename from cmd/neofs-cli/modules/control/shards_set_mode.go rename to cmd/frostfs-cli/modules/control/shards_set_mode.go index 0b63ca30b..2e3aecdd6 100644 --- a/cmd/neofs-cli/modules/control/shards_set_mode.go +++ b/cmd/frostfs-cli/modules/control/shards_set_mode.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "github.com/mr-tron/base58" - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/synchronize_tree.go b/cmd/frostfs-cli/modules/control/synchronize_tree.go similarity index 78% rename from cmd/neofs-cli/modules/control/synchronize_tree.go rename to cmd/frostfs-cli/modules/control/synchronize_tree.go index 2bf451519..ca15e2be1 100644 --- a/cmd/neofs-cli/modules/control/synchronize_tree.go +++ b/cmd/frostfs-cli/modules/control/synchronize_tree.go @@ -4,13 +4,13 @@ import ( "crypto/sha256" "errors" - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/control" - controlSvc "github.com/nspcc-dev/neofs-node/pkg/services/control/server" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + controlSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/control/server" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/control/util.go b/cmd/frostfs-cli/modules/control/util.go similarity index 75% rename from cmd/neofs-cli/modules/control/util.go rename to cmd/frostfs-cli/modules/control/util.go index 59bae90e6..bc42c0912 100644 --- a/cmd/neofs-cli/modules/control/util.go +++ b/cmd/frostfs-cli/modules/control/util.go @@ -4,13 +4,13 @@ import ( "crypto/ecdsa" "errors" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - controlSvc "github.com/nspcc-dev/neofs-node/pkg/services/control/server" - "github.com/nspcc-dev/neofs-sdk-go/client" - neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + controlSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/control/server" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" "github.com/spf13/cobra" ) @@ -46,7 +46,7 @@ func verifyResponse(cmd *cobra.Command, sigV2.SetKey(sigControl.GetKey()) sigV2.SetSign(sigControl.GetSign()) - var sig neofscrypto.Signature + var sig frostfscrypto.Signature common.ExitOnErr(cmd, "can't read signature: %w", sig.ReadFromV2(sigV2)) if !sig.Verify(body.StableMarshal(nil)) { diff --git a/cmd/neofs-cli/modules/netmap/get_epoch.go b/cmd/frostfs-cli/modules/netmap/get_epoch.go similarity index 67% rename from cmd/neofs-cli/modules/netmap/get_epoch.go rename to cmd/frostfs-cli/modules/netmap/get_epoch.go index 9ac6e64d3..327f9bac4 100644 --- a/cmd/neofs-cli/modules/netmap/get_epoch.go +++ b/cmd/frostfs-cli/modules/netmap/get_epoch.go @@ -1,10 +1,10 @@ package netmap import ( - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/netmap/netinfo.go b/cmd/frostfs-cli/modules/netmap/netinfo.go similarity index 86% rename from cmd/neofs-cli/modules/netmap/netinfo.go rename to cmd/frostfs-cli/modules/netmap/netinfo.go index 6999aa3df..87e9f6c84 100644 --- a/cmd/neofs-cli/modules/netmap/netinfo.go +++ b/cmd/frostfs-cli/modules/netmap/netinfo.go @@ -4,11 +4,11 @@ import ( "encoding/hex" "time" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" "github.com/nspcc-dev/neo-go/pkg/config/netmode" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/netmap/nodeinfo.go b/cmd/frostfs-cli/modules/netmap/nodeinfo.go similarity index 80% rename from cmd/neofs-cli/modules/netmap/nodeinfo.go rename to cmd/frostfs-cli/modules/netmap/nodeinfo.go index 9c14a1b73..36882f639 100644 --- a/cmd/neofs-cli/modules/netmap/nodeinfo.go +++ b/cmd/frostfs-cli/modules/netmap/nodeinfo.go @@ -3,11 +3,11 @@ package netmap import ( "encoding/hex" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/netmap/root.go b/cmd/frostfs-cli/modules/netmap/root.go similarity index 87% rename from cmd/neofs-cli/modules/netmap/root.go rename to cmd/frostfs-cli/modules/netmap/root.go index 45a2075f0..bdb34f73d 100644 --- a/cmd/neofs-cli/modules/netmap/root.go +++ b/cmd/frostfs-cli/modules/netmap/root.go @@ -1,7 +1,7 @@ package netmap import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/netmap/snapshot.go b/cmd/frostfs-cli/modules/netmap/snapshot.go similarity index 69% rename from cmd/neofs-cli/modules/netmap/snapshot.go rename to cmd/frostfs-cli/modules/netmap/snapshot.go index 0e9bf2b7b..4f95bc54b 100644 --- a/cmd/neofs-cli/modules/netmap/snapshot.go +++ b/cmd/frostfs-cli/modules/netmap/snapshot.go @@ -1,10 +1,10 @@ package netmap import ( - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/delete.go b/cmd/frostfs-cli/modules/object/delete.go similarity index 81% rename from cmd/neofs-cli/modules/object/delete.go rename to cmd/frostfs-cli/modules/object/delete.go index 6bf06c662..e2595a2c6 100644 --- a/cmd/neofs-cli/modules/object/delete.go +++ b/cmd/frostfs-cli/modules/object/delete.go @@ -3,12 +3,12 @@ package object import ( "fmt" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/get.go b/cmd/frostfs-cli/modules/object/get.go similarity index 87% rename from cmd/neofs-cli/modules/object/get.go rename to cmd/frostfs-cli/modules/object/get.go index 69bbd644a..277fd6a30 100644 --- a/cmd/neofs-cli/modules/object/get.go +++ b/cmd/frostfs-cli/modules/object/get.go @@ -6,14 +6,14 @@ import ( "io" "os" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/cheggaaa/pb" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/hash.go b/cmd/frostfs-cli/modules/object/hash.go similarity index 86% rename from cmd/neofs-cli/modules/object/hash.go rename to cmd/frostfs-cli/modules/object/hash.go index 2430443c7..85c882585 100644 --- a/cmd/neofs-cli/modules/object/hash.go +++ b/cmd/frostfs-cli/modules/object/hash.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-sdk-go/checksum" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-sdk-go/checksum" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/head.go b/cmd/frostfs-cli/modules/object/head.go similarity index 89% rename from cmd/neofs-cli/modules/object/head.go rename to cmd/frostfs-cli/modules/object/head.go index 81ac42cdc..447f7d821 100644 --- a/cmd/neofs-cli/modules/object/head.go +++ b/cmd/frostfs-cli/modules/object/head.go @@ -6,15 +6,15 @@ import ( "fmt" "os" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidSDK "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/lock.go b/cmd/frostfs-cli/modules/object/lock.go similarity index 82% rename from cmd/neofs-cli/modules/object/lock.go rename to cmd/frostfs-cli/modules/object/lock.go index fcb37cbe0..6a549a04f 100644 --- a/cmd/neofs-cli/modules/object/lock.go +++ b/cmd/frostfs-cli/modules/object/lock.go @@ -7,15 +7,15 @@ import ( "strconv" "time" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/put.go b/cmd/frostfs-cli/modules/object/put.go similarity index 92% rename from cmd/neofs-cli/modules/object/put.go rename to cmd/frostfs-cli/modules/object/put.go index 337e6c0d5..a08103ded 100644 --- a/cmd/neofs-cli/modules/object/put.go +++ b/cmd/frostfs-cli/modules/object/put.go @@ -10,15 +10,15 @@ import ( "strings" "time" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/cheggaaa/pb" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/range.go b/cmd/frostfs-cli/modules/object/range.go similarity index 89% rename from cmd/neofs-cli/modules/object/range.go rename to cmd/frostfs-cli/modules/object/range.go index effb0d67f..493d74c01 100644 --- a/cmd/neofs-cli/modules/object/range.go +++ b/cmd/frostfs-cli/modules/object/range.go @@ -9,13 +9,13 @@ import ( "strconv" "strings" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/root.go b/cmd/frostfs-cli/modules/object/root.go similarity index 92% rename from cmd/neofs-cli/modules/object/root.go rename to cmd/frostfs-cli/modules/object/root.go index d51b89f9b..f79bb433d 100644 --- a/cmd/neofs-cli/modules/object/root.go +++ b/cmd/frostfs-cli/modules/object/root.go @@ -1,7 +1,7 @@ package object import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/search.go b/cmd/frostfs-cli/modules/object/search.go similarity index 87% rename from cmd/neofs-cli/modules/object/search.go rename to cmd/frostfs-cli/modules/object/search.go index a6c099057..f6d8ef04e 100644 --- a/cmd/neofs-cli/modules/object/search.go +++ b/cmd/frostfs-cli/modules/object/search.go @@ -5,13 +5,13 @@ import ( "os" "strings" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oidSDK "github.com/nspcc-dev/neofs-sdk-go/object/id" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidSDK "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/object/util.go b/cmd/frostfs-cli/modules/object/util.go similarity index 94% rename from cmd/neofs-cli/modules/object/util.go rename to cmd/frostfs-cli/modules/object/util.go index 9436b18e8..614696525 100644 --- a/cmd/neofs-cli/modules/object/util.go +++ b/cmd/frostfs-cli/modules/object/util.go @@ -7,17 +7,17 @@ import ( "os" "strings" - internal "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/client" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" + internal "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + sessionCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/session" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -194,7 +194,7 @@ func _readVerifiedSession(cmd *cobra.Command, dst SessionPrm, key *ecdsa.Private common.ExitOnErr(cmd, "", errors.New("unrelated object in the session")) case tok.AssertVerb(cmdVerb): common.ExitOnErr(cmd, "", errors.New("wrong verb of the session")) - case tok.AssertAuthKey((*neofsecdsa.PublicKey)(&key.PublicKey)): + case tok.AssertAuthKey((*frostfsecdsa.PublicKey)(&key.PublicKey)): common.ExitOnErr(cmd, "", errors.New("unrelated key in the session")) case tok.VerifySignature(): common.ExitOnErr(cmd, "", errors.New("invalid signature of the session data")) diff --git a/cmd/neofs-cli/modules/root.go b/cmd/frostfs-cli/modules/root.go similarity index 66% rename from cmd/neofs-cli/modules/root.go rename to cmd/frostfs-cli/modules/root.go index 32f4776eb..9650f819c 100644 --- a/cmd/neofs-cli/modules/root.go +++ b/cmd/frostfs-cli/modules/root.go @@ -4,22 +4,22 @@ import ( "os" "path/filepath" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + accountingCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/accounting" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/acl" + bearerCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/bearer" + containerCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/container" + controlCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/control" + netmapCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/netmap" + objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + sessionCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/session" + sgCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/storagegroup" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/tree" + utilCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/util" + "github.com/TrueCloudLab/frostfs-node/misc" + "github.com/TrueCloudLab/frostfs-node/pkg/util/gendoc" "github.com/mitchellh/go-homedir" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - accountingCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/accounting" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/acl" - bearerCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/bearer" - containerCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/container" - controlCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/control" - netmapCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/netmap" - objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object" - sessionCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/session" - sgCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/storagegroup" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/tree" - utilCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/util" - "github.com/nspcc-dev/neofs-node/misc" - "github.com/nspcc-dev/neofs-node/pkg/util/gendoc" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -35,12 +35,12 @@ var ( // rootCmd represents the base command when called without any subcommands. var rootCmd = &cobra.Command{ - Use: "neofs-cli", + Use: "frostfs-cli", Short: "Command Line Tool to work with NeoFS", Long: `NeoFS CLI provides all basic interactions with NeoFS and it's services. It contains commands for interaction with NeoFS nodes using different versions -of neofs-api and some useful utilities for compiling ACL rules from JSON +of frostfs-api and some useful utilities for compiling ACL rules from JSON notation, managing container access through protocol gates, querying network map and much more!`, Run: entryPoint, @@ -62,7 +62,7 @@ func init() { // Here you will define your flags and configuration settings. // Cobra supports persistent flags, which, if defined here, // will be global for your application. - rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "Config file (default is $HOME/.config/neofs-cli/config.yaml)") + rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "Config file (default is $HOME/.config/frostfs-cli/config.yaml)") rootCmd.PersistentFlags().BoolP(commonflags.Verbose, commonflags.VerboseShorthand, false, commonflags.VerboseUsage) @@ -107,8 +107,8 @@ func initConfig() { home, err := homedir.Dir() common.ExitOnErr(rootCmd, "", err) - // Search config in `$HOME/.config/neofs-cli/` with name "config.yaml" - viper.AddConfigPath(filepath.Join(home, ".config", "neofs-cli")) + // Search config in `$HOME/.config/frostfs-cli/` with name "config.yaml" + viper.AddConfigPath(filepath.Join(home, ".config", "frostfs-cli")) viper.SetConfigName("config") viper.SetConfigType("yaml") } diff --git a/cmd/neofs-cli/modules/session/create.go b/cmd/frostfs-cli/modules/session/create.go similarity index 86% rename from cmd/neofs-cli/modules/session/create.go rename to cmd/frostfs-cli/modules/session/create.go index 290241020..48e677fc2 100644 --- a/cmd/neofs-cli/modules/session/create.go +++ b/cmd/frostfs-cli/modules/session/create.go @@ -4,15 +4,15 @@ import ( "fmt" "os" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/google/uuid" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-sdk-go/client" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - "github.com/nspcc-dev/neofs-sdk-go/session" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -109,7 +109,7 @@ func CreateSession(dst *session.Object, c *client.Client, lifetime uint64) error binIDSession := sessionRes.ID() - var keySession neofsecdsa.PublicKey + var keySession frostfsecdsa.PublicKey err = keySession.Decode(sessionRes.SessionKey()) if err != nil { diff --git a/cmd/neofs-cli/modules/session/root.go b/cmd/frostfs-cli/modules/session/root.go similarity index 100% rename from cmd/neofs-cli/modules/session/root.go rename to cmd/frostfs-cli/modules/session/root.go diff --git a/cmd/neofs-cli/modules/storagegroup/delete.go b/cmd/frostfs-cli/modules/storagegroup/delete.go similarity index 67% rename from cmd/neofs-cli/modules/storagegroup/delete.go rename to cmd/frostfs-cli/modules/storagegroup/delete.go index 10f7bde7b..aac98a18e 100644 --- a/cmd/neofs-cli/modules/storagegroup/delete.go +++ b/cmd/frostfs-cli/modules/storagegroup/delete.go @@ -1,13 +1,13 @@ package storagegroup import ( - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/storagegroup/get.go b/cmd/frostfs-cli/modules/storagegroup/get.go similarity index 74% rename from cmd/neofs-cli/modules/storagegroup/get.go rename to cmd/frostfs-cli/modules/storagegroup/get.go index d7e3aea60..f0156fabd 100644 --- a/cmd/neofs-cli/modules/storagegroup/get.go +++ b/cmd/frostfs-cli/modules/storagegroup/get.go @@ -3,14 +3,14 @@ package storagegroup import ( "bytes" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - storagegroupSDK "github.com/nspcc-dev/neofs-sdk-go/storagegroup" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + storagegroupSDK "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/storagegroup/list.go b/cmd/frostfs-cli/modules/storagegroup/list.go similarity index 65% rename from cmd/neofs-cli/modules/storagegroup/list.go rename to cmd/frostfs-cli/modules/storagegroup/list.go index 0d5be94d6..05dde2dae 100644 --- a/cmd/neofs-cli/modules/storagegroup/list.go +++ b/cmd/frostfs-cli/modules/storagegroup/list.go @@ -1,13 +1,13 @@ package storagegroup import ( - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/storagegroup" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/storagegroup/put.go b/cmd/frostfs-cli/modules/storagegroup/put.go similarity index 80% rename from cmd/neofs-cli/modules/storagegroup/put.go rename to cmd/frostfs-cli/modules/storagegroup/put.go index aacc49ede..fb05bcf73 100644 --- a/cmd/neofs-cli/modules/storagegroup/put.go +++ b/cmd/frostfs-cli/modules/storagegroup/put.go @@ -5,18 +5,18 @@ import ( "errors" "fmt" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/storagegroup" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - storagegroupSDK "github.com/nspcc-dev/neofs-sdk-go/storagegroup" - "github.com/nspcc-dev/neofs-sdk-go/user" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + storagegroupSDK "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/storagegroup/root.go b/cmd/frostfs-cli/modules/storagegroup/root.go similarity index 84% rename from cmd/neofs-cli/modules/storagegroup/root.go rename to cmd/frostfs-cli/modules/storagegroup/root.go index 926a6e1ef..f19d9b31a 100644 --- a/cmd/neofs-cli/modules/storagegroup/root.go +++ b/cmd/frostfs-cli/modules/storagegroup/root.go @@ -1,8 +1,8 @@ package storagegroup import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + objectCli "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/modules/object" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/storagegroup/util.go b/cmd/frostfs-cli/modules/storagegroup/util.go similarity index 77% rename from cmd/neofs-cli/modules/storagegroup/util.go rename to cmd/frostfs-cli/modules/storagegroup/util.go index da97198df..375fc9329 100644 --- a/cmd/neofs-cli/modules/storagegroup/util.go +++ b/cmd/frostfs-cli/modules/storagegroup/util.go @@ -3,10 +3,10 @@ package storagegroup import ( "fmt" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/tree/add.go b/cmd/frostfs-cli/modules/tree/add.go similarity index 85% rename from cmd/neofs-cli/modules/tree/add.go rename to cmd/frostfs-cli/modules/tree/add.go index 223073334..270889e11 100644 --- a/cmd/neofs-cli/modules/tree/add.go +++ b/cmd/frostfs-cli/modules/tree/add.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/tree/add_by_path.go b/cmd/frostfs-cli/modules/tree/add_by_path.go similarity index 85% rename from cmd/neofs-cli/modules/tree/add_by_path.go rename to cmd/frostfs-cli/modules/tree/add_by_path.go index 756e42ffd..1f15279b3 100644 --- a/cmd/neofs-cli/modules/tree/add_by_path.go +++ b/cmd/frostfs-cli/modules/tree/add_by_path.go @@ -4,12 +4,12 @@ import ( "crypto/sha256" "strings" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/tree/client.go b/cmd/frostfs-cli/modules/tree/client.go similarity index 83% rename from cmd/neofs-cli/modules/tree/client.go rename to cmd/frostfs-cli/modules/tree/client.go index 2590fc15d..82cfdfca3 100644 --- a/cmd/neofs-cli/modules/tree/client.go +++ b/cmd/frostfs-cli/modules/tree/client.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" "github.com/spf13/viper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/cmd/neofs-cli/modules/tree/get_by_path.go b/cmd/frostfs-cli/modules/tree/get_by_path.go similarity index 85% rename from cmd/neofs-cli/modules/tree/get_by_path.go rename to cmd/frostfs-cli/modules/tree/get_by_path.go index 2546f88ce..cf94d198f 100644 --- a/cmd/neofs-cli/modules/tree/get_by_path.go +++ b/cmd/frostfs-cli/modules/tree/get_by_path.go @@ -4,12 +4,12 @@ import ( "crypto/sha256" "strings" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/tree/list.go b/cmd/frostfs-cli/modules/tree/list.go similarity index 78% rename from cmd/neofs-cli/modules/tree/list.go rename to cmd/frostfs-cli/modules/tree/list.go index 076cf1f1d..ca138e004 100644 --- a/cmd/neofs-cli/modules/tree/list.go +++ b/cmd/frostfs-cli/modules/tree/list.go @@ -3,11 +3,11 @@ package tree import ( "crypto/sha256" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/tree/root.go b/cmd/frostfs-cli/modules/tree/root.go similarity index 90% rename from cmd/neofs-cli/modules/tree/root.go rename to cmd/frostfs-cli/modules/tree/root.go index a59ef4177..9dad9d527 100644 --- a/cmd/neofs-cli/modules/tree/root.go +++ b/cmd/frostfs-cli/modules/tree/root.go @@ -1,7 +1,7 @@ package tree import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/util/acl.go b/cmd/frostfs-cli/modules/util/acl.go similarity index 98% rename from cmd/neofs-cli/modules/util/acl.go rename to cmd/frostfs-cli/modules/util/acl.go index db9790c4d..1d568ee48 100644 --- a/cmd/neofs-cli/modules/util/acl.go +++ b/cmd/frostfs-cli/modules/util/acl.go @@ -9,10 +9,10 @@ import ( "strings" "text/tabwriter" + "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/flynn-archive/go-shlex" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" - "github.com/nspcc-dev/neofs-sdk-go/eacl" "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/util/convert.go b/cmd/frostfs-cli/modules/util/convert.go similarity index 100% rename from cmd/neofs-cli/modules/util/convert.go rename to cmd/frostfs-cli/modules/util/convert.go diff --git a/cmd/neofs-cli/modules/util/convert_eacl.go b/cmd/frostfs-cli/modules/util/convert_eacl.go similarity index 91% rename from cmd/neofs-cli/modules/util/convert_eacl.go rename to cmd/frostfs-cli/modules/util/convert_eacl.go index ab38875dd..667194324 100644 --- a/cmd/neofs-cli/modules/util/convert_eacl.go +++ b/cmd/frostfs-cli/modules/util/convert_eacl.go @@ -5,8 +5,8 @@ import ( "encoding/json" "os" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/util/keyer.go b/cmd/frostfs-cli/modules/util/keyer.go similarity index 94% rename from cmd/neofs-cli/modules/util/keyer.go rename to cmd/frostfs-cli/modules/util/keyer.go index 1f66a8866..748d6b3e0 100644 --- a/cmd/neofs-cli/modules/util/keyer.go +++ b/cmd/frostfs-cli/modules/util/keyer.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/pkg/util/keyer" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/pkg/util/keyer" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/util/locode.go b/cmd/frostfs-cli/modules/util/locode.go similarity index 100% rename from cmd/neofs-cli/modules/util/locode.go rename to cmd/frostfs-cli/modules/util/locode.go diff --git a/cmd/neofs-cli/modules/util/locode_generate.go b/cmd/frostfs-cli/modules/util/locode_generate.go similarity index 85% rename from cmd/neofs-cli/modules/util/locode_generate.go rename to cmd/frostfs-cli/modules/util/locode_generate.go index be92a4abe..e34bcc4b1 100644 --- a/cmd/neofs-cli/modules/util/locode_generate.go +++ b/cmd/frostfs-cli/modules/util/locode_generate.go @@ -1,12 +1,12 @@ package util import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db" - airportsdb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db/airports" - locodebolt "github.com/nspcc-dev/neofs-node/pkg/util/locode/db/boltdb" - continentsdb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db/continents/geojson" - csvlocode "github.com/nspcc-dev/neofs-node/pkg/util/locode/table/csv" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + airportsdb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/airports" + locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" + continentsdb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/continents/geojson" + csvlocode "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/table/csv" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/util/locode_info.go b/cmd/frostfs-cli/modules/util/locode_info.go similarity index 86% rename from cmd/neofs-cli/modules/util/locode_info.go rename to cmd/frostfs-cli/modules/util/locode_info.go index 927dfad93..defd12e8a 100644 --- a/cmd/neofs-cli/modules/util/locode_info.go +++ b/cmd/frostfs-cli/modules/util/locode_info.go @@ -1,9 +1,9 @@ package util import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db" - locodebolt "github.com/nspcc-dev/neofs-node/pkg/util/locode/db/boltdb" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/util/root.go b/cmd/frostfs-cli/modules/util/root.go similarity index 89% rename from cmd/neofs-cli/modules/util/root.go rename to cmd/frostfs-cli/modules/util/root.go index be2963143..aff1709fa 100644 --- a/cmd/neofs-cli/modules/util/root.go +++ b/cmd/frostfs-cli/modules/util/root.go @@ -1,7 +1,7 @@ package util import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/neofs-cli/modules/util/sign.go b/cmd/frostfs-cli/modules/util/sign.go similarity index 100% rename from cmd/neofs-cli/modules/util/sign.go rename to cmd/frostfs-cli/modules/util/sign.go diff --git a/cmd/neofs-cli/modules/util/sign_bearer.go b/cmd/frostfs-cli/modules/util/sign_bearer.go similarity index 86% rename from cmd/neofs-cli/modules/util/sign_bearer.go rename to cmd/frostfs-cli/modules/util/sign_bearer.go index 29225d11f..515e325d0 100644 --- a/cmd/neofs-cli/modules/util/sign_bearer.go +++ b/cmd/frostfs-cli/modules/util/sign_bearer.go @@ -3,9 +3,9 @@ package util import ( "os" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-cli/modules/util/sign_session.go b/cmd/frostfs-cli/modules/util/sign_session.go similarity index 86% rename from cmd/neofs-cli/modules/util/sign_session.go rename to cmd/frostfs-cli/modules/util/sign_session.go index 3ec169e1e..610ca8af6 100644 --- a/cmd/neofs-cli/modules/util/sign_session.go +++ b/cmd/frostfs-cli/modules/util/sign_session.go @@ -7,10 +7,10 @@ import ( "fmt" "os" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags" - "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/common" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/commonflags" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-cli/internal/key" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-ir/defaults.go b/cmd/frostfs-ir/defaults.go similarity index 96% rename from cmd/neofs-ir/defaults.go rename to cmd/frostfs-ir/defaults.go index 09091effa..986f515bd 100644 --- a/cmd/neofs-ir/defaults.go +++ b/cmd/frostfs-ir/defaults.go @@ -45,7 +45,7 @@ func defaultConfiguration(cfg *viper.Viper) { cfg.SetDefault("without_mainnet", false) - cfg.SetDefault("node.persistent_state.path", ".neofs-ir-state") + cfg.SetDefault("node.persistent_state.path", ".frostfs-ir-state") cfg.SetDefault("morph.endpoint.client", []string{}) cfg.SetDefault("morph.dial_timeout", 15*time.Second) @@ -61,7 +61,7 @@ func defaultConfiguration(cfg *viper.Viper) { cfg.SetDefault("wallet.password", "") // password cfg.SetDefault("contracts.netmap", "") - cfg.SetDefault("contracts.neofs", "") + cfg.SetDefault("contracts.frostfs", "") cfg.SetDefault("contracts.balance", "") cfg.SetDefault("contracts.container", "") cfg.SetDefault("contracts.audit", "") @@ -81,7 +81,7 @@ func defaultConfiguration(cfg *viper.Viper) { cfg.SetDefault("workers.netmap", "10") cfg.SetDefault("workers.balance", "10") - cfg.SetDefault("workers.neofs", "10") + cfg.SetDefault("workers.frostfs", "10") cfg.SetDefault("workers.container", "10") cfg.SetDefault("workers.alphabet", "10") cfg.SetDefault("workers.reputation", "10") diff --git a/cmd/neofs-ir/main.go b/cmd/frostfs-ir/main.go similarity index 90% rename from cmd/neofs-ir/main.go rename to cmd/frostfs-ir/main.go index eff9e4457..09b923761 100644 --- a/cmd/neofs-ir/main.go +++ b/cmd/frostfs-ir/main.go @@ -9,10 +9,10 @@ import ( "os/signal" "syscall" - "github.com/nspcc-dev/neofs-node/misc" - "github.com/nspcc-dev/neofs-node/pkg/innerring" - httputil "github.com/nspcc-dev/neofs-node/pkg/util/http" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/misc" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring" + httputil "github.com/TrueCloudLab/frostfs-node/pkg/util/http" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/viper" "go.uber.org/zap" @@ -35,7 +35,7 @@ func exitErr(err error) { func main() { configFile := flag.String("config", "", "path to config") - versionFlag := flag.Bool("version", false, "neofs-ir node version") + versionFlag := flag.Bool("version", false, "frostfs-ir node version") flag.Parse() if *versionFlag { diff --git a/cmd/neofs-lens/internal/blobovnicza/inspect.go b/cmd/frostfs-lens/internal/blobovnicza/inspect.go similarity index 79% rename from cmd/neofs-lens/internal/blobovnicza/inspect.go rename to cmd/frostfs-lens/internal/blobovnicza/inspect.go index 579958507..6d41e2cbf 100644 --- a/cmd/neofs-lens/internal/blobovnicza/inspect.go +++ b/cmd/frostfs-lens/internal/blobovnicza/inspect.go @@ -1,10 +1,10 @@ package blobovnicza import ( - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/blobovnicza/list.go b/cmd/frostfs-lens/internal/blobovnicza/list.go similarity index 76% rename from cmd/neofs-lens/internal/blobovnicza/list.go rename to cmd/frostfs-lens/internal/blobovnicza/list.go index 2d116efe4..e1be6ade5 100644 --- a/cmd/neofs-lens/internal/blobovnicza/list.go +++ b/cmd/frostfs-lens/internal/blobovnicza/list.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/blobovnicza/root.go b/cmd/frostfs-lens/internal/blobovnicza/root.go similarity index 77% rename from cmd/neofs-lens/internal/blobovnicza/root.go rename to cmd/frostfs-lens/internal/blobovnicza/root.go index 59ce6e990..9551b9fe1 100644 --- a/cmd/neofs-lens/internal/blobovnicza/root.go +++ b/cmd/frostfs-lens/internal/blobovnicza/root.go @@ -1,8 +1,8 @@ package blobovnicza import ( - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/errors.go b/cmd/frostfs-lens/internal/errors.go similarity index 100% rename from cmd/neofs-lens/internal/errors.go rename to cmd/frostfs-lens/internal/errors.go diff --git a/cmd/neofs-lens/internal/flags.go b/cmd/frostfs-lens/internal/flags.go similarity index 100% rename from cmd/neofs-lens/internal/flags.go rename to cmd/frostfs-lens/internal/flags.go diff --git a/cmd/neofs-lens/internal/meta/inspect.go b/cmd/frostfs-lens/internal/meta/inspect.go similarity index 82% rename from cmd/neofs-lens/internal/meta/inspect.go rename to cmd/frostfs-lens/internal/meta/inspect.go index 7d84a1bd7..9cc82473d 100644 --- a/cmd/neofs-lens/internal/meta/inspect.go +++ b/cmd/frostfs-lens/internal/meta/inspect.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/meta/list-garbage.go b/cmd/frostfs-lens/internal/meta/list-garbage.go similarity index 82% rename from cmd/neofs-lens/internal/meta/list-garbage.go rename to cmd/frostfs-lens/internal/meta/list-garbage.go index d5f70c950..cae55ffba 100644 --- a/cmd/neofs-lens/internal/meta/list-garbage.go +++ b/cmd/frostfs-lens/internal/meta/list-garbage.go @@ -1,8 +1,8 @@ package meta import ( - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/meta/list-graveyard.go b/cmd/frostfs-lens/internal/meta/list-graveyard.go similarity index 84% rename from cmd/neofs-lens/internal/meta/list-graveyard.go rename to cmd/frostfs-lens/internal/meta/list-graveyard.go index d5bcfe5d6..d6c0f4aa5 100644 --- a/cmd/neofs-lens/internal/meta/list-graveyard.go +++ b/cmd/frostfs-lens/internal/meta/list-graveyard.go @@ -1,8 +1,8 @@ package meta import ( - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/meta/root.go b/cmd/frostfs-lens/internal/meta/root.go similarity index 83% rename from cmd/neofs-lens/internal/meta/root.go rename to cmd/frostfs-lens/internal/meta/root.go index fca99512b..3ed9b08a1 100644 --- a/cmd/neofs-lens/internal/meta/root.go +++ b/cmd/frostfs-lens/internal/meta/root.go @@ -3,8 +3,8 @@ package meta import ( "time" - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" "github.com/spf13/cobra" "go.etcd.io/bbolt" ) diff --git a/cmd/neofs-lens/internal/printers.go b/cmd/frostfs-lens/internal/printers.go similarity index 89% rename from cmd/neofs-lens/internal/printers.go rename to cmd/frostfs-lens/internal/printers.go index d530132fa..d6abe9334 100644 --- a/cmd/neofs-lens/internal/printers.go +++ b/cmd/frostfs-lens/internal/printers.go @@ -3,9 +3,9 @@ package common import ( "os" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/writecache/inspect.go b/cmd/frostfs-lens/internal/writecache/inspect.go similarity index 79% rename from cmd/neofs-lens/internal/writecache/inspect.go rename to cmd/frostfs-lens/internal/writecache/inspect.go index f1dcfd9ae..0c02a12bd 100644 --- a/cmd/neofs-lens/internal/writecache/inspect.go +++ b/cmd/frostfs-lens/internal/writecache/inspect.go @@ -1,9 +1,9 @@ package writecache import ( - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - "github.com/nspcc-dev/neofs-sdk-go/object" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/writecache/list.go b/cmd/frostfs-lens/internal/writecache/list.go similarity index 76% rename from cmd/neofs-lens/internal/writecache/list.go rename to cmd/frostfs-lens/internal/writecache/list.go index e2d7e3d34..776047e4a 100644 --- a/cmd/neofs-lens/internal/writecache/list.go +++ b/cmd/frostfs-lens/internal/writecache/list.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/spf13/cobra" ) diff --git a/cmd/neofs-lens/internal/writecache/root.go b/cmd/frostfs-lens/internal/writecache/root.go similarity index 77% rename from cmd/neofs-lens/internal/writecache/root.go rename to cmd/frostfs-lens/internal/writecache/root.go index 0e0e77867..6cf6c342c 100644 --- a/cmd/neofs-lens/internal/writecache/root.go +++ b/cmd/frostfs-lens/internal/writecache/root.go @@ -1,8 +1,8 @@ package writecache import ( - common "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" + common "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" "github.com/spf13/cobra" "go.etcd.io/bbolt" ) diff --git a/cmd/neofs-lens/root.go b/cmd/frostfs-lens/root.go similarity index 70% rename from cmd/neofs-lens/root.go rename to cmd/frostfs-lens/root.go index c49d2d0dc..05da99fd3 100644 --- a/cmd/neofs-lens/root.go +++ b/cmd/frostfs-lens/root.go @@ -3,16 +3,16 @@ package main import ( "os" - "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal/blobovnicza" - "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal/meta" - "github.com/nspcc-dev/neofs-node/cmd/neofs-lens/internal/writecache" - "github.com/nspcc-dev/neofs-node/misc" - "github.com/nspcc-dev/neofs-node/pkg/util/gendoc" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/meta" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-lens/internal/writecache" + "github.com/TrueCloudLab/frostfs-node/misc" + "github.com/TrueCloudLab/frostfs-node/pkg/util/gendoc" "github.com/spf13/cobra" ) var command = &cobra.Command{ - Use: "neofs-lens", + Use: "frostfs-lens", Short: "NeoFS Storage Engine Lens", Long: `NeoFS Storage Engine Lens provides tools to browse the contents of the NeoFS storage engine.`, RunE: entryPoint, diff --git a/cmd/neofs-node/accounting.go b/cmd/frostfs-node/accounting.go similarity index 60% rename from cmd/neofs-node/accounting.go rename to cmd/frostfs-node/accounting.go index 21cac4e41..1d3889355 100644 --- a/cmd/neofs-node/accounting.go +++ b/cmd/frostfs-node/accounting.go @@ -1,11 +1,11 @@ package main import ( - accountingGRPC "github.com/nspcc-dev/neofs-api-go/v2/accounting/grpc" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/balance" - accountingTransportGRPC "github.com/nspcc-dev/neofs-node/pkg/network/transport/accounting/grpc" - accountingService "github.com/nspcc-dev/neofs-node/pkg/services/accounting" - accounting "github.com/nspcc-dev/neofs-node/pkg/services/accounting/morph" + accountingGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/accounting/grpc" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + accountingTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/accounting/grpc" + accountingService "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting" + accounting "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting/morph" ) func initAccountingService(c *cfg) { diff --git a/cmd/neofs-node/attributes.go b/cmd/frostfs-node/attributes.go similarity index 59% rename from cmd/neofs-node/attributes.go rename to cmd/frostfs-node/attributes.go index cf1b05244..97d07850d 100644 --- a/cmd/neofs-node/attributes.go +++ b/cmd/frostfs-node/attributes.go @@ -1,8 +1,8 @@ package main import ( - nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" - "github.com/nspcc-dev/neofs-node/pkg/util/attributes" + nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "github.com/TrueCloudLab/frostfs-node/pkg/util/attributes" ) func parseAttributes(c *cfg) { diff --git a/cmd/neofs-node/cache.go b/cmd/frostfs-node/cache.go similarity index 93% rename from cmd/neofs-node/cache.go rename to cmd/frostfs-node/cache.go index 25260e11f..407253e40 100644 --- a/cmd/neofs-node/cache.go +++ b/cmd/frostfs-node/cache.go @@ -4,15 +4,15 @@ import ( "sync" "time" + "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/user" lru "github.com/hashicorp/golang-lru" - "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - putsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/put" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - netmapSDK "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/user" ) type netValueReader func(interface{}) (interface{}, error) @@ -356,11 +356,11 @@ func newCachedIRFetcher(f interface{ InnerRingKeys() ([][]byte, error) }) *cache irFetcherCacheSize = 1 // we intend to store only one value // Without the cache in the testnet we can see several hundred simultaneous - // requests (neofs-node #1278), so limiting the request rate solves the issue. + // requests (frostfs-node #1278), so limiting the request rate solves the issue. // // Exact request rate doesn't really matter because Inner Ring list update // happens extremely rare, but there is no side chain events for that as - // for now (neofs-contract v0.15.0 notary disabled env) to monitor it. + // for now (frostfs-contract v0.15.0 notary disabled env) to monitor it. irFetcherCacheTTL = 30 * time.Second ) diff --git a/cmd/neofs-node/config.go b/cmd/frostfs-node/config.go similarity index 87% rename from cmd/neofs-node/config.go rename to cmd/frostfs-node/config.go index 16c274550..d9fe14dad 100644 --- a/cmd/neofs-node/config.go +++ b/cmd/frostfs-node/config.go @@ -15,56 +15,56 @@ import ( "syscall" "time" + netmapV2 "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + apiclientconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/apiclient" + contractsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/contracts" + engineconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" + shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + blobovniczaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza" + fstreeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/fstree" + loggerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" + metricsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" + nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + objectconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/object" + replicatorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" + "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + netmapCore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + shardmode "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/metrics" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + containerClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + netmap2 "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-node/pkg/network/cache" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/tombstone" + tsourse "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/tombstone/source" + "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" + trustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/state" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-sdk-go/version" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" neogoutil "github.com/nspcc-dev/neo-go/pkg/util" - netmapV2 "github.com/nspcc-dev/neofs-api-go/v2/netmap" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - apiclientconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/apiclient" - contractsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/contracts" - engineconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine" - shardconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard" - blobovniczaconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza" - fstreeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/fstree" - loggerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/logger" - metricsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/metrics" - nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" - objectconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/object" - replicatorconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/replicator" - "github.com/nspcc-dev/neofs-node/pkg/core/container" - netmapCore "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - shardmode "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - "github.com/nspcc-dev/neofs-node/pkg/metrics" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - containerClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - netmap2 "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-node/pkg/network/cache" - "github.com/nspcc-dev/neofs-node/pkg/services/control" - getsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/get" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/tombstone" - tsourse "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/tombstone/source" - "github.com/nspcc-dev/neofs-node/pkg/services/replicator" - trustcontroller "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/controller" - truststorage "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/storage" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" - "github.com/nspcc-dev/neofs-node/pkg/services/util/response" - "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-node/pkg/util/state" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - "github.com/nspcc-dev/neofs-sdk-go/user" - "github.com/nspcc-dev/neofs-sdk-go/version" "github.com/panjf2000/ants/v2" "go.etcd.io/bbolt" "go.uber.org/atomic" diff --git a/cmd/neofs-node/config/apiclient/config.go b/cmd/frostfs-node/config/apiclient/config.go similarity index 95% rename from cmd/neofs-node/config/apiclient/config.go rename to cmd/frostfs-node/config/apiclient/config.go index 12f78af39..f22622838 100644 --- a/cmd/neofs-node/config/apiclient/config.go +++ b/cmd/frostfs-node/config/apiclient/config.go @@ -3,7 +3,7 @@ package apiclientconfig import ( "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/neofs-node/config/apiclient/config_test.go b/cmd/frostfs-node/config/apiclient/config_test.go similarity index 79% rename from cmd/neofs-node/config/apiclient/config_test.go rename to cmd/frostfs-node/config/apiclient/config_test.go index a7da7d553..0b16b077f 100644 --- a/cmd/neofs-node/config/apiclient/config_test.go +++ b/cmd/frostfs-node/config/apiclient/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - apiclientconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/apiclient" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + apiclientconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/apiclient" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/calls.go b/cmd/frostfs-node/config/calls.go similarity index 100% rename from cmd/neofs-node/config/calls.go rename to cmd/frostfs-node/config/calls.go diff --git a/cmd/neofs-node/config/calls_test.go b/cmd/frostfs-node/config/calls_test.go similarity index 88% rename from cmd/neofs-node/config/calls_test.go rename to cmd/frostfs-node/config/calls_test.go index 20dd8007e..e3a7f7f16 100644 --- a/cmd/neofs-node/config/calls_test.go +++ b/cmd/frostfs-node/config/calls_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/internal" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/cast.go b/cmd/frostfs-node/config/cast.go similarity index 100% rename from cmd/neofs-node/config/cast.go rename to cmd/frostfs-node/config/cast.go diff --git a/cmd/neofs-node/config/cast_test.go b/cmd/frostfs-node/config/cast_test.go similarity index 96% rename from cmd/neofs-node/config/cast_test.go rename to cmd/frostfs-node/config/cast_test.go index 85b6e1e95..931b2cee4 100644 --- a/cmd/neofs-node/config/cast_test.go +++ b/cmd/frostfs-node/config/cast_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/config.go b/cmd/frostfs-node/config/config.go similarity index 94% rename from cmd/neofs-node/config/config.go rename to cmd/frostfs-node/config/config.go index c68bed9fc..6f06a374e 100644 --- a/cmd/neofs-node/config/config.go +++ b/cmd/frostfs-node/config/config.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/internal" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" "github.com/spf13/viper" ) diff --git a/cmd/neofs-node/config/contracts/config.go b/cmd/frostfs-node/config/contracts/config.go similarity index 96% rename from cmd/neofs-node/config/contracts/config.go rename to cmd/frostfs-node/config/contracts/config.go index cf1ac4b03..2db12350d 100644 --- a/cmd/neofs-node/config/contracts/config.go +++ b/cmd/frostfs-node/config/contracts/config.go @@ -3,8 +3,8 @@ package contractsconfig import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" ) const ( diff --git a/cmd/neofs-node/config/contracts/config_test.go b/cmd/frostfs-node/config/contracts/config_test.go similarity index 88% rename from cmd/neofs-node/config/contracts/config_test.go rename to cmd/frostfs-node/config/contracts/config_test.go index 673fe519d..47032f074 100644 --- a/cmd/neofs-node/config/contracts/config_test.go +++ b/cmd/frostfs-node/config/contracts/config_test.go @@ -3,10 +3,10 @@ package contractsconfig_test import ( "testing" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + contractsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/contracts" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - contractsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/contracts" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/control/config.go b/cmd/frostfs-node/config/control/config.go similarity index 95% rename from cmd/neofs-node/config/control/config.go rename to cmd/frostfs-node/config/control/config.go index 92605728f..b35bf4fb2 100644 --- a/cmd/neofs-node/config/control/config.go +++ b/cmd/frostfs-node/config/control/config.go @@ -3,8 +3,8 @@ package controlconfig import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" ) // GRPCConfig is a wrapper over "grpc" config section which provides access diff --git a/cmd/neofs-node/config/control/config_test.go b/cmd/frostfs-node/config/control/config_test.go similarity index 81% rename from cmd/neofs-node/config/control/config_test.go rename to cmd/frostfs-node/config/control/config_test.go index 27ba75ed7..f4ff5432f 100644 --- a/cmd/neofs-node/config/control/config_test.go +++ b/cmd/frostfs-node/config/control/config_test.go @@ -3,10 +3,10 @@ package controlconfig_test import ( "testing" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + controlconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/control" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - controlconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/control" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/engine/config.go b/cmd/frostfs-node/config/engine/config.go similarity index 90% rename from cmd/neofs-node/config/engine/config.go rename to cmd/frostfs-node/config/engine/config.go index 86f6b70c4..53dd7fdbe 100644 --- a/cmd/neofs-node/config/engine/config.go +++ b/cmd/frostfs-node/config/engine/config.go @@ -4,9 +4,9 @@ import ( "errors" "strconv" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - shardconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) const ( diff --git a/cmd/neofs-node/config/engine/config_test.go b/cmd/frostfs-node/config/engine/config_test.go similarity index 88% rename from cmd/neofs-node/config/engine/config_test.go rename to cmd/frostfs-node/config/engine/config_test.go index c57017fb5..a797853b4 100644 --- a/cmd/neofs-node/config/engine/config_test.go +++ b/cmd/frostfs-node/config/engine/config_test.go @@ -5,14 +5,14 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - engineconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine" - shardconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard" - blobovniczaconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza" - fstreeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/fstree" - piloramaconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/pilorama" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + engineconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" + shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + blobovniczaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza" + fstreeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/fstree" + piloramaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/pilorama" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go similarity index 89% rename from cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go rename to cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go index 3861ffa05..36a7b81cb 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/blobovnicza/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/blobovnicza/config.go @@ -1,9 +1,9 @@ package blobovniczaconfig import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - boltdbconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/boltdb" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + boltdbconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/blobstor/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/config.go similarity index 68% rename from cmd/neofs-node/config/engine/shard/blobstor/config.go rename to cmd/frostfs-node/config/engine/shard/blobstor/config.go index 4e6dc86c2..b827b3f21 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/config.go @@ -3,10 +3,10 @@ package blobstorconfig import ( "strconv" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor/storage" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor/storage" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/blobstor/fstree/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/fstree/config.go similarity index 86% rename from cmd/neofs-node/config/engine/shard/blobstor/fstree/config.go rename to cmd/frostfs-node/config/engine/shard/blobstor/fstree/config.go index cf9df9020..45eeae296 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/fstree/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/fstree/config.go @@ -1,8 +1,8 @@ package fstree import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/blobstor/storage/config.go b/cmd/frostfs-node/config/engine/shard/blobstor/storage/config.go similarity index 93% rename from cmd/neofs-node/config/engine/shard/blobstor/storage/config.go rename to cmd/frostfs-node/config/engine/shard/blobstor/storage/config.go index 84c957422..4d0db437a 100644 --- a/cmd/neofs-node/config/engine/shard/blobstor/storage/config.go +++ b/cmd/frostfs-node/config/engine/shard/blobstor/storage/config.go @@ -3,7 +3,7 @@ package storage import ( "io/fs" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) type Config config.Config diff --git a/cmd/neofs-node/config/engine/shard/boltdb/boltdb.go b/cmd/frostfs-node/config/engine/shard/boltdb/boltdb.go similarity index 95% rename from cmd/neofs-node/config/engine/shard/boltdb/boltdb.go rename to cmd/frostfs-node/config/engine/shard/boltdb/boltdb.go index ed35130aa..11ba913c0 100644 --- a/cmd/neofs-node/config/engine/shard/boltdb/boltdb.go +++ b/cmd/frostfs-node/config/engine/shard/boltdb/boltdb.go @@ -4,7 +4,7 @@ import ( "io/fs" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/config.go b/cmd/frostfs-node/config/engine/shard/config.go similarity index 82% rename from cmd/neofs-node/config/engine/shard/config.go rename to cmd/frostfs-node/config/engine/shard/config.go index 610ebdf1e..4ced17995 100644 --- a/cmd/neofs-node/config/engine/shard/config.go +++ b/cmd/frostfs-node/config/engine/shard/config.go @@ -3,13 +3,13 @@ package shardconfig import ( "fmt" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - blobstorconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/blobstor" - gcconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/gc" - metabaseconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/metabase" - piloramaconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/pilorama" - writecacheconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/writecache" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + blobstorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/blobstor" + gcconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/gc" + metabaseconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/metabase" + piloramaconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/pilorama" + writecacheconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/gc/config.go b/cmd/frostfs-node/config/engine/shard/gc/config.go similarity index 95% rename from cmd/neofs-node/config/engine/shard/gc/config.go rename to cmd/frostfs-node/config/engine/shard/gc/config.go index 30e28e1cb..9f5fb2b44 100644 --- a/cmd/neofs-node/config/engine/shard/gc/config.go +++ b/cmd/frostfs-node/config/engine/shard/gc/config.go @@ -3,7 +3,7 @@ package gcconfig import ( "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/metabase/config.go b/cmd/frostfs-node/config/engine/shard/metabase/config.go similarity index 81% rename from cmd/neofs-node/config/engine/shard/metabase/config.go rename to cmd/frostfs-node/config/engine/shard/metabase/config.go index ec684e017..02ff7fda6 100644 --- a/cmd/neofs-node/config/engine/shard/metabase/config.go +++ b/cmd/frostfs-node/config/engine/shard/metabase/config.go @@ -1,8 +1,8 @@ package metabaseconfig import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - boltdbconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/boltdb" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + boltdbconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/pilorama/config.go b/cmd/frostfs-node/config/engine/shard/pilorama/config.go similarity index 96% rename from cmd/neofs-node/config/engine/shard/pilorama/config.go rename to cmd/frostfs-node/config/engine/shard/pilorama/config.go index e63c1cf8b..0e2090b69 100644 --- a/cmd/neofs-node/config/engine/shard/pilorama/config.go +++ b/cmd/frostfs-node/config/engine/shard/pilorama/config.go @@ -4,7 +4,7 @@ import ( "io/fs" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/engine/shard/writecache/config.go b/cmd/frostfs-node/config/engine/shard/writecache/config.go similarity index 94% rename from cmd/neofs-node/config/engine/shard/writecache/config.go rename to cmd/frostfs-node/config/engine/shard/writecache/config.go index 2d7082609..ec03940a1 100644 --- a/cmd/neofs-node/config/engine/shard/writecache/config.go +++ b/cmd/frostfs-node/config/engine/shard/writecache/config.go @@ -1,8 +1,8 @@ package writecacheconfig import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - boltdbconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard/boltdb" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + boltdbconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard/boltdb" ) // Config is a wrapper over the config section diff --git a/cmd/neofs-node/config/grpc/config.go b/cmd/frostfs-node/config/grpc/config.go similarity index 97% rename from cmd/neofs-node/config/grpc/config.go rename to cmd/frostfs-node/config/grpc/config.go index 865ee07b6..f2ef36084 100644 --- a/cmd/neofs-node/config/grpc/config.go +++ b/cmd/frostfs-node/config/grpc/config.go @@ -4,7 +4,7 @@ import ( "errors" "strconv" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) var ( diff --git a/cmd/neofs-node/config/grpc/config_test.go b/cmd/frostfs-node/config/grpc/config_test.go similarity index 73% rename from cmd/neofs-node/config/grpc/config_test.go rename to cmd/frostfs-node/config/grpc/config_test.go index c05ff243c..bb94d7f15 100644 --- a/cmd/neofs-node/config/grpc/config_test.go +++ b/cmd/frostfs-node/config/grpc/config_test.go @@ -3,8 +3,8 @@ package grpcconfig import ( "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) @@ -29,17 +29,17 @@ func TestGRPCSection(t *testing.T) { switch num { case 0: - require.Equal(t, "s01.neofs.devenv:8080", sc.Endpoint()) + require.Equal(t, "s01.frostfs.devenv:8080", sc.Endpoint()) require.NotNil(t, tls) require.Equal(t, "/path/to/cert", tls.CertificateFile()) require.Equal(t, "/path/to/key", tls.KeyFile()) require.False(t, tls.UseInsecureCrypto()) case 1: - require.Equal(t, "s02.neofs.devenv:8080", sc.Endpoint()) + require.Equal(t, "s02.frostfs.devenv:8080", sc.Endpoint()) require.Nil(t, tls) case 2: - require.Equal(t, "s03.neofs.devenv:8080", sc.Endpoint()) + require.Equal(t, "s03.frostfs.devenv:8080", sc.Endpoint()) require.NotNil(t, tls) require.True(t, tls.UseInsecureCrypto()) } diff --git a/cmd/neofs-node/config/internal/env.go b/cmd/frostfs-node/config/internal/env.go similarity index 100% rename from cmd/neofs-node/config/internal/env.go rename to cmd/frostfs-node/config/internal/env.go diff --git a/cmd/neofs-node/config/internal/env_test.go b/cmd/frostfs-node/config/internal/env_test.go similarity index 73% rename from cmd/neofs-node/config/internal/env_test.go rename to cmd/frostfs-node/config/internal/env_test.go index a599ad457..80c8a0e57 100644 --- a/cmd/neofs-node/config/internal/env_test.go +++ b/cmd/frostfs-node/config/internal/env_test.go @@ -3,7 +3,7 @@ package internal_test import ( "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/internal" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/internal" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/logger/config.go b/cmd/frostfs-node/config/logger/config.go similarity index 86% rename from cmd/neofs-node/config/logger/config.go rename to cmd/frostfs-node/config/logger/config.go index f994db056..47ca5eac2 100644 --- a/cmd/neofs-node/config/logger/config.go +++ b/cmd/frostfs-node/config/logger/config.go @@ -1,7 +1,7 @@ package loggerconfig import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/neofs-node/config/logger/config_test.go b/cmd/frostfs-node/config/logger/config_test.go similarity index 71% rename from cmd/neofs-node/config/logger/config_test.go rename to cmd/frostfs-node/config/logger/config_test.go index faf2c7997..c2df2fab9 100644 --- a/cmd/neofs-node/config/logger/config_test.go +++ b/cmd/frostfs-node/config/logger/config_test.go @@ -3,9 +3,9 @@ package loggerconfig_test import ( "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - loggerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/logger" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + loggerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/metrics/config.go b/cmd/frostfs-node/config/metrics/config.go similarity index 94% rename from cmd/neofs-node/config/metrics/config.go rename to cmd/frostfs-node/config/metrics/config.go index d5941a6fd..3c2fff99a 100644 --- a/cmd/neofs-node/config/metrics/config.go +++ b/cmd/frostfs-node/config/metrics/config.go @@ -3,7 +3,7 @@ package metricsconfig import ( "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/neofs-node/config/metrics/config_test.go b/cmd/frostfs-node/config/metrics/config_test.go similarity index 80% rename from cmd/neofs-node/config/metrics/config_test.go rename to cmd/frostfs-node/config/metrics/config_test.go index 2a041a248..ad355e113 100644 --- a/cmd/neofs-node/config/metrics/config_test.go +++ b/cmd/frostfs-node/config/metrics/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - metricsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/metrics" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + metricsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/morph/config.go b/cmd/frostfs-node/config/morph/config.go similarity index 95% rename from cmd/neofs-node/config/morph/config.go rename to cmd/frostfs-node/config/morph/config.go index 782b941e2..f87c72ac6 100644 --- a/cmd/neofs-node/config/morph/config.go +++ b/cmd/frostfs-node/config/morph/config.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) const ( diff --git a/cmd/neofs-node/config/morph/config_test.go b/cmd/frostfs-node/config/morph/config_test.go similarity index 80% rename from cmd/neofs-node/config/morph/config_test.go rename to cmd/frostfs-node/config/morph/config_test.go index 78f528e80..9a7085a58 100644 --- a/cmd/neofs-node/config/morph/config_test.go +++ b/cmd/frostfs-node/config/morph/config_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - morphconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/morph" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + morphconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/node/config.go b/cmd/frostfs-node/config/node/config.go similarity index 96% rename from cmd/neofs-node/config/node/config.go rename to cmd/frostfs-node/config/node/config.go index 315956434..510946e85 100644 --- a/cmd/neofs-node/config/node/config.go +++ b/cmd/frostfs-node/config/node/config.go @@ -6,10 +6,10 @@ import ( "strconv" "time" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + utilConfig "github.com/TrueCloudLab/frostfs-node/pkg/util/config" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - "github.com/nspcc-dev/neofs-node/pkg/network" - utilConfig "github.com/nspcc-dev/neofs-node/pkg/util/config" ) // PersistentSessionsConfig is a wrapper over "persistent_sessions" config section @@ -39,7 +39,7 @@ const ( attributePrefix = "attribute" // PersistentStatePathDefault is a default path for persistent state file. - PersistentStatePathDefault = ".neofs-storage-state" + PersistentStatePathDefault = ".frostfs-storage-state" // NotificationTimeoutDefault is a default timeout for object notification operation. NotificationTimeoutDefault = 5 * time.Second diff --git a/cmd/neofs-node/config/node/config_test.go b/cmd/frostfs-node/config/node/config_test.go similarity index 92% rename from cmd/neofs-node/config/node/config_test.go rename to cmd/frostfs-node/config/node/config_test.go index f0bf39eca..575f6c38f 100644 --- a/cmd/neofs-node/config/node/config_test.go +++ b/cmd/frostfs-node/config/node/config_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/pkg/network" "github.com/nspcc-dev/neo-go/pkg/encoding/address" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" - "github.com/nspcc-dev/neofs-node/pkg/network" "github.com/stretchr/testify/require" ) @@ -95,12 +95,12 @@ func TestNodeSection(t *testing.T) { host: "grpcs://localhost:8083", }, { - str: "/dns4/s01.neofs.devenv/tcp/8080", - host: "s01.neofs.devenv:8080", + str: "/dns4/s01.frostfs.devenv/tcp/8080", + host: "s01.frostfs.devenv:8080", }, { - str: "/dns4/s02.neofs.devenv/tcp/8081", - host: "s02.neofs.devenv:8081", + str: "/dns4/s02.frostfs.devenv/tcp/8081", + host: "s02.frostfs.devenv:8081", }, { str: "/ip4/127.0.0.1/tcp/8082", diff --git a/cmd/neofs-node/config/node/wallet.json b/cmd/frostfs-node/config/node/wallet.json similarity index 100% rename from cmd/neofs-node/config/node/wallet.json rename to cmd/frostfs-node/config/node/wallet.json diff --git a/cmd/neofs-node/config/node/wallet.key b/cmd/frostfs-node/config/node/wallet.key similarity index 100% rename from cmd/neofs-node/config/node/wallet.key rename to cmd/frostfs-node/config/node/wallet.key diff --git a/cmd/neofs-node/config/object/config.go b/cmd/frostfs-node/config/object/config.go similarity index 93% rename from cmd/neofs-node/config/object/config.go rename to cmd/frostfs-node/config/object/config.go index 1460f130c..b675b39e0 100644 --- a/cmd/neofs-node/config/object/config.go +++ b/cmd/frostfs-node/config/object/config.go @@ -1,7 +1,7 @@ package objectconfig import ( - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) // PutConfig is a wrapper over "put" config section which provides access diff --git a/cmd/neofs-node/config/object/config_test.go b/cmd/frostfs-node/config/object/config_test.go similarity index 72% rename from cmd/neofs-node/config/object/config_test.go rename to cmd/frostfs-node/config/object/config_test.go index 522040cfc..db7c1d62e 100644 --- a/cmd/neofs-node/config/object/config_test.go +++ b/cmd/frostfs-node/config/object/config_test.go @@ -3,9 +3,9 @@ package objectconfig_test import ( "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - objectconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/object" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + objectconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/object" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/opts.go b/cmd/frostfs-node/config/opts.go similarity index 100% rename from cmd/neofs-node/config/opts.go rename to cmd/frostfs-node/config/opts.go diff --git a/cmd/neofs-node/config/policer/config.go b/cmd/frostfs-node/config/policer/config.go similarity index 89% rename from cmd/neofs-node/config/policer/config.go rename to cmd/frostfs-node/config/policer/config.go index 5e6117555..6b5990fb0 100644 --- a/cmd/neofs-node/config/policer/config.go +++ b/cmd/frostfs-node/config/policer/config.go @@ -3,7 +3,7 @@ package policerconfig import ( "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/neofs-node/config/policer/config_test.go b/cmd/frostfs-node/config/policer/config_test.go similarity index 72% rename from cmd/neofs-node/config/policer/config_test.go rename to cmd/frostfs-node/config/policer/config_test.go index 03a2f3a86..a67e6f360 100644 --- a/cmd/neofs-node/config/policer/config_test.go +++ b/cmd/frostfs-node/config/policer/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - policerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/policer" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + policerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/policer" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/profiler/config.go b/cmd/frostfs-node/config/profiler/config.go similarity index 94% rename from cmd/neofs-node/config/profiler/config.go rename to cmd/frostfs-node/config/profiler/config.go index 6419b803a..17aabaa80 100644 --- a/cmd/neofs-node/config/profiler/config.go +++ b/cmd/frostfs-node/config/profiler/config.go @@ -3,7 +3,7 @@ package profilerconfig import ( "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/neofs-node/config/profiler/config_test.go b/cmd/frostfs-node/config/profiler/config_test.go similarity index 80% rename from cmd/neofs-node/config/profiler/config_test.go rename to cmd/frostfs-node/config/profiler/config_test.go index 2a5bd292d..edb457bbb 100644 --- a/cmd/neofs-node/config/profiler/config_test.go +++ b/cmd/frostfs-node/config/profiler/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - profilerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/profiler" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + profilerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/profiler" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/replicator/config.go b/cmd/frostfs-node/config/replicator/config.go similarity index 91% rename from cmd/neofs-node/config/replicator/config.go rename to cmd/frostfs-node/config/replicator/config.go index 6e17d872e..dcff08ea0 100644 --- a/cmd/neofs-node/config/replicator/config.go +++ b/cmd/frostfs-node/config/replicator/config.go @@ -3,7 +3,7 @@ package replicatorconfig import ( "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) const ( diff --git a/cmd/neofs-node/config/replicator/config_test.go b/cmd/frostfs-node/config/replicator/config_test.go similarity index 75% rename from cmd/neofs-node/config/replicator/config_test.go rename to cmd/frostfs-node/config/replicator/config_test.go index 60fd24ea0..64d410c93 100644 --- a/cmd/neofs-node/config/replicator/config_test.go +++ b/cmd/frostfs-node/config/replicator/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - replicatorconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/replicator" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + replicatorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/config/test/config.go b/cmd/frostfs-node/config/test/config.go similarity index 95% rename from cmd/neofs-node/config/test/config.go rename to cmd/frostfs-node/config/test/config.go index f7921ce59..5dbc20f48 100644 --- a/cmd/neofs-node/config/test/config.go +++ b/cmd/frostfs-node/config/test/config.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" ) func fromFile(path string) *config.Config { diff --git a/cmd/neofs-node/config/test/config.json b/cmd/frostfs-node/config/test/config.json similarity index 100% rename from cmd/neofs-node/config/test/config.json rename to cmd/frostfs-node/config/test/config.json diff --git a/cmd/neofs-node/config/test/config.yaml b/cmd/frostfs-node/config/test/config.yaml similarity index 100% rename from cmd/neofs-node/config/test/config.yaml rename to cmd/frostfs-node/config/test/config.yaml diff --git a/cmd/neofs-node/config/tree/config.go b/cmd/frostfs-node/config/tree/config.go similarity index 95% rename from cmd/neofs-node/config/tree/config.go rename to cmd/frostfs-node/config/tree/config.go index 9b65700be..8f4341e47 100644 --- a/cmd/neofs-node/config/tree/config.go +++ b/cmd/frostfs-node/config/tree/config.go @@ -1,6 +1,6 @@ package treeconfig -import "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" +import "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" const ( subsection = "tree" diff --git a/cmd/neofs-node/config/tree/config_test.go b/cmd/frostfs-node/config/tree/config_test.go similarity index 80% rename from cmd/neofs-node/config/tree/config_test.go rename to cmd/frostfs-node/config/tree/config_test.go index c65b32c38..f2f2ff225 100644 --- a/cmd/neofs-node/config/tree/config_test.go +++ b/cmd/frostfs-node/config/tree/config_test.go @@ -3,9 +3,9 @@ package treeconfig_test import ( "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" - treeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/tree" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" + treeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/container.go b/cmd/frostfs-node/container.go similarity index 91% rename from cmd/neofs-node/container.go rename to cmd/frostfs-node/container.go index 0ad924d3b..d39d49899 100644 --- a/cmd/neofs-node/container.go +++ b/cmd/frostfs-node/container.go @@ -9,28 +9,28 @@ import ( "fmt" "strconv" - containerV2 "github.com/nspcc-dev/neofs-api-go/v2/container" - containerGRPC "github.com/nspcc-dev/neofs-api-go/v2/container/grpc" - "github.com/nspcc-dev/neofs-node/pkg/core/client" - containerCore "github.com/nspcc-dev/neofs-node/pkg/core/container" - netmapCore "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container" - containerTransportGRPC "github.com/nspcc-dev/neofs-node/pkg/network/transport/container/grpc" - containerService "github.com/nspcc-dev/neofs-node/pkg/services/container" - loadcontroller "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/controller" - loadroute "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/route" - placementrouter "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/route/placement" - loadstorage "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/storage" - containerMorph "github.com/nspcc-dev/neofs-node/pkg/services/container/morph" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apiClient "github.com/nspcc-dev/neofs-sdk-go/client" - containerSDK "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/user" + containerV2 "github.com/TrueCloudLab/frostfs-api-go/v2/container" + containerGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/container/grpc" + "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + containerCore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + netmapCore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" + containerTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/container/grpc" + containerService "github.com/TrueCloudLab/frostfs-node/pkg/services/container" + loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + loadroute "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route" + placementrouter "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route/placement" + loadstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/storage" + containerMorph "github.com/TrueCloudLab/frostfs-node/pkg/services/container/morph" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apiClient "github.com/TrueCloudLab/frostfs-sdk-go/client" + containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/control.go b/cmd/frostfs-node/control.go similarity index 85% rename from cmd/neofs-node/control.go rename to cmd/frostfs-node/control.go index 02ece79da..9b491e310 100644 --- a/cmd/neofs-node/control.go +++ b/cmd/frostfs-node/control.go @@ -4,11 +4,11 @@ import ( "context" "net" - controlconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/control" - "github.com/nspcc-dev/neofs-node/pkg/services/control" - controlSvc "github.com/nspcc-dev/neofs-node/pkg/services/control/server" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + controlconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/control" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + controlSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/control/server" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" "google.golang.org/grpc" ) diff --git a/cmd/neofs-node/grpc.go b/cmd/frostfs-node/grpc.go similarity index 95% rename from cmd/neofs-node/grpc.go rename to cmd/frostfs-node/grpc.go index c5e0f9c9e..b9c7c9704 100644 --- a/cmd/neofs-node/grpc.go +++ b/cmd/frostfs-node/grpc.go @@ -7,8 +7,8 @@ import ( "net" "time" - grpcconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/grpc" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + grpcconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/grpc" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/cmd/neofs-node/main.go b/cmd/frostfs-node/main.go similarity index 93% rename from cmd/neofs-node/main.go rename to cmd/frostfs-node/main.go index 6edca30b6..09da49e9d 100644 --- a/cmd/neofs-node/main.go +++ b/cmd/frostfs-node/main.go @@ -9,9 +9,9 @@ import ( "os/signal" "syscall" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - "github.com/nspcc-dev/neofs-node/misc" - "github.com/nspcc-dev/neofs-node/pkg/services/control" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + "github.com/TrueCloudLab/frostfs-node/misc" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" "go.uber.org/zap" ) @@ -36,7 +36,7 @@ func fatalOnErrDetails(details string, err error) { func main() { configFile := flag.String("config", "", "path to config") - versionFlag := flag.Bool("version", false, "neofs node version") + versionFlag := flag.Bool("version", false, "frostfs node version") dryRunFlag := flag.Bool("check", false, "validate configuration and exit") flag.Parse() diff --git a/cmd/neofs-node/metrics.go b/cmd/frostfs-node/metrics.go similarity index 85% rename from cmd/neofs-node/metrics.go rename to cmd/frostfs-node/metrics.go index bef602200..193b71d3d 100644 --- a/cmd/neofs-node/metrics.go +++ b/cmd/frostfs-node/metrics.go @@ -3,8 +3,8 @@ package main import ( "context" - metricsconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/metrics" - httputil "github.com/nspcc-dev/neofs-node/pkg/util/http" + metricsconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/metrics" + httputil "github.com/TrueCloudLab/frostfs-node/pkg/util/http" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/morph.go b/cmd/frostfs-node/morph.go similarity index 94% rename from cmd/neofs-node/morph.go rename to cmd/frostfs-node/morph.go index 669912291..c9476e1ff 100644 --- a/cmd/neofs-node/morph.go +++ b/cmd/frostfs-node/morph.go @@ -6,17 +6,17 @@ import ( "fmt" "time" + morphconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/morph" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/subscriber" + "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - morphconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/morph" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/subscriber" - "github.com/nspcc-dev/neofs-node/pkg/util/rand" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/netmap.go b/cmd/frostfs-node/netmap.go similarity index 92% rename from cmd/neofs-node/netmap.go rename to cmd/frostfs-node/netmap.go index 080a47e11..580da8e0b 100644 --- a/cmd/neofs-node/netmap.go +++ b/cmd/frostfs-node/netmap.go @@ -5,20 +5,20 @@ import ( "errors" "fmt" - netmapGRPC "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc" - nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/metrics" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - "github.com/nspcc-dev/neofs-node/pkg/network" - netmapTransportGRPC "github.com/nspcc-dev/neofs-node/pkg/network/transport/netmap/grpc" - "github.com/nspcc-dev/neofs-node/pkg/services/control" - netmapService "github.com/nspcc-dev/neofs-node/pkg/services/netmap" - netmapSDK "github.com/nspcc-dev/neofs-sdk-go/netmap" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" - "github.com/nspcc-dev/neofs-sdk-go/version" + netmapGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/netmap/grpc" + nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/metrics" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + netmapTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/netmap/grpc" + "github.com/TrueCloudLab/frostfs-node/pkg/services/control" + netmapService "github.com/TrueCloudLab/frostfs-node/pkg/services/netmap" + netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + "github.com/TrueCloudLab/frostfs-sdk-go/version" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/notificator.go b/cmd/frostfs-node/notificator.go similarity index 86% rename from cmd/neofs-node/notificator.go rename to cmd/frostfs-node/notificator.go index 54344db3f..10093f5b2 100644 --- a/cmd/neofs-node/notificator.go +++ b/cmd/frostfs-node/notificator.go @@ -4,15 +4,15 @@ import ( "encoding/hex" "fmt" - nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - "github.com/nspcc-dev/neofs-node/pkg/services/notificator" - "github.com/nspcc-dev/neofs-node/pkg/services/notificator/nats" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/services/notificator" + "github.com/TrueCloudLab/frostfs-node/pkg/services/notificator/nats" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/object.go b/cmd/frostfs-node/object.go similarity index 83% rename from cmd/neofs-node/object.go rename to cmd/frostfs-node/object.go index 9707d1aab..682682bf6 100644 --- a/cmd/neofs-node/object.go +++ b/cmd/frostfs-node/object.go @@ -6,45 +6,45 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/object" - objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc" - policerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/policer" - replicatorconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/replicator" - coreclient "github.com/nspcc-dev/neofs-node/pkg/core/client" - containercore "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" - morphClient "github.com/nspcc-dev/neofs-node/pkg/morph/client" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - objectTransportGRPC "github.com/nspcc-dev/neofs-node/pkg/network/transport/object/grpc" - objectService "github.com/nspcc-dev/neofs-node/pkg/services/object" - "github.com/nspcc-dev/neofs-node/pkg/services/object/acl" - v2 "github.com/nspcc-dev/neofs-node/pkg/services/object/acl/v2" - deletesvc "github.com/nspcc-dev/neofs-node/pkg/services/object/delete" - deletesvcV2 "github.com/nspcc-dev/neofs-node/pkg/services/object/delete/v2" - getsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/get" - getsvcV2 "github.com/nspcc-dev/neofs-node/pkg/services/object/get/v2" - headsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/head" - putsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/put" - putsvcV2 "github.com/nspcc-dev/neofs-node/pkg/services/object/put/v2" - searchsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/search" - searchsvcV2 "github.com/nspcc-dev/neofs-node/pkg/services/object/search/v2" - "github.com/nspcc-dev/neofs-node/pkg/services/object/util" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" - "github.com/nspcc-dev/neofs-node/pkg/services/policer" - "github.com/nspcc-dev/neofs-node/pkg/services/replicator" - truststorage "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/storage" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/client" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - eaclSDK "github.com/nspcc-dev/neofs-sdk-go/eacl" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" + policerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/policer" + replicatorconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/replicator" + coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" + morphClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + objectTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/object/grpc" + objectService "github.com/TrueCloudLab/frostfs-node/pkg/services/object" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object/acl" + v2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/acl/v2" + deletesvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/delete" + deletesvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/delete/v2" + getsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get" + getsvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/get/v2" + headsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/head" + putsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put" + putsvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/put/v2" + searchsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search" + searchsvcV2 "github.com/TrueCloudLab/frostfs-node/pkg/services/object/search/v2" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object/util" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "github.com/TrueCloudLab/frostfs-node/pkg/services/policer" + "github.com/TrueCloudLab/frostfs-node/pkg/services/replicator" + truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/pprof.go b/cmd/frostfs-node/pprof.go similarity index 84% rename from cmd/neofs-node/pprof.go rename to cmd/frostfs-node/pprof.go index a64fa8574..73461879c 100644 --- a/cmd/neofs-node/pprof.go +++ b/cmd/frostfs-node/pprof.go @@ -3,8 +3,8 @@ package main import ( "context" - profilerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/profiler" - httputil "github.com/nspcc-dev/neofs-node/pkg/util/http" + profilerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/profiler" + httputil "github.com/TrueCloudLab/frostfs-node/pkg/util/http" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/reputation.go b/cmd/frostfs-node/reputation.go similarity index 81% rename from cmd/neofs-node/reputation.go rename to cmd/frostfs-node/reputation.go index 739dacdf1..a9a28c54b 100644 --- a/cmd/neofs-node/reputation.go +++ b/cmd/frostfs-node/reputation.go @@ -4,32 +4,32 @@ import ( "context" "fmt" - v2reputation "github.com/nspcc-dev/neofs-api-go/v2/reputation" - v2reputationgrpc "github.com/nspcc-dev/neofs-api-go/v2/reputation/grpc" - "github.com/nspcc-dev/neofs-api-go/v2/session" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/common" - intermediatereputation "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/intermediate" - localreputation "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/local" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/ticker" - repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - grpcreputation "github.com/nspcc-dev/neofs-node/pkg/network/transport/reputation/grpc" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - reputationrouter "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common/router" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust" - eigentrustcalc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/calculator" - eigentrustctrl "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/controller" - intermediateroutes "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/routes" - consumerstorage "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/storage/consumers" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/storage/daughters" - localtrustcontroller "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/controller" - localroutes "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/routes" - truststorage "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/storage" - reputationrpc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/rpc" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation" + v2reputation "github.com/TrueCloudLab/frostfs-api-go/v2/reputation" + v2reputationgrpc "github.com/TrueCloudLab/frostfs-api-go/v2/reputation/grpc" + "github.com/TrueCloudLab/frostfs-api-go/v2/session" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" + intermediatereputation "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/intermediate" + localreputation "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/local" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/ticker" + repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + grpcreputation "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/reputation/grpc" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + reputationrouter "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common/router" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + eigentrustctrl "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/controller" + intermediateroutes "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/routes" + consumerstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" + localtrustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + localroutes "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/routes" + truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + reputationrpc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/rpc" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/reputation/common/remote.go b/cmd/frostfs-node/reputation/common/remote.go similarity index 86% rename from cmd/neofs-node/reputation/common/remote.go rename to cmd/frostfs-node/reputation/common/remote.go index 95fb834da..b527fbf73 100644 --- a/cmd/neofs-node/reputation/common/remote.go +++ b/cmd/frostfs-node/reputation/common/remote.go @@ -3,12 +3,12 @@ package common import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/core/client" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - reputationrouter "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common/router" - trustcontroller "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/controller" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + reputationrouter "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common/router" + trustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" ) type clientCache interface { diff --git a/cmd/neofs-node/reputation/common/util.go b/cmd/frostfs-node/reputation/common/util.go similarity index 94% rename from cmd/neofs-node/reputation/common/util.go rename to cmd/frostfs-node/reputation/common/util.go index b1acf0539..c4943c24b 100644 --- a/cmd/neofs-node/reputation/common/util.go +++ b/cmd/frostfs-node/reputation/common/util.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" ) // EpochContext is a std context extended with epoch data. diff --git a/cmd/neofs-node/reputation/intermediate/calculator.go b/cmd/frostfs-node/reputation/intermediate/calculator.go similarity index 75% rename from cmd/neofs-node/reputation/intermediate/calculator.go rename to cmd/frostfs-node/reputation/intermediate/calculator.go index 158f17724..1cd61fa92 100644 --- a/cmd/neofs-node/reputation/intermediate/calculator.go +++ b/cmd/frostfs-node/reputation/intermediate/calculator.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust" - eigencalc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/calculator" - eigentrustctrl "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/controller" - apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigencalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + eigentrustctrl "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/controller" + apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" ) // InitialTrustSource is an implementation of the diff --git a/cmd/neofs-node/reputation/intermediate/consumers.go b/cmd/frostfs-node/reputation/intermediate/consumers.go similarity index 76% rename from cmd/neofs-node/reputation/intermediate/consumers.go rename to cmd/frostfs-node/reputation/intermediate/consumers.go index db0e9e54d..b69483cdb 100644 --- a/cmd/neofs-node/reputation/intermediate/consumers.go +++ b/cmd/frostfs-node/reputation/intermediate/consumers.go @@ -1,12 +1,12 @@ package intermediate import ( - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust" - eigencalc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/calculator" - consumerstorage "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/storage/consumers" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigencalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + consumerstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/reputation/intermediate/contract.go b/cmd/frostfs-node/reputation/intermediate/contract.go similarity index 87% rename from cmd/neofs-node/reputation/intermediate/contract.go rename to cmd/frostfs-node/reputation/intermediate/contract.go index f42599634..56b830c6a 100644 --- a/cmd/neofs-node/reputation/intermediate/contract.go +++ b/cmd/frostfs-node/reputation/intermediate/contract.go @@ -4,12 +4,12 @@ import ( "crypto/ecdsa" "fmt" - repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust" - eigentrustcalc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/calculator" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation" + repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust" + eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) @@ -91,7 +91,7 @@ func (fw FinalWriter) WriteIntermediateTrust(t eigentrust.IterationTrust) error gTrust.SetTrust(apiTrust) gTrust.SetManager(apiMangerPeerID) - err := gTrust.Sign(neofsecdsa.Signer(*fw.privatKey)) + err := gTrust.Sign(frostfsecdsa.Signer(*fw.privatKey)) if err != nil { fw.l.Debug( "failed to sign global trust", diff --git a/cmd/neofs-node/reputation/intermediate/daughters.go b/cmd/frostfs-node/reputation/intermediate/daughters.go similarity index 80% rename from cmd/neofs-node/reputation/intermediate/daughters.go rename to cmd/frostfs-node/reputation/intermediate/daughters.go index 4feffbf1f..fff159add 100644 --- a/cmd/neofs-node/reputation/intermediate/daughters.go +++ b/cmd/frostfs-node/reputation/intermediate/daughters.go @@ -1,10 +1,10 @@ package intermediate import ( - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/storage/daughters" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/reputation/intermediate/remote.go b/cmd/frostfs-node/reputation/intermediate/remote.go similarity index 82% rename from cmd/neofs-node/reputation/intermediate/remote.go rename to cmd/frostfs-node/reputation/intermediate/remote.go index 966f4e046..2b63b1a91 100644 --- a/cmd/neofs-node/reputation/intermediate/remote.go +++ b/cmd/frostfs-node/reputation/intermediate/remote.go @@ -3,14 +3,14 @@ package intermediate import ( "crypto/ecdsa" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/common" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/internal/client" - coreclient "github.com/nspcc-dev/neofs-node/pkg/core/client" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - eigentrustcalc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/calculator" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - reputationapi "github.com/nspcc-dev/neofs-sdk-go/reputation" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/internal/client" + coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + reputationapi "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/reputation/intermediate/storage.go b/cmd/frostfs-node/reputation/intermediate/storage.go similarity index 83% rename from cmd/neofs-node/reputation/intermediate/storage.go rename to cmd/frostfs-node/reputation/intermediate/storage.go index 538a947b3..5eec832d4 100644 --- a/cmd/neofs-node/reputation/intermediate/storage.go +++ b/cmd/frostfs-node/reputation/intermediate/storage.go @@ -3,10 +3,10 @@ package intermediate import ( "fmt" - eigentrustcalc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/calculator" - consumerstorage "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/storage/consumers" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/eigentrust/storage/daughters" - apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation" + eigentrustcalc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/calculator" + consumerstorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/consumers" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/eigentrust/storage/daughters" + apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" ) // DaughterTrustIteratorProvider is an implementation of the diff --git a/cmd/neofs-node/reputation/internal/client/client.go b/cmd/frostfs-node/reputation/internal/client/client.go similarity index 92% rename from cmd/neofs-node/reputation/internal/client/client.go rename to cmd/frostfs-node/reputation/internal/client/client.go index 6f845ce2d..ef5627dd8 100644 --- a/cmd/neofs-node/reputation/internal/client/client.go +++ b/cmd/frostfs-node/reputation/internal/client/client.go @@ -3,10 +3,10 @@ package internal import ( "context" - coreclient "github.com/nspcc-dev/neofs-node/pkg/core/client" - "github.com/nspcc-dev/neofs-sdk-go/client" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - "github.com/nspcc-dev/neofs-sdk-go/reputation" + coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-sdk-go/reputation" ) type commonPrm struct { diff --git a/cmd/neofs-node/reputation/internal/client/doc.go b/cmd/frostfs-node/reputation/internal/client/doc.go similarity index 100% rename from cmd/neofs-node/reputation/internal/client/doc.go rename to cmd/frostfs-node/reputation/internal/client/doc.go diff --git a/cmd/neofs-node/reputation/local/remote.go b/cmd/frostfs-node/reputation/local/remote.go similarity index 81% rename from cmd/neofs-node/reputation/local/remote.go rename to cmd/frostfs-node/reputation/local/remote.go index 8fbbd56fc..b9a644454 100644 --- a/cmd/neofs-node/reputation/local/remote.go +++ b/cmd/frostfs-node/reputation/local/remote.go @@ -3,13 +3,13 @@ package local import ( "crypto/ecdsa" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/common" - internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/internal/client" - coreclient "github.com/nspcc-dev/neofs-node/pkg/core/client" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - reputationapi "github.com/nspcc-dev/neofs-sdk-go/reputation" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/common" + internalclient "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/internal/client" + coreclient "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + reputationapi "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/reputation/local/storage.go b/cmd/frostfs-node/reputation/local/storage.go similarity index 78% rename from cmd/neofs-node/reputation/local/storage.go rename to cmd/frostfs-node/reputation/local/storage.go index 16961ceac..952a999a2 100644 --- a/cmd/neofs-node/reputation/local/storage.go +++ b/cmd/frostfs-node/reputation/local/storage.go @@ -4,13 +4,13 @@ import ( "bytes" "errors" - netmapcore "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - trustcontroller "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/controller" - truststorage "github.com/nspcc-dev/neofs-node/pkg/services/reputation/local/storage" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation" + netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + trustcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/controller" + truststorage "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/local/storage" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/reputation/ticker/fixed.go b/cmd/frostfs-node/reputation/ticker/fixed.go similarity index 100% rename from cmd/neofs-node/reputation/ticker/fixed.go rename to cmd/frostfs-node/reputation/ticker/fixed.go diff --git a/cmd/neofs-node/reputation/ticker/fixed_test.go b/cmd/frostfs-node/reputation/ticker/fixed_test.go similarity index 100% rename from cmd/neofs-node/reputation/ticker/fixed_test.go rename to cmd/frostfs-node/reputation/ticker/fixed_test.go diff --git a/cmd/neofs-node/session.go b/cmd/frostfs-node/session.go similarity index 63% rename from cmd/neofs-node/session.go rename to cmd/frostfs-node/session.go index df5755713..1dd9cc230 100644 --- a/cmd/neofs-node/session.go +++ b/cmd/frostfs-node/session.go @@ -5,17 +5,17 @@ import ( "fmt" "time" - "github.com/nspcc-dev/neofs-api-go/v2/session" - sessionGRPC "github.com/nspcc-dev/neofs-api-go/v2/session/grpc" - nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - sessionTransportGRPC "github.com/nspcc-dev/neofs-node/pkg/network/transport/session/grpc" - sessionSvc "github.com/nspcc-dev/neofs-node/pkg/services/session" - "github.com/nspcc-dev/neofs-node/pkg/services/session/storage" - "github.com/nspcc-dev/neofs-node/pkg/services/session/storage/persistent" - "github.com/nspcc-dev/neofs-node/pkg/services/session/storage/temporary" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-api-go/v2/session" + sessionGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/session/grpc" + nodeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/node" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + sessionTransportGRPC "github.com/TrueCloudLab/frostfs-node/pkg/network/transport/session/grpc" + sessionSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/session" + "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage" + "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage/persistent" + "github.com/TrueCloudLab/frostfs-node/pkg/services/session/storage/temporary" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) type sessionStorage interface { diff --git a/cmd/neofs-node/timers.go b/cmd/frostfs-node/timers.go similarity index 90% rename from cmd/neofs-node/timers.go rename to cmd/frostfs-node/timers.go index ae55d91f0..da2f6419d 100644 --- a/cmd/neofs-node/timers.go +++ b/cmd/frostfs-node/timers.go @@ -3,7 +3,7 @@ package main import ( "sync" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/reputation/ticker" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/reputation/ticker" ) type eigenTrustTickers struct { diff --git a/cmd/neofs-node/tree.go b/cmd/frostfs-node/tree.go similarity index 80% rename from cmd/neofs-node/tree.go rename to cmd/frostfs-node/tree.go index 5971d4594..e64625851 100644 --- a/cmd/neofs-node/tree.go +++ b/cmd/frostfs-node/tree.go @@ -4,14 +4,14 @@ import ( "context" "errors" - treeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/tree" - "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - containerClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container" - "github.com/nspcc-dev/neofs-node/pkg/services/tree" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + treeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" + "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + containerClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" + "github.com/TrueCloudLab/frostfs-node/pkg/services/tree" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/cmd/neofs-node/validate.go b/cmd/frostfs-node/validate.go similarity index 80% rename from cmd/neofs-node/validate.go rename to cmd/frostfs-node/validate.go index 1ac51ab57..31fd86647 100644 --- a/cmd/neofs-node/validate.go +++ b/cmd/frostfs-node/validate.go @@ -4,14 +4,14 @@ import ( "fmt" "path/filepath" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - engineconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine" - shardconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/engine/shard" - loggerconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/logger" - treeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/tree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + engineconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine" + shardconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/engine/shard" + loggerconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/logger" + treeconfig "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/tree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" ) // validateConfig validates storage node configuration. diff --git a/cmd/neofs-node/validate_test.go b/cmd/frostfs-node/validate_test.go similarity index 87% rename from cmd/neofs-node/validate_test.go rename to cmd/frostfs-node/validate_test.go index 44f51dbd3..90cab2d38 100644 --- a/cmd/neofs-node/validate_test.go +++ b/cmd/frostfs-node/validate_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config" - configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test" + "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config" + configtest "github.com/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/test" "github.com/stretchr/testify/require" ) diff --git a/cmd/neofs-node/worker.go b/cmd/frostfs-node/worker.go similarity index 100% rename from cmd/neofs-node/worker.go rename to cmd/frostfs-node/worker.go diff --git a/cmd/neofs-cli/main.go b/cmd/neofs-cli/main.go deleted file mode 100644 index abdf9a4d5..000000000 --- a/cmd/neofs-cli/main.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import cmd "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules" - -func main() { - cmd.Execute() -} diff --git a/cmd/neofs-cli/modules/completion.go b/cmd/neofs-cli/modules/completion.go deleted file mode 100644 index d551ad9b0..000000000 --- a/cmd/neofs-cli/modules/completion.go +++ /dev/null @@ -1,9 +0,0 @@ -package cmd - -import ( - "github.com/nspcc-dev/neofs-node/pkg/util/autocomplete" -) - -func init() { - rootCmd.AddCommand(autocomplete.Command("neofs-cli")) -} diff --git a/config/example/cli.yaml b/config/example/cli.yaml index 4eddb216b..0f8794bfd 100644 --- a/config/example/cli.yaml +++ b/config/example/cli.yaml @@ -3,5 +3,5 @@ wallet: wallets/wallet.json # path to the NEP-6 wallet file or path to private key file or WIF address: Nf5YDCHrrtFCbetGT8TF1kwH1SjnJjT9N1 # account address in the NEP-6 wallet, omit for default address password: secret # account password, use "" for empty password -rpc-endpoint: s01.neofs.devenv:8080 # NeoFS API endpoint of NeoFS node +rpc-endpoint: s01.frostfs.devenv:8080 # NeoFS API endpoint of NeoFS node endpoint: localhost:8090 # Control API endpoint of NeoFS node diff --git a/config/example/ir-control.yaml b/config/example/ir-control.yaml index 4de957e8f..a5cbafc49 100644 --- a/config/example/ir-control.yaml +++ b/config/example/ir-control.yaml @@ -1,6 +1,6 @@ --- endpoint: 'localhost:8090' -wallet: '/etc/neofs/ir/wallet.json' +wallet: '/etc/frostfs/ir/wallet.json' password: '' #ir: true diff --git a/config/example/ir.env b/config/example/ir.env index 235956d86..31ea2fdda 100644 --- a/config/example/ir.env +++ b/config/example/ir.env @@ -22,7 +22,7 @@ NEOFS_IR_CONTROL_GRPC_ENDPOINT=localhost:8090 NEOFS_IR_GOVERNANCE_DISABLE=false -NEOFS_IR_NODE_PERSISTENT_STATE_PATH=.neofs-ir-state +NEOFS_IR_NODE_PERSISTENT_STATE_PATH=.frostfs-ir-state NEOFS_IR_LOCODE_DB_PATH=/path/to/locode.db diff --git a/config/example/ir.yaml b/config/example/ir.yaml index afcd8d0bd..acf1e14bb 100644 --- a/config/example/ir.yaml +++ b/config/example/ir.yaml @@ -40,7 +40,7 @@ governance: node: persistent_state: - path: .neofs-ir-state # Path to application state file + path: .frostfs-ir-state # Path to application state file locode: db: diff --git a/config/example/node-control.yaml b/config/example/node-control.yaml index 5e82b7d20..2e32b2d96 100644 --- a/config/example/node-control.yaml +++ b/config/example/node-control.yaml @@ -1,5 +1,5 @@ --- endpoint: 'localhost:8091' -wallet: '/etc/neofs/storage/wallet.json' +wallet: '/etc/frostfs/storage/wallet.json' password: '' diff --git a/config/example/node.env b/config/example/node.env index 3a4f47b0a..62b6d483b 100644 --- a/config/example/node.env +++ b/config/example/node.env @@ -13,7 +13,7 @@ NEOFS_NODE_KEY=./wallet.key NEOFS_NODE_WALLET_PATH=./wallet.json NEOFS_NODE_WALLET_ADDRESS=NcpJzXcSDrh5CCizf4K9Ro6w4t59J5LKzz NEOFS_NODE_WALLET_PASSWORD=password -NEOFS_NODE_ADDRESSES="s01.neofs.devenv:8080 /dns4/s02.neofs.devenv/tcp/8081 grpc://127.0.0.1:8082 grpcs://localhost:8083" +NEOFS_NODE_ADDRESSES="s01.frostfs.devenv:8080 /dns4/s02.frostfs.devenv/tcp/8081 grpc://127.0.0.1:8082 grpcs://localhost:8083" NEOFS_NODE_ATTRIBUTE_0=Price:11 NEOFS_NODE_ATTRIBUTE_1="UN-LOCODE:RU MSK" NEOFS_NODE_RELAY=true @@ -37,14 +37,14 @@ NEOFS_TREE_REPLICATION_WORKER_COUNT=32 # gRPC section ## 0 server -NEOFS_GRPC_0_ENDPOINT=s01.neofs.devenv:8080 +NEOFS_GRPC_0_ENDPOINT=s01.frostfs.devenv:8080 ### TLS config NEOFS_GRPC_0_TLS_ENABLED=true NEOFS_GRPC_0_TLS_CERTIFICATE=/path/to/cert NEOFS_GRPC_0_TLS_KEY=/path/to/key ## 1 server -NEOFS_GRPC_1_ENDPOINT=s02.neofs.devenv:8080 +NEOFS_GRPC_1_ENDPOINT=s02.frostfs.devenv:8080 ### TLS config NEOFS_GRPC_1_TLS_ENABLED=false diff --git a/config/example/node.json b/config/example/node.json index 94bd7562a..23113eb0b 100644 --- a/config/example/node.json +++ b/config/example/node.json @@ -20,8 +20,8 @@ "password": "password" }, "addresses": [ - "s01.neofs.devenv:8080", - "/dns4/s02.neofs.devenv/tcp/8081", + "s01.frostfs.devenv:8080", + "/dns4/s02.frostfs.devenv/tcp/8081", "grpc://127.0.0.1:8082", "grpcs://localhost:8083" ], @@ -54,7 +54,7 @@ }, "grpc": { "0": { - "endpoint": "s01.neofs.devenv:8080", + "endpoint": "s01.frostfs.devenv:8080", "tls": { "enabled": true, "certificate": "/path/to/cert", @@ -62,13 +62,13 @@ } }, "1": { - "endpoint": "s02.neofs.devenv:8080", + "endpoint": "s02.frostfs.devenv:8080", "tls": { "enabled": false } }, "2": { - "endpoint": "s03.neofs.devenv:8080", + "endpoint": "s03.frostfs.devenv:8080", "tls": { "enabled": true, "use_insecure_crypto": true diff --git a/config/example/node.yaml b/config/example/node.yaml index 9dd98a021..2eda97523 100644 --- a/config/example/node.yaml +++ b/config/example/node.yaml @@ -18,8 +18,8 @@ node: address: "NcpJzXcSDrh5CCizf4K9Ro6w4t59J5LKzz" # address of a NEO account in the wallet; ignored if key is presented password: "password" # password for a NEO account in the wallet; ignored if key is presented addresses: # list of addresses announced by Storage node in the Network map - - s01.neofs.devenv:8080 - - /dns4/s02.neofs.devenv/tcp/8081 + - s01.frostfs.devenv:8080 + - /dns4/s02.frostfs.devenv/tcp/8081 - grpc://127.0.0.1:8082 - grpcs://localhost:8083 attribute_0: "Price:11" @@ -45,16 +45,16 @@ node: ca: "/ca/path" # path to optional CA certificate grpc: - - endpoint: s01.neofs.devenv:8080 # endpoint for gRPC server + - endpoint: s01.frostfs.devenv:8080 # endpoint for gRPC server tls: enabled: true # use TLS for a gRPC connection (min version is TLS 1.2) certificate: /path/to/cert # path to TLS certificate key: /path/to/key # path to TLS key - - endpoint: s02.neofs.devenv:8080 # endpoint for gRPC server + - endpoint: s02.frostfs.devenv:8080 # endpoint for gRPC server tls: enabled: false # use TLS for a gRPC connection - - endpoint: s03.neofs.devenv:8080 + - endpoint: s03.frostfs.devenv:8080 tls: enabled: true use_insecure_crypto: true # allow using insecure ciphers with TLS 1.2 diff --git a/config/mainnet/README.md b/config/mainnet/README.md index 5b21508c4..5b2ac7ac9 100644 --- a/config/mainnet/README.md +++ b/config/mainnet/README.md @@ -2,8 +2,8 @@ Here is a template for simple storage node configuration in N3 Mainnet. Make sure to specify correct values instead of `<...>` placeholders. -Do not change `contracts` section. Run the latest neofs-node release with -the fixed config `neofs-node -c config.yml` +Do not change `contracts` section. Run the latest frostfs-node release with +the fixed config `frostfs-node -c config.yml` To use NeoFS in the Mainnet, you need to deposit assets to NeoFS contract. The contract sript hash is `2cafa46838e8b564468ebd868dcafdd99dce6221` @@ -15,12 +15,12 @@ Use `grpcs://` scheme in the announced address if you enable TLS in grpc server. ```yaml node: addresses: - - grpcs://neofs.my.org:8080 + - grpcs://frostfs.my.org:8080 grpc: num: 1 0: - endpoint: neofs.my.org:8080 + endpoint: frostfs.my.org:8080 tls: enabled: true certificate: /path/to/cert diff --git a/config/testnet/README.md b/config/testnet/README.md index 42e966ff6..82cbe3d22 100644 --- a/config/testnet/README.md +++ b/config/testnet/README.md @@ -6,7 +6,7 @@ docker image and run it with docker-compose. ## Build image -Prepared **neofs-storage-testnet** image is available at Docker Hub. +Prepared **frostfs-storage-testnet** image is available at Docker Hub. However, if you need to rebuild it for some reason, run `make image-storage-testnet` command. @@ -67,11 +67,11 @@ NEOFS_NODE_ATTRIBUTE_2=UN-LOCODE:RU LED ``` You can validate UN/LOCODE attribute in -[NeoFS LOCODE database](https://github.com/nspcc-dev/neofs-locode-db/releases/tag/v0.1.0) -with neofs-cli. +[NeoFS LOCODE database](https://github.com/TrueCloudLab/frostfs-locode-db/releases/tag/v0.1.0) +with frostfs-cli. ``` -$ neofs-cli util locode info --db ./locode_db --locode 'RU LED' +$ frostfs-cli util locode info --db ./locode_db --locode 'RU LED' Country: Russia Location: Saint Petersburg (ex Leningrad) Continent: Europe @@ -80,11 +80,11 @@ Coordinates: 59.53, 30.15 ``` It is recommended to pass the node's key as a file. To do so, convert your wallet -WIF to 32-byte hex (via `neofs-cli` for example) and save it to a file. +WIF to 32-byte hex (via `frostfs-cli` for example) and save it to a file. ``` // Print WIF in a 32-byte hex format -$ neofs-cli util keyer Kwp4Q933QujZLUCcn39tzY94itNQJS4EjTp28oAMzuxMwabm3p1s +$ frostfs-cli util keyer Kwp4Q933QujZLUCcn39tzY94itNQJS4EjTp28oAMzuxMwabm3p1s PrivateKey 11ab917cd99170cb8d0d48e78fca317564e6b3aaff7f7058952d6175cdca0f56 PublicKey 02be8b2e837cab232168f5c3303f1b985818b7583682fb49026b8d2f43df7c1059 WIF Kwp4Q933QujZLUCcn39tzY94itNQJS4EjTp28oAMzuxMwabm3p1s @@ -99,18 +99,18 @@ $ echo '11ab917cd99170cb8d0d48e78fca317564e6b3aaff7f7058952d6175cdca0f56' | xxd Then, specify the path to this file in `docker-compose.yml` ```yaml volumes: - - neofs_storage:/storage + - frostfs_storage:/storage - ./my_wallet.key:/node.key ``` NeoFS objects will be stored on your machine. By default, docker-compose -is configured to store objects in named docker volume `neofs_storage`. You can +is configured to store objects in named docker volume `frostfs_storage`. You can specify a directory on the filesystem to store objects there. ```yaml volumes: - - /home/username/neofs/rc3/storage:/storage + - /home/username/frostfs/rc3/storage:/storage - ./my_wallet.key:/node.key ``` @@ -120,7 +120,7 @@ Run the node with `docker-compose up` command and stop it with `docker-compose d ### Debug -To print node logs, use `docker logs neofs-testnet`. To print debug messages in +To print node logs, use `docker logs frostfs-testnet`. To print debug messages in log, set up log level to debug with this env: ```yaml diff --git a/config/testnet/docker-compose.yml b/config/testnet/docker-compose.yml index 2ab462f53..7e0feed47 100644 --- a/config/testnet/docker-compose.yml +++ b/config/testnet/docker-compose.yml @@ -4,12 +4,12 @@ version: "2.4" services: storage01: image: nspccdev/neofs-storage-testnet:0.27.7 - container_name: neofs-testnet + container_name: frostfs-testnet env_file: node_config.env network_mode: host restart: always volumes: - - neofs_storage:/storage + - frostfs_storage:/storage - :/node.key stop_signal: SIGINT @@ -28,4 +28,4 @@ services: - ./prometheus.yml:/configs/prometheus.yml volumes: - neofs_storage: + frostfs_storage: diff --git a/config/testnet/prometheus.yml b/config/testnet/prometheus.yml index 7b8e99baf..ddbc03042 100644 --- a/config/testnet/prometheus.yml +++ b/config/testnet/prometheus.yml @@ -4,7 +4,7 @@ global: monitor: 'user_metrics' scrape_configs: - - job_name: 'neofs-node-user' + - job_name: 'frostfs-node-user' scrape_interval: 5s static_configs: - targets: ['localhost:9090'] diff --git a/debian/changelog b/debian/changelog index 27b14cb00..aabf7546d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ -neofs-node (0.33.0~72~g6955fe82) jammy; urgency=medium +frostfs-node (0.34.0~97-dirty~g42554a92-jammy) jammy; urgency=medium + + * Please see CHANGELOG.md for code changes for v0.34.0-97-g42554a92- + dirty + + -- NeoSPCC Fri, 23 Dec 2022 20:07:36 +0300 + +frostfs-node (0.33.0~72~g6955fe82) jammy; urgency=medium * Please see CHANGELOG.md for code changes for v0.33.0-72-g6955fe82 -- NeoSPCC Wed, 26 Oct 2022 12:19:45 +0300 -neofs-node (0.33.0) stable; urgency=medium +frostfs-node (0.33.0) stable; urgency=medium * Initial change diff --git a/debian/control b/debian/control index e5824c03a..9553211cb 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ -Source: neofs-node +Source: frostfs-node Section: misc Priority: optional Maintainer: NeoSPCC Build-Depends: debhelper-compat (= 13), dh-sequence-bash-completion, devscripts Standards-Version: 4.5.1 Homepage: https://fs.neo.org/ -Vcs-Git: https://github.com/nspcc-dev/neofs-node.git -Vcs-Browser: https://github.com/nspcc-dev/neofs-node +Vcs-Git: https://github.com/TrueCloudLab/frostfs-node.git +Vcs-Browser: https://github.com/TrueCloudLab/frostfs-node -Package: neofs-storage +Package: frostfs-storage Architecture: any Depends: ${misc:Depends} Description: NeoFS Storage node @@ -18,9 +18,9 @@ Description: NeoFS Storage node network and get paid for providing storage resources to other users or store their data in NeoFS and pay a competitive price for it. -Package: neofs-ir +Package: frostfs-ir Architecture: any -Depends: ${misc:Depends}, neofs-locode-db +Depends: ${misc:Depends}, frostfs-locode-db Description: NeoFS InnerRing node NeoFS is a decentralized distributed object storage integrated with the NEO Blockchain. NeoFS Nodes are organized in a peer-to-peer network that takes care @@ -28,7 +28,7 @@ Description: NeoFS InnerRing node network and get paid for providing storage resources to other users or store their data in NeoFS and pay a competitive price for it. -Package: neofs-cli +Package: frostfs-cli Architecture: any Depends: ${misc:Depends} Description: CLI tools for NeoFS diff --git a/debian/copyright b/debian/copyright index 4df3532c3..891aab585 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,11 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: neofs-node +Upstream-Name: frostfs-node Upstream-Contact: tech@nspcc.ru -Source: https://github.com/nspcc-dev/neofs-node +Source: https://github.com/TrueCloudLab/frostfs-node Files: * -Copyright: 2018-2022 NeoSPCC (@nspcc-dev), contributors of neofs-node project - (https://github.com/nspcc-dev/neofs-node/blob/master/CREDITS.md) +Copyright: 2018-2022 NeoSPCC (@nspcc-dev), contributors of frostfs-node project + (https://github.com/TrueCloudLab/frostfs-node/blob/master/CREDITS.md) License: GPL-3 This program is free software: you can redistribute it and/or modify it diff --git a/debian/neofs-cli.docs b/debian/frostfs-cli.docs similarity index 63% rename from debian/neofs-cli.docs rename to debian/frostfs-cli.docs index 1bb1b2dc0..58d4559cc 100644 --- a/debian/neofs-cli.docs +++ b/debian/frostfs-cli.docs @@ -1,4 +1,4 @@ CONTRIBUTING.md CREDITS.md README.md -cmd/neofs-adm/docs +cmd/frostfs-adm/docs diff --git a/debian/frostfs-cli.install b/debian/frostfs-cli.install new file mode 100644 index 000000000..93025187b --- /dev/null +++ b/debian/frostfs-cli.install @@ -0,0 +1,3 @@ +bin/frostfs-adm usr/bin +bin/frostfs-cli usr/bin +bin/frostfs-lens usr/bin diff --git a/debian/neofs-cli.manpages b/debian/frostfs-cli.manpages similarity index 100% rename from debian/neofs-cli.manpages rename to debian/frostfs-cli.manpages diff --git a/debian/frostfs-ir.dirs b/debian/frostfs-ir.dirs new file mode 100644 index 000000000..90da8fd27 --- /dev/null +++ b/debian/frostfs-ir.dirs @@ -0,0 +1,2 @@ +/etc/frostfs/ir +/var/lib/frostfs/ir diff --git a/debian/neofs-ir.docs b/debian/frostfs-ir.docs similarity index 100% rename from debian/neofs-ir.docs rename to debian/frostfs-ir.docs diff --git a/debian/frostfs-ir.install b/debian/frostfs-ir.install new file mode 100644 index 000000000..e052f5434 --- /dev/null +++ b/debian/frostfs-ir.install @@ -0,0 +1 @@ +bin/frostfs-ir usr/bin diff --git a/debian/neofs-ir.postinst b/debian/frostfs-ir.postinst similarity index 54% rename from debian/neofs-ir.postinst rename to debian/frostfs-ir.postinst index f8ad5ea9c..ea2f9dd7c 100644 --- a/debian/neofs-ir.postinst +++ b/debian/frostfs-ir.postinst @@ -19,18 +19,18 @@ set -e case "$1" in configure) USERNAME=ir - id -u neofs-ir >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/neofs/ir --system -M -U -c "NeoFS InnerRing node" neofs-ir - if ! dpkg-statoverride --list /etc/neofs/$USERNAME >/dev/null; then - chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME - chmod -f 0750 /etc/neofs/$USERNAME - chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/config.yml - chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/control.yml - chmod -f 0640 /etc/neofs/$USERNAME/config.yml || true - chmod -f 0640 /etc/neofs/$USERNAME/control.yml || true + id -u frostfs-ir >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/frostfs/ir --system -M -U -c "NeoFS InnerRing node" frostfs-ir + if ! dpkg-statoverride --list /etc/frostfs/$USERNAME >/dev/null; then + chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME + chmod -f 0750 /etc/frostfs/$USERNAME + chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/config.yml + chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/control.yml + chmod -f 0640 /etc/frostfs/$USERNAME/config.yml || true + chmod -f 0640 /etc/frostfs/$USERNAME/control.yml || true fi - USERDIR=$(getent passwd "neofs-$USERNAME" | cut -d: -f6) - if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then - chown -f neofs-$USERNAME: $USERDIR + USERDIR=$(getent passwd "frostfs-$USERNAME" | cut -d: -f6) + if ! dpkg-statoverride --list frostfs-$USERDIR >/dev/null; then + chown -f frostfs-$USERNAME: $USERDIR fi ;; diff --git a/debian/neofs-ir.postrm b/debian/frostfs-ir.postrm similarity index 96% rename from debian/neofs-ir.postrm rename to debian/frostfs-ir.postrm index 442364959..cbb7db2f2 100644 --- a/debian/neofs-ir.postrm +++ b/debian/frostfs-ir.postrm @@ -20,7 +20,7 @@ set -e case "$1" in purge) - rm -rf /var/lib/neofs/ir/* + rm -rf /var/lib/frostfs/ir/* ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/neofs-ir.preinst b/debian/frostfs-ir.preinst similarity index 100% rename from debian/neofs-ir.preinst rename to debian/frostfs-ir.preinst diff --git a/debian/neofs-ir.prerm b/debian/frostfs-ir.prerm similarity index 100% rename from debian/neofs-ir.prerm rename to debian/frostfs-ir.prerm diff --git a/debian/neofs-ir.service b/debian/frostfs-ir.service similarity index 55% rename from debian/neofs-ir.service rename to debian/frostfs-ir.service index c7b0f1bd9..0108c9dda 100644 --- a/debian/neofs-ir.service +++ b/debian/frostfs-ir.service @@ -4,10 +4,10 @@ Requires=network.target [Service] Type=simple -ExecStart=/usr/bin/neofs-ir --config /etc/neofs/ir/config.yml -User=neofs-ir -Group=neofs-ir -WorkingDirectory=/var/lib/neofs/ir +ExecStart=/usr/bin/frostfs-ir --config /etc/frostfs/ir/config.yml +User=frostfs-ir +Group=frostfs-ir +WorkingDirectory=/var/lib/frostfs/ir Restart=always RestartSec=5 PrivateTmp=true diff --git a/debian/frostfs-storage.dirs b/debian/frostfs-storage.dirs new file mode 100644 index 000000000..4142145ee --- /dev/null +++ b/debian/frostfs-storage.dirs @@ -0,0 +1,3 @@ +/etc/frostfs/storage +/srv/frostfs +/var/lib/frostfs/storage diff --git a/debian/neofs-storage.docs b/debian/frostfs-storage.docs similarity index 100% rename from debian/neofs-storage.docs rename to debian/frostfs-storage.docs diff --git a/debian/frostfs-storage.install b/debian/frostfs-storage.install new file mode 100644 index 000000000..670935e7b --- /dev/null +++ b/debian/frostfs-storage.install @@ -0,0 +1 @@ +bin/frostfs-node usr/bin diff --git a/debian/frostfs-storage.postinst b/debian/frostfs-storage.postinst new file mode 100644 index 000000000..9c22d3a4c --- /dev/null +++ b/debian/frostfs-storage.postinst @@ -0,0 +1,55 @@ +#!/bin/sh +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see https://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + USERNAME=storage + id -u frostfs-$USERNAME >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/frostfs/$USERNAME --system -M -U -c "NeoFS Storage node" frostfs-$USERNAME + if ! dpkg-statoverride --list /etc/frostfs/$USERNAME >/dev/null; then + chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME + chmod -f 0750 /etc/frostfs/$USERNAME + chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/config.yml + chown -f root:frostfs-$USERNAME /etc/frostfs/$USERNAME/control.yml + chmod -f 0640 /etc/frostfs/$USERNAME/config.yml || true + chmod -f 0640 /etc/frostfs/$USERNAME/control.yml || true + fi + USERDIR=$(getent passwd "frostfs-$USERNAME" | cut -d: -f6) + if ! dpkg-statoverride --list frostfs-$USERDIR >/dev/null; then + chown -f frostfs-$USERNAME: $USERDIR + fi + USERDIR=/srv/frostfs + if ! dpkg-statoverride --list frostfs-$USERDIR >/dev/null; then + chown -f frostfs-$USERNAME: $USERDIR + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/neofs-storage.postrm b/debian/frostfs-storage.postrm similarity index 95% rename from debian/neofs-storage.postrm rename to debian/frostfs-storage.postrm index e5a432858..d9c8c9656 100644 --- a/debian/neofs-storage.postrm +++ b/debian/frostfs-storage.postrm @@ -20,7 +20,7 @@ set -e case "$1" in purge) - rm -rf /var/lib/neofs/storage/* + rm -rf /var/lib/frostfs/storage/* ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/neofs-storage.preinst b/debian/frostfs-storage.preinst similarity index 100% rename from debian/neofs-storage.preinst rename to debian/frostfs-storage.preinst diff --git a/debian/neofs-storage.prerm b/debian/frostfs-storage.prerm similarity index 100% rename from debian/neofs-storage.prerm rename to debian/frostfs-storage.prerm diff --git a/debian/neofs-storage.service b/debian/frostfs-storage.service similarity index 53% rename from debian/neofs-storage.service rename to debian/frostfs-storage.service index 882dc297f..0b7fb272a 100644 --- a/debian/neofs-storage.service +++ b/debian/frostfs-storage.service @@ -4,10 +4,10 @@ Requires=network.target [Service] Type=simple -ExecStart=/usr/bin/neofs-node --config /etc/neofs/storage/config.yml -User=neofs-storage -Group=neofs-storage -WorkingDirectory=/srv/neofs +ExecStart=/usr/bin/frostfs-node --config /etc/frostfs/storage/config.yml +User=frostfs-storage +Group=frostfs-storage +WorkingDirectory=/srv/frostfs Restart=always RestartSec=5 PrivateTmp=true diff --git a/debian/neofs-cli.install b/debian/neofs-cli.install deleted file mode 100644 index b8dfc7be1..000000000 --- a/debian/neofs-cli.install +++ /dev/null @@ -1,3 +0,0 @@ -bin/neofs-adm usr/bin -bin/neofs-cli usr/bin -bin/neofs-lens usr/bin diff --git a/debian/neofs-ir.dirs b/debian/neofs-ir.dirs deleted file mode 100644 index 41d146ffe..000000000 --- a/debian/neofs-ir.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/etc/neofs/ir -/var/lib/neofs/ir diff --git a/debian/neofs-ir.install b/debian/neofs-ir.install deleted file mode 100644 index fc34c24fc..000000000 --- a/debian/neofs-ir.install +++ /dev/null @@ -1 +0,0 @@ -bin/neofs-ir usr/bin diff --git a/debian/neofs-storage.dirs b/debian/neofs-storage.dirs deleted file mode 100644 index 39bc449bc..000000000 --- a/debian/neofs-storage.dirs +++ /dev/null @@ -1,3 +0,0 @@ -/etc/neofs/storage -/srv/neofs -/var/lib/neofs/storage diff --git a/debian/neofs-storage.install b/debian/neofs-storage.install deleted file mode 100644 index 92f1f0c8f..000000000 --- a/debian/neofs-storage.install +++ /dev/null @@ -1 +0,0 @@ -bin/neofs-node usr/bin diff --git a/debian/neofs-storage.postinst b/debian/neofs-storage.postinst deleted file mode 100644 index a0a2de965..000000000 --- a/debian/neofs-storage.postinst +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see https://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - configure) - USERNAME=storage - id -u neofs-$USERNAME >/dev/null 2>&1 || useradd -s /usr/sbin/nologin -d /var/lib/neofs/$USERNAME --system -M -U -c "NeoFS Storage node" neofs-$USERNAME - if ! dpkg-statoverride --list /etc/neofs/$USERNAME >/dev/null; then - chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME - chmod -f 0750 /etc/neofs/$USERNAME - chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/config.yml - chown -f root:neofs-$USERNAME /etc/neofs/$USERNAME/control.yml - chmod -f 0640 /etc/neofs/$USERNAME/config.yml || true - chmod -f 0640 /etc/neofs/$USERNAME/control.yml || true - fi - USERDIR=$(getent passwd "neofs-$USERNAME" | cut -d: -f6) - if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then - chown -f neofs-$USERNAME: $USERDIR - fi - USERDIR=/srv/neofs - if ! dpkg-statoverride --list neofs-$USERDIR >/dev/null; then - chown -f neofs-$USERNAME: $USERDIR - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules index b1817e31c..b85356b99 100755 --- a/debian/rules +++ b/debian/rules @@ -12,26 +12,26 @@ override_dh_auto_install: echo $(DEB_BUILD_OPTIONS) dh_auto_install - bin/neofs-adm gendoc -t man man/ - bin/neofs-cli gendoc -t man man/ + bin/frostfs-adm gendoc -t man man/ + bin/frostfs-cli gendoc -t man man/ - bin/neofs-adm completion bash > debian/neofs-adm.bash-completion - bin/neofs-cli completion bash > debian/neofs-cli.bash-completion - install -m 0755 -d debian/neofs-cli/usr/share/fish/completions/ - install -m 0755 -d debian/neofs-cli/usr/share/zsh/vendor-completions/ - bin/neofs-adm completion fish > debian/neofs-cli/usr/share/fish/completions/neofs-adm.fish - bin/neofs-adm completion zsh > debian/neofs-cli/usr/share/zsh/vendor-completions/_neofs-adm - bin/neofs-cli completion fish > debian/neofs-cli/usr/share/fish/completions/neofs-cli.fish - bin/neofs-cli completion zsh > debian/neofs-cli/usr/share/zsh/vendor-completions/_neofs-cli + bin/frostfs-adm completion bash > debian/frostfs-adm.bash-completion + bin/frostfs-cli completion bash > debian/frostfs-cli.bash-completion + install -m 0755 -d debian/frostfs-cli/usr/share/fish/completions/ + install -m 0755 -d debian/frostfs-cli/usr/share/zsh/vendor-completions/ + bin/frostfs-adm completion fish > debian/frostfs-cli/usr/share/fish/completions/frostfs-adm.fish + bin/frostfs-adm completion zsh > debian/frostfs-cli/usr/share/zsh/vendor-completions/_frostfs-adm + bin/frostfs-cli completion fish > debian/frostfs-cli/usr/share/fish/completions/frostfs-cli.fish + bin/frostfs-cli completion zsh > debian/frostfs-cli/usr/share/zsh/vendor-completions/_frostfs-cli - install -T -m 0640 config/example/ir.yaml debian/neofs-ir/etc/neofs/ir/config.yml - install -T -m 0640 config/example/ir-control.yaml debian/neofs-ir/etc/neofs/ir/control.yml - install -T -m 0640 config/example/node.yaml debian/neofs-storage/etc/neofs/storage/config.yml - install -T -m 0640 config/example/node-control.yaml debian/neofs-storage/etc/neofs/storage/control.yml + install -T -m 0640 config/example/ir.yaml debian/frostfs-ir/etc/frostfs/ir/config.yml + install -T -m 0640 config/example/ir-control.yaml debian/frostfs-ir/etc/frostfs/ir/control.yml + install -T -m 0640 config/example/node.yaml debian/frostfs-storage/etc/frostfs/storage/config.yml + install -T -m 0640 config/example/node-control.yaml debian/frostfs-storage/etc/frostfs/storage/control.yml override_dh_installsystemd: - dh_installsystemd --no-enable --no-start --name=neofs-ir - dh_installsystemd --no-enable --no-start --name=neofs-storage + dh_installsystemd --no-enable --no-start --name=frostfs-ir + dh_installsystemd --no-enable --no-start --name=frostfs-storage override_dh_installchangelogs: dh_installchangelogs -k CHANGELOG.md diff --git a/docs/maintenance.md b/docs/maintenance.md index e135638a5..f63ab46fb 100644 --- a/docs/maintenance.md +++ b/docs/maintenance.md @@ -19,7 +19,7 @@ from the network map. To check the possibility of MM-switching at the moment, exec: ```shell -$ neofs-cli netmap netinfo +$ frostfs-cli netmap netinfo ... Maintenance mode allowed: true ... @@ -27,12 +27,12 @@ Maintenance mode allowed: true To toggle the setting in the running NeoFS Sidechain, exec: ```shell -$ neofs-adm morph set-config MaintenanceModeAllowed=true|false +$ frostfs-adm morph set-config MaintenanceModeAllowed=true|false ``` To switch the node to MM, exec: ```shell -$ neofs-cli control set-status --status maintenance [--force|-f] +$ frostfs-cli control set-status --status maintenance [--force|-f] ``` `-f` flag allows to force local maintenance regardless of the network settings. diff --git a/docs/release-instruction.md b/docs/release-instruction.md index a4c747ba0..6d2a78e3f 100644 --- a/docs/release-instruction.md +++ b/docs/release-instruction.md @@ -9,7 +9,7 @@ These should run successfully: * `make lint` (should not change any files); * `make fmts` (should not change any files); * `go mod tidy` (should not change any files); -* integration tests in [neofs-devenv](https://github.com/nspcc-dev/neofs-devenv). +* integration tests in [frostfs-devenv](https://github.com/TrueCloudLab/frostfs-devenv). ## Make release commit @@ -48,7 +48,7 @@ Update version in Debian package changelog file $ cat debian/changelog ``` -Update the supported version of `nspcc-dev/neofs-contract` module in root +Update the supported version of `TrueCloudLab/frostfs-contract` module in root `README.md` if needed. ### Writing changelog @@ -123,17 +123,17 @@ the release. Publish the release. ### Update NeoFS Developer Environment -Prepare pull-request in [neofs-devenv](https://github.com/nspcc-dev/neofs-devenv) +Prepare pull-request in [frostfs-devenv](https://github.com/TrueCloudLab/frostfs-devenv) with new versions. ### Close GitHub milestone -Look up GitHub [milestones](https://github.com/nspcc-dev/neofs-node/milestones) and close the release one if exists. +Look up GitHub [milestones](https://github.com/TrueCloudLab/frostfs-node/milestones) and close the release one if exists. ### Rebuild NeoFS LOCODE database If new release contains LOCODE-related changes, rebuild NeoFS LOCODE database via NeoFS CLI ```shell -$ neofs-cli util locode generate ... +$ frostfs-cli util locode generate ... ``` diff --git a/go.mod b/go.mod index 5a74a85dd..4f86da8e4 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,13 @@ -module github.com/nspcc-dev/neofs-node +module github.com/TrueCloudLab/frostfs-node go 1.17 require ( + github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 + github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42 + github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556 + github.com/TrueCloudLab/hrw v1.1.0 + github.com/TrueCloudLab/tzhash v1.7.0 github.com/cheggaaa/pb v1.0.29 github.com/chzyer/readline v1.5.1 github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 @@ -14,13 +19,8 @@ require ( github.com/mr-tron/base58 v1.2.0 github.com/multiformats/go-multiaddr v0.4.0 github.com/nats-io/nats.go v1.16.0 - github.com/nspcc-dev/hrw v1.0.9 github.com/nspcc-dev/neo-go v0.99.4 github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262 // indirect - github.com/nspcc-dev/neofs-api-go/v2 v2.14.0 - github.com/nspcc-dev/neofs-contract v0.16.0 - github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.7 - github.com/nspcc-dev/tzhash v1.6.1 github.com/olekukonko/tablewriter v0.0.5 github.com/panjf2000/ants/v2 v2.4.0 github.com/paulmach/orb v0.2.2 @@ -40,6 +40,8 @@ require ( ) require ( + github.com/TrueCloudLab/frostfs-crypto v0.5.0 // indirect + github.com/TrueCloudLab/rfc6979 v0.3.0 // indirect github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect github.com/benbjohnson/clock v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -72,7 +74,6 @@ require ( github.com/nats-io/nkeys v0.3.0 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 // indirect - github.com/nspcc-dev/neofs-crypto v0.4.0 // indirect github.com/nspcc-dev/rfc6979 v0.2.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.2 // indirect diff --git a/go.sum b/go.sum index ceaed1ace..997ed4199 100644 --- a/go.sum +++ b/go.sum @@ -62,6 +62,20 @@ github.com/CityOfZion/neo-go v0.70.1-pre.0.20191212173117-32ac01130d4c/go.mod h1 github.com/CityOfZion/neo-go v0.71.1-pre.0.20200129171427-f773ec69fb84/go.mod h1:FLI526IrRWHmcsO+mHsCbj64pJZhwQFTLJZu+A4PGOA= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 h1:mwZr15qCuIcWojIOmH6LILPohbWIkknZe9vhBRapmfQ= +github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68/go.mod h1:u3P6aL/NpAIY5IFRsJhmV+61Q3pJ3BkLENqySkf5zZQ= +github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42 h1:P/gisZxTzJ9R3tuYDaQWe0tY6m1Zea3gzdPpNYK+NP4= +github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42/go.mod h1:qmf648elr+FWBZH3hqND8KVrXMnqu/e0z48k+sX8C2s= +github.com/TrueCloudLab/frostfs-crypto v0.5.0 h1:ZoLjixSkQv3j1EwZ1WJzMEJY2NR+9nO4Pd8WSyM/RRI= +github.com/TrueCloudLab/frostfs-crypto v0.5.0/go.mod h1:775MUewpH8AWpXrimAG2NYWOXB6lpKOI5kqgu+eI5zs= +github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556 h1:Cc1jjYxKPfyw7TIJh3Bje7m8DOSn2dx+2zmr0yusWGw= +github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556/go.mod h1:4ZiG4jNLzrqeJbmZUrPI7wDZhQVPaf0zEIWa/eBsqBg= +github.com/TrueCloudLab/hrw v1.1.0 h1:2U69PpUX1UtMWgh/RAg6D8mQW+/WsxbLNE+19EUhLhY= +github.com/TrueCloudLab/hrw v1.1.0/go.mod h1:Pzi8Hy3qx12cew+ajVxgbtDVM4sRG9/gJnJLcL/yRyY= +github.com/TrueCloudLab/rfc6979 v0.3.0 h1:0SYMAfQWh/TjnofqYQHy+s3rmQ5gi0fvOaDbqd60/Ic= +github.com/TrueCloudLab/rfc6979 v0.3.0/go.mod h1:qylxFXFQ/sMvpZC/8JyWp+mfzk5Zj/KDT5FAbekhobc= +github.com/TrueCloudLab/tzhash v1.7.0 h1:btGORepc7Dg+n4MxgJxv73c9eYhwSBI5HqsqUBRmJiw= +github.com/TrueCloudLab/tzhash v1.7.0/go.mod h1:gDQxqjhTqhR58Qfx0gxGtuyGAkixOukwbFGX9O6UGg4= github.com/Workiva/go-datastructures v1.0.50/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/abiosoft/ishell v2.0.0+incompatible/go.mod h1:HQR9AqF2R3P4XXpMpI0NAzgHf/aS6+zVXRj14cVk9qg= github.com/abiosoft/ishell/v2 v2.0.2/go.mod h1:E4oTCXfo6QjoCart0QYa5m9w4S+deXs/P/9jA77A9Bs= @@ -438,41 +452,28 @@ github.com/nspcc-dev/dbft v0.0.0-20191209120240-0d6b7568d9ae/go.mod h1:3FjXOoHmA github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a/go.mod h1:/YFK+XOxxg0Bfm6P92lY5eDSLYfp06XOdL8KAVgXjVk= github.com/nspcc-dev/dbft v0.0.0-20200219114139-199d286ed6c1/go.mod h1:O0qtn62prQSqizzoagHmuuKoz8QMkU3SzBoKdEvm3aQ= github.com/nspcc-dev/dbft v0.0.0-20210721160347-1b03241391ac/go.mod h1:U8MSnEShH+o5hexfWJdze6uMFJteP0ko7J2frO7Yu1Y= -github.com/nspcc-dev/dbft v0.0.0-20220629112714-fd49ca59d354/go.mod h1:U8MSnEShH+o5hexfWJdze6uMFJteP0ko7J2frO7Yu1Y= github.com/nspcc-dev/dbft v0.0.0-20220902113116-58a5e763e647/go.mod h1:g9xisXmX9NP9MjioaTe862n9SlZTrP+6PVUWLBYOr98= github.com/nspcc-dev/go-ordered-json v0.0.0-20210915112629-e1b6cce73d02/go.mod h1:79bEUDEviBHJMFV6Iq6in57FEOCMcRhfQnfaf0ETA5U= github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 h1:n4ZaFCKt1pQJd7PXoMJabZWK9ejjbLOVrkl/lOUmshg= github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22/go.mod h1:79bEUDEviBHJMFV6Iq6in57FEOCMcRhfQnfaf0ETA5U= -github.com/nspcc-dev/hrw v1.0.9 h1:17VcAuTtrstmFppBjfRiia4K2wA/ukXZhLFS8Y8rz5Y= github.com/nspcc-dev/hrw v1.0.9/go.mod h1:l/W2vx83vMQo6aStyx2AuZrJ+07lGv2JQGlVkPG06MU= github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:pPYwPZ2ks+uMnlRLUyXOpLieaDQSEaf4NM3zHVbRjmg= github.com/nspcc-dev/neo-go v0.98.0/go.mod h1:E3cc1x6RXSXrJb2nDWXTXjnXk3rIqVN8YdFyWv+FrqM= -github.com/nspcc-dev/neo-go v0.99.2/go.mod h1:9P0yWqhZX7i/ChJ+zjtiStO1uPTolPFUM+L5oNznU8E= github.com/nspcc-dev/neo-go v0.99.4 h1:8Y+SdRxksC72a4PNkcGCh/aaQinh9Gu+c5LilbcsXOI= github.com/nspcc-dev/neo-go v0.99.4/go.mod h1:mKTolfRUfKjFso5HPvGSQtUZc70n0VKBMs16eGuC5gA= -github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220809123759-3094d3e0c14b/go.mod h1:23bBw0v6pBYcrWs8CBEEDIEDJNbcFoIh8pGGcf2Vv8s= github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262 h1:UTmSLZw5OpD/JPE1B5Vf98GF0zu2/Hsqq1lGLtStTUE= github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262/go.mod h1:23bBw0v6pBYcrWs8CBEEDIEDJNbcFoIh8pGGcf2Vv8s= github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs= github.com/nspcc-dev/neofs-api-go/v2 v2.11.1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs= -github.com/nspcc-dev/neofs-api-go/v2 v2.14.0 h1:jhuN8Ldqz7WApvUJRFY0bjRXE1R3iCkboMX5QVZhHVk= -github.com/nspcc-dev/neofs-api-go/v2 v2.14.0/go.mod h1:DRIr0Ic1s+6QgdqmNFNLIqMqd7lNMJfYwkczlm1hDtM= -github.com/nspcc-dev/neofs-contract v0.16.0 h1:/K5IMwZOlUCooxpe//73RW20HTfHvwRL088gppU5DM8= -github.com/nspcc-dev/neofs-contract v0.16.0/go.mod h1:gN5bo2TlMvLbySImmg76DVj3jVmYgti2VVlQ+h/tcr0= github.com/nspcc-dev/neofs-crypto v0.2.0/go.mod h1:F/96fUzPM3wR+UGsPi3faVNmFlA9KAEAUQR7dMxZmNA= github.com/nspcc-dev/neofs-crypto v0.2.3/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw= github.com/nspcc-dev/neofs-crypto v0.3.0/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw= -github.com/nspcc-dev/neofs-crypto v0.4.0 h1:5LlrUAM5O0k1+sH/sktBtrgfWtq1pgpDs09fZo+KYi4= github.com/nspcc-dev/neofs-crypto v0.4.0/go.mod h1:6XJ8kbXgOfevbI2WMruOtI+qUJXNwSGM/E9eClXxPHs= github.com/nspcc-dev/neofs-sdk-go v0.0.0-20211201182451-a5b61c4f6477/go.mod h1:dfMtQWmBHYpl9Dez23TGtIUKiFvCIxUZq/CkSIhEpz4= github.com/nspcc-dev/neofs-sdk-go v0.0.0-20220113123743-7f3162110659/go.mod h1:/jay1lr3w7NQd/VDBkEhkJmDmyPNsu4W+QV2obsUV40= -github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.7 h1:IqtMHDvluK/naBqRHV/x9vZfmR6ZJ5aYXjhaCmJbFxE= -github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.7/go.mod h1:7bH8zabbewpXstaXKoV0Tk3lV7KFYadi5edLU5yDERY= github.com/nspcc-dev/rfc6979 v0.1.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso= github.com/nspcc-dev/rfc6979 v0.2.0 h1:3e1WNxrN60/6N0DW7+UYisLeZJyfqZTNOjeV/toYvOE= github.com/nspcc-dev/rfc6979 v0.2.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso= -github.com/nspcc-dev/tzhash v1.6.1 h1:8dUrWFpjkmoHF+7GxuGUmarj9LLHWFcuyF3CTrqq9JE= -github.com/nspcc-dev/tzhash v1.6.1/go.mod h1:BoflzCVp+DO/f1mvbcsJQWoFzidIFBhWFZMglbUW648= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= diff --git a/pkg/core/client/client.go b/pkg/core/client/client.go index 6ed337460..b325516ad 100644 --- a/pkg/core/client/client.go +++ b/pkg/core/client/client.go @@ -3,9 +3,9 @@ package client import ( "context" - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-sdk-go/client" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-sdk-go/client" ) // Client is an interface of NeoFS storage diff --git a/pkg/core/client/util.go b/pkg/core/client/util.go index fb3e9e008..bdf3fc6da 100644 --- a/pkg/core/client/util.go +++ b/pkg/core/client/util.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-sdk-go/client" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-sdk-go/client" ) func nodeInfoFromKeyAddr(dst *NodeInfo, k []byte, a, external network.AddressGroup) { diff --git a/pkg/core/container/delete.go b/pkg/core/container/delete.go index 592509a8b..066a96027 100644 --- a/pkg/core/container/delete.go +++ b/pkg/core/container/delete.go @@ -1,8 +1,8 @@ package container import ( - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/session" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" ) // RemovalWitness groups the information required diff --git a/pkg/core/container/storage.go b/pkg/core/container/storage.go index 3c83bb64f..de88f89fd 100644 --- a/pkg/core/container/storage.go +++ b/pkg/core/container/storage.go @@ -3,12 +3,12 @@ package container import ( "errors" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/session" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/session" ) // Container groups information about the NeoFS container stored in the NeoFS network. @@ -17,7 +17,7 @@ type Container struct { Value container.Container // Signature of the Value. - Signature neofscrypto.Signature + Signature frostfscrypto.Signature // Session within which Value was created. Nil means session absence. Session *session.Container @@ -50,7 +50,7 @@ type EACL struct { Value *eacl.Table // Signature of the Value. - Signature neofscrypto.Signature + Signature frostfscrypto.Signature // Session within which Value was set. Nil means session absence. Session *session.Container diff --git a/pkg/core/netmap/nodes.go b/pkg/core/netmap/nodes.go index 5e6640216..9fedbb31f 100644 --- a/pkg/core/netmap/nodes.go +++ b/pkg/core/netmap/nodes.go @@ -1,6 +1,6 @@ package netmap -import "github.com/nspcc-dev/neofs-sdk-go/netmap" +import "github.com/TrueCloudLab/frostfs-sdk-go/netmap" // Node is a named type of netmap.NodeInfo which provides interface needed // in the current repository. Node is expected to be used everywhere instead diff --git a/pkg/core/netmap/storage.go b/pkg/core/netmap/storage.go index 8f72ce1fe..44536713a 100644 --- a/pkg/core/netmap/storage.go +++ b/pkg/core/netmap/storage.go @@ -1,7 +1,7 @@ package netmap import ( - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // Source is an interface that wraps diff --git a/pkg/core/object/address.go b/pkg/core/object/address.go index a91082874..2f5883e89 100644 --- a/pkg/core/object/address.go +++ b/pkg/core/object/address.go @@ -1,8 +1,8 @@ package object import ( - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // AddressWithType groups object address with its NeoFS diff --git a/pkg/core/object/fmt.go b/pkg/core/object/fmt.go index 4fcf1ee15..edcdb1141 100644 --- a/pkg/core/object/fmt.go +++ b/pkg/core/object/fmt.go @@ -6,15 +6,15 @@ import ( "fmt" "strconv" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/storagegroup" - "github.com/nspcc-dev/neofs-sdk-go/user" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) // FormatValidator represents an object format validator. @@ -140,7 +140,7 @@ func (v *FormatValidator) validateSignatureKey(obj *object.Object) error { binKey := sigV2.GetKey() - var key neofsecdsa.PublicKey + var key frostfsecdsa.PublicKey err := key.Decode(binKey) if err != nil { @@ -158,7 +158,7 @@ func (v *FormatValidator) validateSignatureKey(obj *object.Object) error { return nil } -func (v *FormatValidator) checkOwnerKey(id user.ID, key neofsecdsa.PublicKey) error { +func (v *FormatValidator) checkOwnerKey(id user.ID, key frostfsecdsa.PublicKey) error { var id2 user.ID user.IDFromKey(&id2, (ecdsa.PublicKey)(key)) diff --git a/pkg/core/object/fmt_test.go b/pkg/core/object/fmt_test.go index cd8ed82b4..817d689bc 100644 --- a/pkg/core/object/fmt_test.go +++ b/pkg/core/object/fmt_test.go @@ -5,15 +5,15 @@ import ( "strconv" "testing" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + sessiontest "github.com/TrueCloudLab/frostfs-sdk-go/session/test" + "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - sessiontest "github.com/nspcc-dev/neofs-sdk-go/session/test" - "github.com/nspcc-dev/neofs-sdk-go/storagegroup" - "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/stretchr/testify/require" ) diff --git a/pkg/core/object/object.go b/pkg/core/object/object.go index e62f4ac65..9824c3d68 100644 --- a/pkg/core/object/object.go +++ b/pkg/core/object/object.go @@ -1,8 +1,8 @@ package object import ( - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // AddressOf returns the address of the object. diff --git a/pkg/core/storagegroup/storagegroup.go b/pkg/core/storagegroup/storagegroup.go index 73c9e90d1..8a70fbeac 100644 --- a/pkg/core/storagegroup/storagegroup.go +++ b/pkg/core/storagegroup/storagegroup.go @@ -3,11 +3,11 @@ package storagegroup import ( "context" - "github.com/nspcc-dev/neofs-node/pkg/core/client" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/storagegroup" + "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" ) // SearchSGPrm groups the parameters which are formed by Processor to search the storage group objects. diff --git a/pkg/core/version/version.go b/pkg/core/version/version.go index ed4e4a726..616d04967 100644 --- a/pkg/core/version/version.go +++ b/pkg/core/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/nspcc-dev/neofs-sdk-go/version" + "github.com/TrueCloudLab/frostfs-sdk-go/version" ) // IsValid checks if Version is not earlier than the genesis version of the NeoFS. diff --git a/pkg/core/version/version_test.go b/pkg/core/version/version_test.go index 8c1b11a09..3d229e922 100644 --- a/pkg/core/version/version_test.go +++ b/pkg/core/version/version_test.go @@ -3,8 +3,8 @@ package version_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/version" - versionSDK "github.com/nspcc-dev/neofs-sdk-go/version" + "github.com/TrueCloudLab/frostfs-node/pkg/core/version" + versionSDK "github.com/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/bindings.go b/pkg/innerring/bindings.go index d6a7d7a81..8bf9ed44b 100644 --- a/pkg/innerring/bindings.go +++ b/pkg/innerring/bindings.go @@ -1,7 +1,7 @@ package innerring import ( - "github.com/nspcc-dev/neofs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" ) type ( diff --git a/pkg/innerring/blocktimer.go b/pkg/innerring/blocktimer.go index 66fde2503..543ffbf0d 100644 --- a/pkg/innerring/blocktimer.go +++ b/pkg/innerring/blocktimer.go @@ -3,14 +3,14 @@ package innerring import ( "context" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/alphabet" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" + timerEvent "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/timer" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/alphabet" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement" - timerEvent "github.com/nspcc-dev/neofs-node/pkg/innerring/timers" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/morph/timer" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/innerring/contracts.go b/pkg/innerring/contracts.go index 8dfe4ab5d..094c65d1b 100644 --- a/pkg/innerring/contracts.go +++ b/pkg/innerring/contracts.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/spf13/viper" ) type contracts struct { - neofs util.Uint160 // in mainnet + frostfs util.Uint160 // in mainnet netmap util.Uint160 // in morph balance util.Uint160 // in morph container util.Uint160 // in morph @@ -20,7 +20,7 @@ type contracts struct { processing util.Uint160 // in mainnet reputation util.Uint160 // in morph subnet util.Uint160 // in morph - neofsID util.Uint160 // in morph + frostfsID util.Uint160 // in morph alphabet alphabetContracts // in morph } @@ -32,9 +32,9 @@ func parseContracts(cfg *viper.Viper, morph *client.Client, withoutMainNet, with ) if !withoutMainNet { - result.neofs, err = util.Uint160DecodeStringLE(cfg.GetString("contracts.neofs")) + result.frostfs, err = util.Uint160DecodeStringLE(cfg.GetString("contracts.frostfs")) if err != nil { - return nil, fmt.Errorf("can't get neofs script hash: %w", err) + return nil, fmt.Errorf("can't get frostfs script hash: %w", err) } if !withoutMainNotary { @@ -63,7 +63,7 @@ func parseContracts(cfg *viper.Viper, morph *client.Client, withoutMainNet, with {"contracts.audit", client.NNSAuditContractName, &result.audit}, {"contracts.reputation", client.NNSReputationContractName, &result.reputation}, {"contracts.subnet", client.NNSSubnetworkContractName, &result.subnet}, - {"contracts.neofsid", client.NNSNeoFSIDContractName, &result.neofsID}, + {"contracts.frostfsid", client.NNSNeoFSIDContractName, &result.frostfsID}, } for _, t := range targets { diff --git a/pkg/innerring/fetcher.go b/pkg/innerring/fetcher.go index 480225dc3..3d48b2f2b 100644 --- a/pkg/innerring/fetcher.go +++ b/pkg/innerring/fetcher.go @@ -1,9 +1,9 @@ package innerring import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" ) // NewIRFetcherWithNotary creates IrFetcherWithNotary. diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 2d2457fcc..30e1371e9 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -8,48 +8,48 @@ import ( "io" "net" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/config" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/alphabet" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/balance" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/container" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" + frostfs "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/neofs" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" + nodevalidator "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation" + addrvalidator "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/maddress" + statevalidation "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + subnetvalidator "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/subnet" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" + auditSettlement "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/audit" + timerEvent "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "github.com/TrueCloudLab/frostfs-node/pkg/metrics" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + auditClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/audit" + balanceClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + frostfsClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/subscriber" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/timer" + audittask "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/taskmanager" + control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" + controlsrv "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir/server" + reputationcommon "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + util2 "github.com/TrueCloudLab/frostfs-node/pkg/util" + utilConfig "github.com/TrueCloudLab/frostfs-node/pkg/util/config" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/precision" + "github.com/TrueCloudLab/frostfs-node/pkg/util/state" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" - "github.com/nspcc-dev/neofs-node/pkg/innerring/config" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/alphabet" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/audit" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/balance" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/container" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/governance" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/neofs" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap" - nodevalidator "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation" - addrvalidator "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/maddress" - statevalidation "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/state" - subnetvalidator "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/subnet" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/reputation" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement" - auditSettlement "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/audit" - timerEvent "github.com/nspcc-dev/neofs-node/pkg/innerring/timers" - "github.com/nspcc-dev/neofs-node/pkg/metrics" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - auditClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/audit" - balanceClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/balance" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - neofsClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation" - morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/morph/subscriber" - "github.com/nspcc-dev/neofs-node/pkg/morph/timer" - audittask "github.com/nspcc-dev/neofs-node/pkg/services/audit/taskmanager" - control "github.com/nspcc-dev/neofs-node/pkg/services/control/ir" - controlsrv "github.com/nspcc-dev/neofs-node/pkg/services/control/ir/server" - reputationcommon "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - util2 "github.com/nspcc-dev/neofs-node/pkg/util" - utilConfig "github.com/nspcc-dev/neofs-node/pkg/util/config" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-node/pkg/util/precision" - "github.com/nspcc-dev/neofs-node/pkg/util/state" "github.com/panjf2000/ants/v2" "github.com/spf13/viper" "go.uber.org/atomic" @@ -508,13 +508,13 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan return nil, err } - neofsIDClient, err := neofsid.NewFromMorph(server.morphClient, server.contracts.neofsID, fee, neofsid.TryNotary(), neofsid.AsAlphabet()) + frostfsIDClient, err := neofsid.NewFromMorph(server.morphClient, server.contracts.frostfsID, fee, neofsid.TryNotary(), neofsid.AsAlphabet()) if err != nil { return nil, err } - neofsCli, err := neofsClient.NewFromMorph(server.mainnetClient, server.contracts.neofs, - server.feeConfig.MainChainFee(), neofsClient.TryNotary(), neofsClient.AsAlphabet()) + frostfsCli, err := frostfsClient.NewFromMorph(server.mainnetClient, server.contracts.frostfs, + server.feeConfig.MainChainFee(), frostfsClient.TryNotary(), frostfsClient.AsAlphabet()) if err != nil { return nil, err } @@ -670,7 +670,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan // create governance processor governanceProcessor, err := governance.New(&governance.Params{ Log: log, - NeoFSClient: neofsCli, + NeoFSClient: frostfsCli, NetmapClient: server.netmapClient, AlphabetState: server, EpochState: server, @@ -743,7 +743,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan PoolSize: cfg.GetInt("workers.container"), AlphabetState: server, ContainerClient: cnrClient, - NeoFSIDClient: neofsIDClient, + NeoFSIDClient: frostfsIDClient, NetworkState: server.netmapClient, NotaryDisabled: server.sideNotaryConfig.disabled, SubnetClient: subnetClient, @@ -761,7 +761,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan balanceProcessor, err := balance.New(&balance.Params{ Log: log, PoolSize: cfg.GetInt("workers.balance"), - NeoFSClient: neofsCli, + NeoFSClient: frostfsCli, BalanceSC: server.contracts.balance, AlphabetState: server, Converter: &server.precision, @@ -776,12 +776,12 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan } if !server.withoutMainNet { - // create mainnnet neofs processor - neofsProcessor, err := neofs.New(&neofs.Params{ + // create mainnnet frostfs processor + frostfsProcessor, err := frostfs.New(&frostfs.Params{ Log: log, - PoolSize: cfg.GetInt("workers.neofs"), - NeoFSContract: server.contracts.neofs, - NeoFSIDClient: neofsIDClient, + PoolSize: cfg.GetInt("workers.frostfs"), + NeoFSContract: server.contracts.frostfs, + NeoFSIDClient: frostfsIDClient, BalanceClient: server.balanceClient, NetmapClient: server.netmapClient, MorphClient: server.morphClient, @@ -797,7 +797,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan return nil, err } - err = bindMainnetProcessor(neofsProcessor, server) + err = bindMainnetProcessor(frostfsProcessor, server) if err != nil { return nil, err } diff --git a/pkg/innerring/internal/client/client.go b/pkg/innerring/internal/client/client.go index c3ea3e96f..480835f2a 100644 --- a/pkg/innerring/internal/client/client.go +++ b/pkg/innerring/internal/client/client.go @@ -1,4 +1,4 @@ -package neofsapiclient +package frostfsapiclient import ( "context" @@ -7,13 +7,13 @@ import ( "fmt" "io" - clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/storagegroup" - "github.com/nspcc-dev/neofs-sdk-go/client" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/storagegroup" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // Client represents NeoFS API client cut down to the needs of a purely IR application. diff --git a/pkg/innerring/internal/client/doc.go b/pkg/innerring/internal/client/doc.go index 491e48026..0a0e8ea3e 100644 --- a/pkg/innerring/internal/client/doc.go +++ b/pkg/innerring/internal/client/doc.go @@ -1,4 +1,4 @@ -// Package neofsapiclient provides functionality for IR application communication with NeoFS network. +// Package frostfsapiclient provides functionality for IR application communication with NeoFS network. // // The basic client for accessing remote nodes via NeoFS API is a NeoFS SDK Go API client. // However, although it encapsulates a useful piece of business logic (e.g. the signature mechanism), @@ -9,4 +9,4 @@ // the entire spectrum of the client's use in one place (this will be convenient both when updating the base client // and for evaluating the UX of SDK library). So, it is expected that all application packages will be limited // to this package for the development of functionality requiring NeoFS API communication. -package neofsapiclient +package frostfsapiclient diff --git a/pkg/innerring/internal/client/prm.go b/pkg/innerring/internal/client/prm.go index cf47f8b93..5f47e196b 100644 --- a/pkg/innerring/internal/client/prm.go +++ b/pkg/innerring/internal/client/prm.go @@ -1,9 +1,9 @@ -package neofsapiclient +package frostfsapiclient import ( "context" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) type contextPrm struct { diff --git a/pkg/innerring/locode.go b/pkg/innerring/locode.go index 01720f984..700ebb81c 100644 --- a/pkg/innerring/locode.go +++ b/pkg/innerring/locode.go @@ -1,11 +1,11 @@ package innerring import ( - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap" - irlocode "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/locode" - "github.com/nspcc-dev/neofs-node/pkg/util/locode" - locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db" - locodebolt "github.com/nspcc-dev/neofs-node/pkg/util/locode/db/boltdb" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" + irlocode "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/locode" + "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + locodebolt "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db/boltdb" "github.com/spf13/viper" ) diff --git a/pkg/innerring/netmap.go b/pkg/innerring/netmap.go index 03b13b053..a10415714 100644 --- a/pkg/innerring/netmap.go +++ b/pkg/innerring/netmap.go @@ -3,8 +3,8 @@ package innerring import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/state" - netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" ) /* diff --git a/pkg/innerring/notary.go b/pkg/innerring/notary.go index 24377fb55..eccfcdc9d 100644 --- a/pkg/innerring/notary.go +++ b/pkg/innerring/notary.go @@ -4,9 +4,9 @@ import ( "context" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/spf13/viper" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/alphabet/handlers.go b/pkg/innerring/processors/alphabet/handlers.go index b7d2e34e6..927b80612 100644 --- a/pkg/innerring/processors/alphabet/handlers.go +++ b/pkg/innerring/processors/alphabet/handlers.go @@ -1,8 +1,8 @@ package alphabet import ( - "github.com/nspcc-dev/neofs-node/pkg/innerring/timers" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/alphabet/processor.go b/pkg/innerring/processors/alphabet/processor.go index 5dc439ae6..9dd611840 100644 --- a/pkg/innerring/processors/alphabet/processor.go +++ b/pkg/innerring/processors/alphabet/processor.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) @@ -54,7 +54,7 @@ type ( } ) -// New creates a neofs mainnet contract processor instance. +// New creates a frostfs mainnet contract processor instance. func New(p *Params) (*Processor, error) { switch { case p.Log == nil: @@ -69,7 +69,7 @@ func New(p *Params) (*Processor, error) { pool, err := ants.NewPool(p.PoolSize, ants.WithNonblocking(true)) if err != nil { - return nil, fmt.Errorf("ir/neofs: can't create worker pool: %w", err) + return nil, fmt.Errorf("ir/frostfs: can't create worker pool: %w", err) } return &Processor{ diff --git a/pkg/innerring/processors/audit/handlers.go b/pkg/innerring/processors/audit/handlers.go index 38c2acd7d..bed8e5502 100644 --- a/pkg/innerring/processors/audit/handlers.go +++ b/pkg/innerring/processors/audit/handlers.go @@ -1,7 +1,7 @@ package audit import ( - "github.com/nspcc-dev/neofs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/audit/process.go b/pkg/innerring/processors/audit/process.go index 2489ded9d..d592dddb7 100644 --- a/pkg/innerring/processors/audit/process.go +++ b/pkg/innerring/processors/audit/process.go @@ -4,16 +4,16 @@ import ( "context" "crypto/sha256" - clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client" - netmapcore "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/core/storagegroup" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - "github.com/nspcc-dev/neofs-node/pkg/services/audit" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" - "github.com/nspcc-dev/neofs-node/pkg/util/rand" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/audit/processor.go b/pkg/innerring/processors/audit/processor.go index 6016e33a7..2a6234377 100644 --- a/pkg/innerring/processors/audit/processor.go +++ b/pkg/innerring/processors/audit/processor.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/nspcc-dev/neofs-node/pkg/core/storagegroup" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/services/audit" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" ) diff --git a/pkg/innerring/processors/audit/scheduler.go b/pkg/innerring/processors/audit/scheduler.go index 2050f0a40..6e32c5d6c 100644 --- a/pkg/innerring/processors/audit/scheduler.go +++ b/pkg/innerring/processors/audit/scheduler.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/audit/scheduler_test.go b/pkg/innerring/processors/audit/scheduler_test.go index 2318044a5..c7fd46b23 100644 --- a/pkg/innerring/processors/audit/scheduler_test.go +++ b/pkg/innerring/processors/audit/scheduler_test.go @@ -3,9 +3,9 @@ package audit_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/audit" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/balance/handlers.go b/pkg/innerring/processors/balance/handlers.go index 7c7784b62..39683f779 100644 --- a/pkg/innerring/processors/balance/handlers.go +++ b/pkg/innerring/processors/balance/handlers.go @@ -3,8 +3,8 @@ package balance import ( "encoding/hex" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - balanceEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/balance" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/balance/process_assets.go b/pkg/innerring/processors/balance/process_assets.go index d4944ae7b..63be70a07 100644 --- a/pkg/innerring/processors/balance/process_assets.go +++ b/pkg/innerring/processors/balance/process_assets.go @@ -1,8 +1,8 @@ package balance import ( - neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" - balanceEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/balance" + neofscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs" + balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/balance/processor.go b/pkg/innerring/processors/balance/processor.go index b73826850..3013781fe 100644 --- a/pkg/innerring/processors/balance/processor.go +++ b/pkg/innerring/processors/balance/processor.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" + frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + balanceEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/balance" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util" - neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - balanceEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/balance" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) @@ -28,7 +28,7 @@ type ( Processor struct { log *logger.Logger pool *ants.Pool - neofsClient *neofscontract.Client + neofsClient *frostfscontract.Client balanceSC util.Uint160 alphabetState AlphabetState converter PrecisionConverter @@ -38,7 +38,7 @@ type ( Params struct { Log *logger.Logger PoolSize int - NeoFSClient *neofscontract.Client + NeoFSClient *frostfscontract.Client BalanceSC util.Uint160 AlphabetState AlphabetState Converter PrecisionConverter diff --git a/pkg/innerring/processors/container/common.go b/pkg/innerring/processors/container/common.go index 2eb6f24ba..608e66de0 100644 --- a/pkg/innerring/processors/container/common.go +++ b/pkg/innerring/processors/container/common.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - "github.com/nspcc-dev/neofs-sdk-go/session" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) var ( @@ -48,7 +48,7 @@ type signatureVerificationData struct { // - session is "alive" func (cp *Processor) verifySignature(v signatureVerificationData) error { var err error - var key neofsecdsa.PublicKeyRFC6979 + var key frostfsecdsa.PublicKeyRFC6979 keyProvided := v.binPublicKey != nil if keyProvided { @@ -122,7 +122,7 @@ func (cp *Processor) verifySignature(v signatureVerificationData) error { } for i := range ownerKeys { - if (*neofsecdsa.PublicKeyRFC6979)(ownerKeys[i]).Verify(v.signedData, v.signature) { + if (*frostfsecdsa.PublicKeyRFC6979)(ownerKeys[i]).Verify(v.signedData, v.signature) { return nil } } diff --git a/pkg/innerring/processors/container/handlers.go b/pkg/innerring/processors/container/handlers.go index 494c1cf87..6f26d1af3 100644 --- a/pkg/innerring/processors/container/handlers.go +++ b/pkg/innerring/processors/container/handlers.go @@ -3,9 +3,9 @@ package container import ( "crypto/sha256" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" "github.com/mr-tron/base58" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/container/process_container.go b/pkg/innerring/processors/container/process_container.go index f4a333988..9f4acc5de 100644 --- a/pkg/innerring/processors/container/process_container.go +++ b/pkg/innerring/processors/container/process_container.go @@ -3,15 +3,15 @@ package container import ( "fmt" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" + containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" "github.com/nspcc-dev/neo-go/pkg/network/payload" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container" - containerSDK "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/session" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/container/process_eacl.go b/pkg/innerring/processors/container/process_eacl.go index db862aeeb..0f3b6e71c 100644 --- a/pkg/innerring/processors/container/process_eacl.go +++ b/pkg/innerring/processors/container/process_eacl.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/event/container" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/session" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/container/processor.go b/pkg/innerring/processors/container/processor.go index c572a19a5..f670d994e 100644 --- a/pkg/innerring/processors/container/processor.go +++ b/pkg/innerring/processors/container/processor.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid" + morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + containerEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/container" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid" - morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - containerEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/container" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/governance/handlers.go b/pkg/innerring/processors/governance/handlers.go index 24f460ab1..4d6776cdf 100644 --- a/pkg/innerring/processors/governance/handlers.go +++ b/pkg/innerring/processors/governance/handlers.go @@ -1,11 +1,11 @@ package governance import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement" "github.com/nspcc-dev/neo-go/pkg/core/native" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/morph/event/rolemanagement" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/governance/process_update.go b/pkg/innerring/processors/governance/process_update.go index c6836ba38..1f59f8b4d 100644 --- a/pkg/innerring/processors/governance/process_update.go +++ b/pkg/innerring/processors/governance/process_update.go @@ -6,11 +6,11 @@ import ( "sort" "strings" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "go.uber.org/zap" ) @@ -131,14 +131,14 @@ func (gp *Processor) processAlphabetSync(txHash util.Uint256) { id := append([]byte(alphabetUpdateIDPrefix), buf...) - prm := neofscontract.AlphabetUpdatePrm{} + prm := frostfscontract.AlphabetUpdatePrm{} prm.SetID(id) prm.SetPubs(newAlphabet) - err = gp.neofsClient.AlphabetUpdate(prm) + err = gp.frostfsClient.AlphabetUpdate(prm) if err != nil { - gp.log.Error("can't update list of alphabet nodes in neofs contract", + gp.log.Error("can't update list of alphabet nodes in frostfs contract", zap.String("error", err.Error())) } diff --git a/pkg/innerring/processors/governance/processor.go b/pkg/innerring/processors/governance/processor.go index 845994ebc..cdafbbc71 100644 --- a/pkg/innerring/processors/governance/processor.go +++ b/pkg/innerring/processors/governance/processor.go @@ -4,15 +4,15 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + frostfscontract "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofs" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/rolemanagement" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/native" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - neofscontract "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofs" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/morph/event/rolemanagement" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" ) @@ -55,10 +55,10 @@ type ( // Processor of events related to governance in the network. Processor struct { - log *logger.Logger - pool *ants.Pool - neofsClient *neofscontract.Client - netmapClient *nmClient.Client + log *logger.Logger + pool *ants.Pool + frostfsClient *frostfscontract.Client + netmapClient *nmClient.Client alphabetState AlphabetState epochState EpochState @@ -84,7 +84,7 @@ type ( MorphClient *client.Client MainnetClient *client.Client - NeoFSClient *neofscontract.Client + NeoFSClient *frostfscontract.Client NetmapClient *nmClient.Client NotaryDisabled bool @@ -121,7 +121,7 @@ func New(p *Params) (*Processor, error) { return &Processor{ log: p.Log, pool: pool, - neofsClient: p.NeoFSClient, + frostfsClient: p.NeoFSClient, netmapClient: p.NetmapClient, alphabetState: p.AlphabetState, epochState: p.EpochState, diff --git a/pkg/innerring/processors/neofs/handlers.go b/pkg/innerring/processors/neofs/handlers.go index e42d9d015..e5b1f091b 100644 --- a/pkg/innerring/processors/neofs/handlers.go +++ b/pkg/innerring/processors/neofs/handlers.go @@ -1,16 +1,16 @@ -package neofs +package frostfs import ( "encoding/hex" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs" "github.com/nspcc-dev/neo-go/pkg/util/slice" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs" "go.uber.org/zap" ) func (np *Processor) handleDeposit(ev event.Event) { - deposit := ev.(neofsEvent.Deposit) + deposit := ev.(frostfsEvent.Deposit) np.log.Info("notification", zap.String("type", "deposit"), zap.String("id", hex.EncodeToString(slice.CopyReverse(deposit.ID())))) @@ -20,13 +20,13 @@ func (np *Processor) handleDeposit(ev event.Event) { err := np.pool.Submit(func() { np.processDeposit(&deposit) }) if err != nil { // there system can be moved into controlled degradation stage - np.log.Warn("neofs processor worker pool drained", + np.log.Warn("frostfs processor worker pool drained", zap.Int("capacity", np.pool.Cap())) } } func (np *Processor) handleWithdraw(ev event.Event) { - withdraw := ev.(neofsEvent.Withdraw) + withdraw := ev.(frostfsEvent.Withdraw) np.log.Info("notification", zap.String("type", "withdraw"), zap.String("id", hex.EncodeToString(slice.CopyReverse(withdraw.ID())))) @@ -36,13 +36,13 @@ func (np *Processor) handleWithdraw(ev event.Event) { err := np.pool.Submit(func() { np.processWithdraw(&withdraw) }) if err != nil { // there system can be moved into controlled degradation stage - np.log.Warn("neofs processor worker pool drained", + np.log.Warn("frostfs processor worker pool drained", zap.Int("capacity", np.pool.Cap())) } } func (np *Processor) handleCheque(ev event.Event) { - cheque := ev.(neofsEvent.Cheque) + cheque := ev.(frostfsEvent.Cheque) np.log.Info("notification", zap.String("type", "cheque"), zap.String("id", hex.EncodeToString(cheque.ID()))) @@ -52,13 +52,13 @@ func (np *Processor) handleCheque(ev event.Event) { err := np.pool.Submit(func() { np.processCheque(&cheque) }) if err != nil { // there system can be moved into controlled degradation stage - np.log.Warn("neofs processor worker pool drained", + np.log.Warn("frostfs processor worker pool drained", zap.Int("capacity", np.pool.Cap())) } } func (np *Processor) handleConfig(ev event.Event) { - cfg := ev.(neofsEvent.Config) + cfg := ev.(frostfsEvent.Config) np.log.Info("notification", zap.String("type", "set config"), zap.String("key", hex.EncodeToString(cfg.Key())), @@ -69,13 +69,13 @@ func (np *Processor) handleConfig(ev event.Event) { err := np.pool.Submit(func() { np.processConfig(&cfg) }) if err != nil { // there system can be moved into controlled degradation stage - np.log.Warn("neofs processor worker pool drained", + np.log.Warn("frostfs processor worker pool drained", zap.Int("capacity", np.pool.Cap())) } } func (np *Processor) handleBind(ev event.Event) { - e := ev.(neofsEvent.Bind) + e := ev.(frostfsEvent.Bind) np.log.Info("notification", zap.String("type", "bind"), ) @@ -85,13 +85,13 @@ func (np *Processor) handleBind(ev event.Event) { err := np.pool.Submit(func() { np.processBind(e) }) if err != nil { // there system can be moved into controlled degradation stage - np.log.Warn("neofs processor worker pool drained", + np.log.Warn("frostfs processor worker pool drained", zap.Int("capacity", np.pool.Cap())) } } func (np *Processor) handleUnbind(ev event.Event) { - e := ev.(neofsEvent.Unbind) + e := ev.(frostfsEvent.Unbind) np.log.Info("notification", zap.String("type", "unbind"), ) @@ -101,7 +101,7 @@ func (np *Processor) handleUnbind(ev event.Event) { err := np.pool.Submit(func() { np.processBind(e) }) if err != nil { // there system can be moved into controlled degradation stage - np.log.Warn("neofs processor worker pool drained", + np.log.Warn("frostfs processor worker pool drained", zap.Int("capacity", np.pool.Cap())) } } diff --git a/pkg/innerring/processors/neofs/process_assets.go b/pkg/innerring/processors/neofs/process_assets.go index 0684d5abf..2fdd55ad6 100644 --- a/pkg/innerring/processors/neofs/process_assets.go +++ b/pkg/innerring/processors/neofs/process_assets.go @@ -1,9 +1,9 @@ -package neofs +package frostfs import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/balance" - neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs" "go.uber.org/zap" ) @@ -14,7 +14,7 @@ const ( // Process deposit event by invoking a balance contract and sending native // gas in the sidechain. -func (np *Processor) processDeposit(deposit *neofsEvent.Deposit) { +func (np *Processor) processDeposit(deposit *frostfsEvent.Deposit) { if !np.alphabetState.IsAlphabet() { np.log.Info("non alphabet mode, ignore deposit") return @@ -79,7 +79,7 @@ func (np *Processor) processDeposit(deposit *neofsEvent.Deposit) { } // Process withdraw event by locking assets in the balance account. -func (np *Processor) processWithdraw(withdraw *neofsEvent.Withdraw) { +func (np *Processor) processWithdraw(withdraw *frostfsEvent.Withdraw) { if !np.alphabetState.IsAlphabet() { np.log.Info("non alphabet mode, ignore withdraw") return @@ -110,7 +110,7 @@ func (np *Processor) processWithdraw(withdraw *neofsEvent.Withdraw) { // Process cheque event by transferring assets from the lock account back to // the reserve account. -func (np *Processor) processCheque(cheque *neofsEvent.Cheque) { +func (np *Processor) processCheque(cheque *frostfsEvent.Cheque) { if !np.alphabetState.IsAlphabet() { np.log.Info("non alphabet mode, ignore cheque") return diff --git a/pkg/innerring/processors/neofs/process_bind.go b/pkg/innerring/processors/neofs/process_bind.go index 6beb98d87..567f04c7f 100644 --- a/pkg/innerring/processors/neofs/process_bind.go +++ b/pkg/innerring/processors/neofs/process_bind.go @@ -1,14 +1,14 @@ -package neofs +package frostfs import ( "crypto/elliptic" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid" + frostfs "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid" - "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) @@ -28,7 +28,7 @@ func (np *Processor) processBind(e bindCommon) { bindCommon: e, } - _, c.bind = e.(neofs.Bind) + _, c.bind = e.(frostfs.Bind) err := np.checkBindCommon(c) if err != nil { @@ -95,10 +95,10 @@ func (np *Processor) approveBindCommon(e *bindCommonContext) { var typ string if e.bind { typ = "bind" - err = np.neofsIDClient.AddKeys(prm) + err = np.frostfsIDClient.AddKeys(prm) } else { typ = "unbind" - err = np.neofsIDClient.RemoveKeys(prm) + err = np.frostfsIDClient.RemoveKeys(prm) } if err != nil { diff --git a/pkg/innerring/processors/neofs/process_config.go b/pkg/innerring/processors/neofs/process_config.go index d81685360..a2e7e4c5e 100644 --- a/pkg/innerring/processors/neofs/process_config.go +++ b/pkg/innerring/processors/neofs/process_config.go @@ -1,14 +1,14 @@ -package neofs +package frostfs import ( - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs" "go.uber.org/zap" ) // Process config event by setting configuration value from the mainchain in // the sidechain. -func (np *Processor) processConfig(config *neofsEvent.Config) { +func (np *Processor) processConfig(config *frostfsEvent.Config) { if !np.alphabetState.IsAlphabet() { np.log.Info("non alphabet mode, ignore config") return diff --git a/pkg/innerring/processors/neofs/processor.go b/pkg/innerring/processors/neofs/processor.go index 08917b4fe..8435a9315 100644 --- a/pkg/innerring/processors/neofs/processor.go +++ b/pkg/innerring/processors/neofs/processor.go @@ -1,20 +1,20 @@ -package neofs +package frostfs import ( "errors" "fmt" "sync" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/neofsid" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + frostfsEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/neofs" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/balance" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/neofsid" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - neofsEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/neofs" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) @@ -35,11 +35,11 @@ type ( ToBalancePrecision(int64) int64 } - // Processor of events produced by neofs contract in main net. + // Processor of events produced by frostfs contract in main net. Processor struct { log *logger.Logger pool *ants.Pool - neofsContract util.Uint160 + frostfsContract util.Uint160 balanceClient *balance.Client netmapClient *nmClient.Client morphClient *client.Client @@ -52,7 +52,7 @@ type ( mintEmitValue fixedn.Fixed8 gasBalanceThreshold int64 - neofsIDClient *neofsid.Client + frostfsIDClient *neofsid.Client } // Params of the processor constructor. @@ -83,37 +83,37 @@ const ( unbindNotification = "Unbind" ) -// New creates neofs mainnet contract processor instance. +// New creates frostfs mainnet contract processor instance. func New(p *Params) (*Processor, error) { switch { case p.Log == nil: - return nil, errors.New("ir/neofs: logger is not set") + return nil, errors.New("ir/frostfs: logger is not set") case p.MorphClient == nil: - return nil, errors.New("ir/neofs: neo:morph client is not set") + return nil, errors.New("ir/frostfs: neo:morph client is not set") case p.EpochState == nil: - return nil, errors.New("ir/neofs: global state is not set") + return nil, errors.New("ir/frostfs: global state is not set") case p.AlphabetState == nil: - return nil, errors.New("ir/neofs: global state is not set") + return nil, errors.New("ir/frostfs: global state is not set") case p.Converter == nil: - return nil, errors.New("ir/neofs: balance precision converter is not set") + return nil, errors.New("ir/frostfs: balance precision converter is not set") } - p.Log.Debug("neofs worker pool", zap.Int("size", p.PoolSize)) + p.Log.Debug("frostfs worker pool", zap.Int("size", p.PoolSize)) pool, err := ants.NewPool(p.PoolSize, ants.WithNonblocking(true)) if err != nil { - return nil, fmt.Errorf("ir/neofs: can't create worker pool: %w", err) + return nil, fmt.Errorf("ir/frostfs: can't create worker pool: %w", err) } lruCache, err := lru.New(p.MintEmitCacheSize) if err != nil { - return nil, fmt.Errorf("ir/neofs: can't create LRU cache for gas emission: %w", err) + return nil, fmt.Errorf("ir/frostfs: can't create LRU cache for gas emission: %w", err) } return &Processor{ log: p.Log, pool: pool, - neofsContract: p.NeoFSContract, + frostfsContract: p.NeoFSContract, balanceClient: p.BalanceClient, netmapClient: p.NetmapClient, morphClient: p.MorphClient, @@ -126,7 +126,7 @@ func New(p *Params) (*Processor, error) { mintEmitValue: p.MintEmitValue, gasBalanceThreshold: p.GasBalanceThreshold, - neofsIDClient: p.NeoFSIDClient, + frostfsIDClient: p.NeoFSIDClient, }, nil } @@ -138,36 +138,36 @@ func (np *Processor) ListenerNotificationParsers() []event.NotificationParserInf p event.NotificationParserInfo ) - p.SetScriptHash(np.neofsContract) + p.SetScriptHash(np.frostfsContract) // deposit event p.SetType(event.TypeFromString(depositNotification)) - p.SetParser(neofsEvent.ParseDeposit) + p.SetParser(frostfsEvent.ParseDeposit) parsers = append(parsers, p) // withdraw event p.SetType(event.TypeFromString(withdrawNotification)) - p.SetParser(neofsEvent.ParseWithdraw) + p.SetParser(frostfsEvent.ParseWithdraw) parsers = append(parsers, p) // cheque event p.SetType(event.TypeFromString(chequeNotification)) - p.SetParser(neofsEvent.ParseCheque) + p.SetParser(frostfsEvent.ParseCheque) parsers = append(parsers, p) // config event p.SetType(event.TypeFromString(configNotification)) - p.SetParser(neofsEvent.ParseConfig) + p.SetParser(frostfsEvent.ParseConfig) parsers = append(parsers, p) // bind event p.SetType(event.TypeFromString(bindNotification)) - p.SetParser(neofsEvent.ParseBind) + p.SetParser(frostfsEvent.ParseBind) parsers = append(parsers, p) // unbind event p.SetType(event.TypeFromString(unbindNotification)) - p.SetParser(neofsEvent.ParseUnbind) + p.SetParser(frostfsEvent.ParseUnbind) parsers = append(parsers, p) return parsers @@ -181,7 +181,7 @@ func (np *Processor) ListenerNotificationHandlers() []event.NotificationHandlerI h event.NotificationHandlerInfo ) - h.SetScriptHash(np.neofsContract) + h.SetScriptHash(np.frostfsContract) // deposit handler h.SetType(event.TypeFromString(depositNotification)) diff --git a/pkg/innerring/processors/netmap/cleanup_table.go b/pkg/innerring/processors/netmap/cleanup_table.go index 226a7d447..38b9ffb37 100644 --- a/pkg/innerring/processors/netmap/cleanup_table.go +++ b/pkg/innerring/processors/netmap/cleanup_table.go @@ -4,7 +4,7 @@ import ( "bytes" "sync" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) type ( diff --git a/pkg/innerring/processors/netmap/cleanup_table_test.go b/pkg/innerring/processors/netmap/cleanup_table_test.go index 1c1433d0c..8bf44a5b6 100644 --- a/pkg/innerring/processors/netmap/cleanup_table_test.go +++ b/pkg/innerring/processors/netmap/cleanup_table_test.go @@ -3,8 +3,8 @@ package netmap import ( "testing" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/netmap/handlers.go b/pkg/innerring/processors/netmap/handlers.go index fea72672e..846d96434 100644 --- a/pkg/innerring/processors/netmap/handlers.go +++ b/pkg/innerring/processors/netmap/handlers.go @@ -3,10 +3,10 @@ package netmap import ( "encoding/hex" - timerEvent "github.com/nspcc-dev/neofs-node/pkg/innerring/timers" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - subnetevents "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" + timerEvent "github.com/TrueCloudLab/frostfs-node/pkg/innerring/timers" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go index 8d78c1d96..8e3f5b5a5 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go +++ b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/util/locode" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) var errMissingRequiredAttr = errors.New("missing required attribute in DB record") diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go b/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go index ab17e34ba..5a6921230 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go +++ b/pkg/innerring/processors/netmap/nodevalidation/locode/calls_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/locode" - locodestd "github.com/nspcc-dev/neofs-node/pkg/util/locode" - locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/locode" + locodestd "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go b/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go index 5a5078ff8..a99705d02 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go +++ b/pkg/innerring/processors/netmap/nodevalidation/locode/deps.go @@ -1,8 +1,8 @@ package locode import ( - "github.com/nspcc-dev/neofs-node/pkg/util/locode" - locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db" + "github.com/TrueCloudLab/frostfs-node/pkg/util/locode" + locodedb "github.com/TrueCloudLab/frostfs-node/pkg/util/locode/db" ) // Record is an interface of read-only diff --git a/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go b/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go index fa6afbde7..0e864577a 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go +++ b/pkg/innerring/processors/netmap/nodevalidation/maddress/calls.go @@ -3,8 +3,8 @@ package maddress import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // VerifyAndUpdate calls network.VerifyAddress. diff --git a/pkg/innerring/processors/netmap/nodevalidation/state/validator.go b/pkg/innerring/processors/netmap/nodevalidation/state/validator.go index 5638fc5c8..39ff25b3f 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/state/validator.go +++ b/pkg/innerring/processors/netmap/nodevalidation/state/validator.go @@ -9,7 +9,7 @@ package state import ( "errors" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // ErrMaintenanceModeDisallowed is returned when maintenance mode is disallowed. @@ -33,7 +33,7 @@ type NetworkSettings interface { // and currently doesn't require any additional initialization. // // NetMapCandidateValidator implements -// github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap.NodeValidator. +// github.com/nspcc-dev/frostfs-node/pkg/innerring/processors/netmap.NodeValidator. type NetMapCandidateValidator struct { netSettings NetworkSettings } diff --git a/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go b/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go index e1acf96a8..876019440 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go +++ b/pkg/innerring/processors/netmap/nodevalidation/state/validator_test.go @@ -3,8 +3,8 @@ package state_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/state" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go b/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go index 399cf865f..9d32f9f7a 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go +++ b/pkg/innerring/processors/netmap/nodevalidation/subnet/calls.go @@ -3,9 +3,9 @@ package subnet import ( "fmt" - morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" + morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" ) // VerifyAndUpdate calls subnet contract's `NodeAllowed` method. diff --git a/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go b/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go index 7d6fb7560..04ad89174 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go +++ b/pkg/innerring/processors/netmap/nodevalidation/subnet/validator.go @@ -3,7 +3,7 @@ package subnet import ( "errors" - morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet" + morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" ) // Validator is an utility that verifies node subnet diff --git a/pkg/innerring/processors/netmap/nodevalidation/validator.go b/pkg/innerring/processors/netmap/nodevalidation/validator.go index fdb88b927..bf9c84385 100644 --- a/pkg/innerring/processors/netmap/nodevalidation/validator.go +++ b/pkg/innerring/processors/netmap/nodevalidation/validator.go @@ -1,8 +1,8 @@ package nodevalidation import ( - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap" - apinetmap "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap" + apinetmap "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // CompositeValidator wraps `netmap.NodeValidator`s. diff --git a/pkg/innerring/processors/netmap/process_cleanup.go b/pkg/innerring/processors/netmap/process_cleanup.go index 0aff66fc9..3b7ac6291 100644 --- a/pkg/innerring/processors/netmap/process_cleanup.go +++ b/pkg/innerring/processors/netmap/process_cleanup.go @@ -1,9 +1,9 @@ package netmap import ( + v2netmap "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" + netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - v2netmap "github.com/nspcc-dev/neofs-api-go/v2/netmap" - netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "go.uber.org/zap" ) @@ -27,7 +27,7 @@ func (np *Processor) processNetmapCleanupTick(ev netmapCleanupTick) { // In notary environments we call UpdateStateIR method instead of UpdateState. // It differs from UpdateState only by name, so we can do this in the same form. - // See https://github.com/nspcc-dev/neofs-contract/issues/225 + // See https://github.com/nspcc-dev/frostfs-contract/issues/225 const methodUpdateStateNotary = "updateStateIR" if np.notaryDisabled { diff --git a/pkg/innerring/processors/netmap/process_epoch.go b/pkg/innerring/processors/netmap/process_epoch.go index 7314e0e89..fca2a4c95 100644 --- a/pkg/innerring/processors/netmap/process_epoch.go +++ b/pkg/innerring/processors/netmap/process_epoch.go @@ -1,11 +1,11 @@ package netmap import ( - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/audit" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/governance" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/netmap/process_peers.go b/pkg/innerring/processors/netmap/process_peers.go index f5f79fa13..eba59cb17 100644 --- a/pkg/innerring/processors/netmap/process_peers.go +++ b/pkg/innerring/processors/netmap/process_peers.go @@ -4,11 +4,11 @@ import ( "bytes" "encoding/hex" - netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - subnetEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" + netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + subnetEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" "go.uber.org/zap" ) @@ -70,7 +70,7 @@ func (np *Processor) processAddPeer(ev netmapEvent.AddPeer) { // In notary environments we call AddPeerIR method instead of AddPeer. // It differs from AddPeer only by name, so we can do this in the same form. - // See https://github.com/nspcc-dev/neofs-contract/issues/154. + // See https://github.com/nspcc-dev/frostfs-contract/issues/154. const methodAddPeerNotary = "addPeerIR" if nr := ev.NotaryRequest(); nr != nil { diff --git a/pkg/innerring/processors/netmap/processor.go b/pkg/innerring/processors/netmap/processor.go index e2d37ff47..220c41cfa 100644 --- a/pkg/innerring/processors/netmap/processor.go +++ b/pkg/innerring/processors/netmap/processor.go @@ -4,16 +4,16 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/netmap/nodevalidation/state" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + nmClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + netmapEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/netmap" + subnetEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/state" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - nmClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" - subnetEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/netmap" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/reputation/handlers.go b/pkg/innerring/processors/reputation/handlers.go index 0ce10842b..50ddf1035 100644 --- a/pkg/innerring/processors/reputation/handlers.go +++ b/pkg/innerring/processors/reputation/handlers.go @@ -3,8 +3,8 @@ package reputation import ( "encoding/hex" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - reputationEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" "go.uber.org/zap" ) @@ -12,7 +12,7 @@ func (rp *Processor) handlePutReputation(ev event.Event) { put := ev.(reputationEvent.Put) peerID := put.PeerID() - // FIXME: #1147 do not use `ToV2` method outside neofs-api-go library + // FIXME: #1147 do not use `ToV2` method outside frostfs-api-go library rp.log.Info("notification", zap.String("type", "reputation put"), zap.String("peer_id", hex.EncodeToString(peerID.PublicKey()))) diff --git a/pkg/innerring/processors/reputation/process_put.go b/pkg/innerring/processors/reputation/process_put.go index 071e3f913..1183a2639 100644 --- a/pkg/innerring/processors/reputation/process_put.go +++ b/pkg/innerring/processors/reputation/process_put.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation" - reputationEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/reputation" - apireputation "github.com/nspcc-dev/neofs-sdk-go/reputation" + repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" + apireputation "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "go.uber.org/zap" ) @@ -63,7 +63,7 @@ func (rp *Processor) checkManagers(e uint64, mng apireputation.PeerID, peer apir } for _, m := range mm { - // FIXME: #1147 do not use `ToV2` method outside neofs-api-go library + // FIXME: #1147 do not use `ToV2` method outside frostfs-api-go library if bytes.Equal(mng.PublicKey(), m.PublicKey()) { return nil } @@ -90,7 +90,7 @@ func (rp *Processor) approvePutReputation(e *reputationEvent.Put) { err = rp.reputationWrp.Put(args) } if err != nil { - // FIXME: #1147 do not use `ToV2` method outside neofs-api-go library + // FIXME: #1147 do not use `ToV2` method outside frostfs-api-go library rp.log.Warn("can't send approval tx for reputation value", zap.String("peer_id", hex.EncodeToString(id.PublicKey())), zap.String("error", err.Error())) diff --git a/pkg/innerring/processors/reputation/processor.go b/pkg/innerring/processors/reputation/processor.go index 54ce2a2bd..c5f64df8d 100644 --- a/pkg/innerring/processors/reputation/processor.go +++ b/pkg/innerring/processors/reputation/processor.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" + repClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + reputationEvent "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/common" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" - repClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/reputation" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - reputationEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/reputation" - "github.com/nspcc-dev/neofs-node/pkg/services/reputation/common" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/audit/calculate.go b/pkg/innerring/processors/settlement/audit/calculate.go index cc3d12535..585c4b2a9 100644 --- a/pkg/innerring/processors/settlement/audit/calculate.go +++ b/pkg/innerring/processors/settlement/audit/calculate.go @@ -7,13 +7,13 @@ import ( "encoding/hex" "math/big" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/audit" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/audit" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/audit/calculator.go b/pkg/innerring/processors/settlement/audit/calculator.go index 0b005e3d8..239860b78 100644 --- a/pkg/innerring/processors/settlement/audit/calculator.go +++ b/pkg/innerring/processors/settlement/audit/calculator.go @@ -1,7 +1,7 @@ package audit import ( - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/audit/prm.go b/pkg/innerring/processors/settlement/audit/prm.go index 1da0e7339..f68e93dee 100644 --- a/pkg/innerring/processors/settlement/audit/prm.go +++ b/pkg/innerring/processors/settlement/audit/prm.go @@ -1,9 +1,9 @@ package audit import ( - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common" - "github.com/nspcc-dev/neofs-sdk-go/audit" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + "github.com/TrueCloudLab/frostfs-sdk-go/audit" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // CalculatorPrm groups the parameters of Calculator's constructor. diff --git a/pkg/innerring/processors/settlement/basic/collect.go b/pkg/innerring/processors/settlement/basic/collect.go index b825f9a88..6b00b98b7 100644 --- a/pkg/innerring/processors/settlement/basic/collect.go +++ b/pkg/innerring/processors/settlement/basic/collect.go @@ -3,8 +3,8 @@ package basic import ( "math/big" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common" - cntClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + cntClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/basic/context.go b/pkg/innerring/processors/settlement/basic/context.go index ad4bf036c..0047821ee 100644 --- a/pkg/innerring/processors/settlement/basic/context.go +++ b/pkg/innerring/processors/settlement/basic/context.go @@ -4,11 +4,11 @@ import ( "math/big" "sync" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/user" ) type ( diff --git a/pkg/innerring/processors/settlement/basic/distribute.go b/pkg/innerring/processors/settlement/basic/distribute.go index f89a2af87..258cb607a 100644 --- a/pkg/innerring/processors/settlement/basic/distribute.go +++ b/pkg/innerring/processors/settlement/basic/distribute.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "math/big" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/calls.go b/pkg/innerring/processors/settlement/calls.go index 6ec42abbf..91262ce35 100644 --- a/pkg/innerring/processors/settlement/calls.go +++ b/pkg/innerring/processors/settlement/calls.go @@ -1,8 +1,8 @@ package settlement import ( - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/common/types.go b/pkg/innerring/processors/settlement/common/types.go index 9cd8a0214..3e0bac172 100644 --- a/pkg/innerring/processors/settlement/common/types.go +++ b/pkg/innerring/processors/settlement/common/types.go @@ -3,8 +3,8 @@ package common import ( "math/big" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) // NodeInfo groups the data about the storage node diff --git a/pkg/innerring/processors/settlement/common/util.go b/pkg/innerring/processors/settlement/common/util.go index 6b5db2337..6374f2d8c 100644 --- a/pkg/innerring/processors/settlement/common/util.go +++ b/pkg/innerring/processors/settlement/common/util.go @@ -3,7 +3,7 @@ package common import ( "math/big" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) type TransferTable struct { diff --git a/pkg/innerring/processors/settlement/deps.go b/pkg/innerring/processors/settlement/deps.go index 76ed2574a..d20c91c6a 100644 --- a/pkg/innerring/processors/settlement/deps.go +++ b/pkg/innerring/processors/settlement/deps.go @@ -1,7 +1,7 @@ package settlement import ( - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/basic" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" ) // AuditProcessor is an interface of data audit fee processor. diff --git a/pkg/innerring/processors/settlement/events.go b/pkg/innerring/processors/settlement/events.go index c3ab18364..6e4eaae26 100644 --- a/pkg/innerring/processors/settlement/events.go +++ b/pkg/innerring/processors/settlement/events.go @@ -1,7 +1,7 @@ package settlement import ( - "github.com/nspcc-dev/neofs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" ) // AuditEvent is an event of the start of diff --git a/pkg/innerring/processors/settlement/handlers.go b/pkg/innerring/processors/settlement/handlers.go index f63b80a1d..4eed411e9 100644 --- a/pkg/innerring/processors/settlement/handlers.go +++ b/pkg/innerring/processors/settlement/handlers.go @@ -1,6 +1,6 @@ package settlement -import "github.com/nspcc-dev/neofs-node/pkg/util/logger" +import "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" type auditEventHandler struct { log *logger.Logger diff --git a/pkg/innerring/processors/settlement/opts.go b/pkg/innerring/processors/settlement/opts.go index 73b24b6f0..de59510dc 100644 --- a/pkg/innerring/processors/settlement/opts.go +++ b/pkg/innerring/processors/settlement/opts.go @@ -1,7 +1,7 @@ package settlement import ( - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/settlement/processor.go b/pkg/innerring/processors/settlement/processor.go index f02f8bfb5..c5722f6ea 100644 --- a/pkg/innerring/processors/settlement/processor.go +++ b/pkg/innerring/processors/settlement/processor.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/basic" - nodeutil "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" + nodeutil "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/innerring/processors/subnet/common.go b/pkg/innerring/processors/subnet/common.go index 08f3df0f1..b40f2bdc2 100644 --- a/pkg/innerring/processors/subnet/common.go +++ b/pkg/innerring/processors/subnet/common.go @@ -3,7 +3,7 @@ package subnetevents import ( "fmt" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" ) // common interface of subnet notifications with subnet ID. diff --git a/pkg/innerring/processors/subnet/common_test.go b/pkg/innerring/processors/subnet/common_test.go index 3834114f8..3986352a4 100644 --- a/pkg/innerring/processors/subnet/common_test.go +++ b/pkg/innerring/processors/subnet/common_test.go @@ -1,6 +1,6 @@ package subnetevents -import subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" +import subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" type idEvent struct { id subnetid.ID diff --git a/pkg/innerring/processors/subnet/put.go b/pkg/innerring/processors/subnet/put.go index fb0565b6e..a9f2705d5 100644 --- a/pkg/innerring/processors/subnet/put.go +++ b/pkg/innerring/processors/subnet/put.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-sdk-go/subnet" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-sdk-go/subnet" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) // Put represents a notification about NeoFS subnet creation. diff --git a/pkg/innerring/processors/subnet/put_test.go b/pkg/innerring/processors/subnet/put_test.go index d91521e2d..4380a6d4a 100644 --- a/pkg/innerring/processors/subnet/put_test.go +++ b/pkg/innerring/processors/subnet/put_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "github.com/nspcc-dev/neofs-sdk-go/user" - usertest "github.com/nspcc-dev/neofs-sdk-go/user/test" + "github.com/TrueCloudLab/frostfs-sdk-go/user" + usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" "github.com/stretchr/testify/require" - "github.com/nspcc-dev/neofs-sdk-go/subnet" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" + "github.com/TrueCloudLab/frostfs-sdk-go/subnet" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" ) type put struct { diff --git a/pkg/innerring/rpc.go b/pkg/innerring/rpc.go index 77fb08554..949c08b86 100644 --- a/pkg/innerring/rpc.go +++ b/pkg/innerring/rpc.go @@ -6,19 +6,19 @@ import ( "fmt" "time" - clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client" - netmapcore "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - storagegroup2 "github.com/nspcc-dev/neofs-node/pkg/core/storagegroup" - neofsapiclient "github.com/nspcc-dev/neofs-node/pkg/innerring/internal/client" - "github.com/nspcc-dev/neofs-node/pkg/network/cache" - "github.com/nspcc-dev/neofs-node/pkg/services/audit/auditor" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/storagegroup" + clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + storagegroup2 "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + frostfsapiclient "github.com/TrueCloudLab/frostfs-node/pkg/innerring/internal/client" + "github.com/TrueCloudLab/frostfs-node/pkg/network/cache" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" "go.uber.org/zap" ) @@ -83,7 +83,7 @@ func (c *ClientCache) getSG(ctx context.Context, addr oid.Address, nm *netmap.Ne var info clientcore.NodeInfo - var getObjPrm neofsapiclient.GetObjectPrm + var getObjPrm frostfsapiclient.GetObjectPrm getObjPrm.SetAddress(addr) for _, node := range placement.FlattenNodes(nodes) { @@ -154,9 +154,9 @@ func (c *ClientCache) GetHeader(prm auditor.GetHeaderPrm) (*object.Object, error var obj *object.Object if prm.NodeIsRelay { - obj, err = neofsapiclient.GetObjectHeaderFromContainer(cctx, cli, objAddress) + obj, err = frostfsapiclient.GetObjectHeaderFromContainer(cctx, cli, objAddress) } else { - obj, err = neofsapiclient.GetRawObjectHeaderLocally(cctx, cli, objAddress) + obj, err = frostfsapiclient.GetRawObjectHeaderLocally(cctx, cli, objAddress) } cancel() @@ -189,7 +189,7 @@ func (c *ClientCache) GetRangeHash(prm auditor.GetRangeHashPrm) ([]byte, error) cctx, cancel := context.WithTimeout(prm.Context, c.rangeTimeout) - h, err := neofsapiclient.HashObjectRange(cctx, cli, objAddress, prm.Range) + h, err := frostfsapiclient.HashObjectRange(cctx, cli, objAddress, prm.Range) cancel() @@ -200,9 +200,9 @@ func (c *ClientCache) GetRangeHash(prm auditor.GetRangeHashPrm) ([]byte, error) return h, nil } -func (c *ClientCache) getWrappedClient(info clientcore.NodeInfo) (neofsapiclient.Client, error) { +func (c *ClientCache) getWrappedClient(info clientcore.NodeInfo) (frostfsapiclient.Client, error) { // can be also cached - var cInternal neofsapiclient.Client + var cInternal frostfsapiclient.Client cli, err := c.Get(info) if err != nil { @@ -221,7 +221,7 @@ func (c ClientCache) ListSG(dst *storagegroup2.SearchSGDst, prm storagegroup2.Se return fmt.Errorf("could not get API client from cache") } - var cliPrm neofsapiclient.SearchSGPrm + var cliPrm frostfsapiclient.SearchSGPrm cliPrm.SetContext(prm.Context) cliPrm.SetContainerID(prm.Container) diff --git a/pkg/innerring/settlement.go b/pkg/innerring/settlement.go index 1f8da39cf..839fa720f 100644 --- a/pkg/innerring/settlement.go +++ b/pkg/innerring/settlement.go @@ -9,24 +9,24 @@ import ( "fmt" "math/big" + "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/basic" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/settlement/common" + auditClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/audit" + balanceClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + containerClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/container" + netmapClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" + containerAPI "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + netmapAPI "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/audit" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/basic" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common" - auditClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/audit" - balanceClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/balance" - containerClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/container" - netmapClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - auditAPI "github.com/nspcc-dev/neofs-sdk-go/audit" - containerAPI "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - netmapAPI "github.com/nspcc-dev/neofs-sdk-go/netmap" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/storagegroup" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) @@ -145,7 +145,7 @@ func (s settlementDeps) buildContainer(e uint64, cid cid.ID) ([][]netmapAPI.Node cn, err := nm.ContainerNodes( cnr.Value.PlacementPolicy(), - binCnr, // may be replace pivot calculation to neofs-api-go + binCnr, // may be replace pivot calculation to frostfs-api-go ) if err != nil { return nil, nil, fmt.Errorf("could not calculate container nodes: %w", err) diff --git a/pkg/innerring/state.go b/pkg/innerring/state.go index da65afb80..ccc8cae03 100644 --- a/pkg/innerring/state.go +++ b/pkg/innerring/state.go @@ -4,12 +4,12 @@ import ( "fmt" "sort" + "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/governance" + auditClient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" + control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" + "github.com/TrueCloudLab/frostfs-node/pkg/util/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/governance" - auditClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/audit" - "github.com/nspcc-dev/neofs-node/pkg/services/audit" - control "github.com/nspcc-dev/neofs-node/pkg/services/control/ir" - "github.com/nspcc-dev/neofs-node/pkg/util/state" "github.com/spf13/viper" "go.uber.org/zap" ) diff --git a/pkg/innerring/subnet.go b/pkg/innerring/subnet.go index ec8ea2822..3ff2e86f5 100644 --- a/pkg/innerring/subnet.go +++ b/pkg/innerring/subnet.go @@ -6,19 +6,19 @@ import ( "errors" "fmt" + irsubnet "github.com/TrueCloudLab/frostfs-node/pkg/innerring/processors/subnet" + netmapclient "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" + morphsubnet "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/subnet" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/subnet" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" neogoutil "github.com/nspcc-dev/neo-go/pkg/util" - irsubnet "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/subnet" - netmapclient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" - morphsubnet "github.com/nspcc-dev/neofs-node/pkg/morph/client/subnet" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - subnetevents "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" - "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/subnet" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" - "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobovnicza/blobovnicza.go b/pkg/local_object_storage/blobovnicza/blobovnicza.go index 8bd1d68ff..7f46a010d 100644 --- a/pkg/local_object_storage/blobovnicza/blobovnicza.go +++ b/pkg/local_object_storage/blobovnicza/blobovnicza.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.etcd.io/bbolt" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/pkg/local_object_storage/blobovnicza/blobovnicza_test.go b/pkg/local_object_storage/blobovnicza/blobovnicza_test.go index dd46a5299..43b359d69 100644 --- a/pkg/local_object_storage/blobovnicza/blobovnicza_test.go +++ b/pkg/local_object_storage/blobovnicza/blobovnicza_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "github.com/nspcc-dev/neofs-node/pkg/util/logger/test" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger/test" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobovnicza/control.go b/pkg/local_object_storage/blobovnicza/control.go index a29b03151..a64dbc58c 100644 --- a/pkg/local_object_storage/blobovnicza/control.go +++ b/pkg/local_object_storage/blobovnicza/control.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobovnicza/delete.go b/pkg/local_object_storage/blobovnicza/delete.go index e37718aa7..371f54600 100644 --- a/pkg/local_object_storage/blobovnicza/delete.go +++ b/pkg/local_object_storage/blobovnicza/delete.go @@ -1,8 +1,8 @@ package blobovnicza import ( - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobovnicza/errors.go b/pkg/local_object_storage/blobovnicza/errors.go index 58a01e551..dba86298b 100644 --- a/pkg/local_object_storage/blobovnicza/errors.go +++ b/pkg/local_object_storage/blobovnicza/errors.go @@ -3,7 +3,7 @@ package blobovnicza import ( "errors" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" ) // IsErrNotFound checks if the error returned by Blobovnicza Get/Delete method diff --git a/pkg/local_object_storage/blobovnicza/exists.go b/pkg/local_object_storage/blobovnicza/exists.go index 47d57d6fb..733a0ae50 100644 --- a/pkg/local_object_storage/blobovnicza/exists.go +++ b/pkg/local_object_storage/blobovnicza/exists.go @@ -1,7 +1,7 @@ package blobovnicza import ( - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobovnicza/get.go b/pkg/local_object_storage/blobovnicza/get.go index f6dc50fb3..665a2d00e 100644 --- a/pkg/local_object_storage/blobovnicza/get.go +++ b/pkg/local_object_storage/blobovnicza/get.go @@ -3,9 +3,9 @@ package blobovnicza import ( "errors" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/util/slice" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobovnicza/get_test.go b/pkg/local_object_storage/blobovnicza/get_test.go index 147f00662..7f6b1806c 100644 --- a/pkg/local_object_storage/blobovnicza/get_test.go +++ b/pkg/local_object_storage/blobovnicza/get_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobovnicza/iterate.go b/pkg/local_object_storage/blobovnicza/iterate.go index 70f44f036..5187d2e07 100644 --- a/pkg/local_object_storage/blobovnicza/iterate.go +++ b/pkg/local_object_storage/blobovnicza/iterate.go @@ -3,7 +3,7 @@ package blobovnicza import ( "fmt" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobovnicza/iterate_test.go b/pkg/local_object_storage/blobovnicza/iterate_test.go index d3dd37c14..8d51a3a4e 100644 --- a/pkg/local_object_storage/blobovnicza/iterate_test.go +++ b/pkg/local_object_storage/blobovnicza/iterate_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/nspcc-dev/neo-go/pkg/util/slice" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobovnicza/put.go b/pkg/local_object_storage/blobovnicza/put.go index a2b4d61fd..00da5a84a 100644 --- a/pkg/local_object_storage/blobovnicza/put.go +++ b/pkg/local_object_storage/blobovnicza/put.go @@ -3,8 +3,8 @@ package blobovnicza import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go b/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go index d106932f7..036a707b7 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/blobovnicza.go @@ -7,13 +7,13 @@ import ( "strconv" "sync" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/hrw" "github.com/hashicorp/golang-lru/simplelru" - "github.com/nspcc-dev/hrw" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/compression" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/control.go b/pkg/local_object_storage/blobstor/blobovniczatree/control.go index 33b08fecb..1cae8643a 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/control.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/control.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/delete.go b/pkg/local_object_storage/blobstor/blobovniczatree/delete.go index b7c291c4f..25e0dcb47 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/delete.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/delete.go @@ -3,10 +3,10 @@ package blobovniczatree import ( "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/errors.go b/pkg/local_object_storage/blobstor/blobovniczatree/errors.go index a78ff7d87..ef6612dac 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/errors.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/errors.go @@ -3,8 +3,8 @@ package blobovniczatree import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" ) func isErrOutOfRange(err error) bool { diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/exists.go b/pkg/local_object_storage/blobstor/blobovniczatree/exists.go index ec89d5680..df2dbc434 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/exists.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/exists.go @@ -3,8 +3,8 @@ package blobovniczatree import ( "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go b/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go index bba4e092b..024f68a5d 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/exists_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/util/slice" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/internal/blobstortest" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go b/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go index 29a397745..88cbbfabf 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/generic_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/internal/blobstortest" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/get.go b/pkg/local_object_storage/blobstor/blobovniczatree/get.go index 5522d18ed..b98c14450 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/get.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/get.go @@ -4,11 +4,11 @@ import ( "fmt" "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go b/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go index d121e22b4..1ead1d1e4 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/get_range.go @@ -4,11 +4,11 @@ import ( "fmt" "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go b/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go index 45a5088fd..a36d34e4b 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/iterate.go @@ -4,10 +4,10 @@ import ( "fmt" "path/filepath" - "github.com/nspcc-dev/hrw" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/hrw" ) // Iterate iterates over all objects in b. diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/option.go b/pkg/local_object_storage/blobstor/blobovniczatree/option.go index 840d2df45..a231e2119 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/option.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/option.go @@ -3,9 +3,9 @@ package blobovniczatree import ( "io/fs" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/compression" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobovniczatree/put.go b/pkg/local_object_storage/blobstor/blobovniczatree/put.go index 3589456ab..01a026d4e 100644 --- a/pkg/local_object_storage/blobstor/blobovniczatree/put.go +++ b/pkg/local_object_storage/blobstor/blobovniczatree/put.go @@ -4,8 +4,8 @@ import ( "errors" "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobstor.go b/pkg/local_object_storage/blobstor/blobstor.go index 717ba893b..99e0f350e 100644 --- a/pkg/local_object_storage/blobstor/blobstor.go +++ b/pkg/local_object_storage/blobstor/blobstor.go @@ -3,11 +3,11 @@ package blobstor import ( "sync" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/compression" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/blobstor_test.go b/pkg/local_object_storage/blobstor/blobstor_test.go index 436fdfe5a..ed9316e8a 100644 --- a/pkg/local_object_storage/blobstor/blobstor_test.go +++ b/pkg/local_object_storage/blobstor/blobstor_test.go @@ -5,11 +5,11 @@ import ( "path/filepath" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) @@ -32,7 +32,7 @@ func defaultStorages(p string, smallSizeLimit uint64) []SubStorage { } func TestCompression(t *testing.T) { - dir, err := os.MkdirTemp("", "neofs*") + dir, err := os.MkdirTemp("", "frostfs*") require.NoError(t, err) t.Cleanup(func() { _ = os.RemoveAll(dir) }) @@ -102,7 +102,7 @@ func TestCompression(t *testing.T) { func TestBlobstor_needsCompression(t *testing.T) { const smallSizeLimit = 512 newBlobStor := func(t *testing.T, compress bool, ct ...string) *BlobStor { - dir, err := os.MkdirTemp("", "neofs*") + dir, err := os.MkdirTemp("", "frostfs*") require.NoError(t, err) t.Cleanup(func() { _ = os.RemoveAll(dir) }) diff --git a/pkg/local_object_storage/blobstor/common/delete.go b/pkg/local_object_storage/blobstor/common/delete.go index 03cae4fd2..9afc3348c 100644 --- a/pkg/local_object_storage/blobstor/common/delete.go +++ b/pkg/local_object_storage/blobstor/common/delete.go @@ -1,7 +1,7 @@ package common import ( - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // DeletePrm groups the parameters of Delete operation. diff --git a/pkg/local_object_storage/blobstor/common/errors.go b/pkg/local_object_storage/blobstor/common/errors.go index 149393488..a709a6d36 100644 --- a/pkg/local_object_storage/blobstor/common/errors.go +++ b/pkg/local_object_storage/blobstor/common/errors.go @@ -1,7 +1,7 @@ package common import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" ) // ErrReadOnly MUST be returned for modifying operations when the storage was opened diff --git a/pkg/local_object_storage/blobstor/common/exists.go b/pkg/local_object_storage/blobstor/common/exists.go index 21187f690..48f7173f0 100644 --- a/pkg/local_object_storage/blobstor/common/exists.go +++ b/pkg/local_object_storage/blobstor/common/exists.go @@ -1,6 +1,6 @@ package common -import oid "github.com/nspcc-dev/neofs-sdk-go/object/id" +import oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" // ExistsPrm groups the parameters of Exists operation. type ExistsPrm struct { diff --git a/pkg/local_object_storage/blobstor/common/get.go b/pkg/local_object_storage/blobstor/common/get.go index c8a96c5ad..09eb0064e 100644 --- a/pkg/local_object_storage/blobstor/common/get.go +++ b/pkg/local_object_storage/blobstor/common/get.go @@ -1,8 +1,8 @@ package common import ( - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) type GetPrm struct { diff --git a/pkg/local_object_storage/blobstor/common/get_range.go b/pkg/local_object_storage/blobstor/common/get_range.go index d52fa408b..543246bd4 100644 --- a/pkg/local_object_storage/blobstor/common/get_range.go +++ b/pkg/local_object_storage/blobstor/common/get_range.go @@ -1,8 +1,8 @@ package common import ( - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) type GetRangePrm struct { diff --git a/pkg/local_object_storage/blobstor/common/iterate.go b/pkg/local_object_storage/blobstor/common/iterate.go index 7fd24bbdb..3cec9f684 100644 --- a/pkg/local_object_storage/blobstor/common/iterate.go +++ b/pkg/local_object_storage/blobstor/common/iterate.go @@ -1,6 +1,6 @@ package common -import oid "github.com/nspcc-dev/neofs-sdk-go/object/id" +import oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" // IterationElement represents a unit of elements through which Iterate operation passes. type IterationElement struct { diff --git a/pkg/local_object_storage/blobstor/common/put.go b/pkg/local_object_storage/blobstor/common/put.go index bcbbdce2e..34947ac63 100644 --- a/pkg/local_object_storage/blobstor/common/put.go +++ b/pkg/local_object_storage/blobstor/common/put.go @@ -1,8 +1,8 @@ package common import ( - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // PutPrm groups the parameters of Put operation. diff --git a/pkg/local_object_storage/blobstor/common/storage.go b/pkg/local_object_storage/blobstor/common/storage.go index b66b41200..aac88da19 100644 --- a/pkg/local_object_storage/blobstor/common/storage.go +++ b/pkg/local_object_storage/blobstor/common/storage.go @@ -1,6 +1,6 @@ package common -import "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/compression" +import "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" // Storage represents key-value object storage. // It is used as a building block for a blobstor of a shard. diff --git a/pkg/local_object_storage/blobstor/compression/compress.go b/pkg/local_object_storage/blobstor/compression/compress.go index f033f45bd..44b83d416 100644 --- a/pkg/local_object_storage/blobstor/compression/compress.go +++ b/pkg/local_object_storage/blobstor/compression/compress.go @@ -4,8 +4,8 @@ import ( "bytes" "strings" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/klauspost/compress/zstd" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" ) // Config represents common compression-related configuration. diff --git a/pkg/local_object_storage/blobstor/delete.go b/pkg/local_object_storage/blobstor/delete.go index 5b8ecaec8..48d11788a 100644 --- a/pkg/local_object_storage/blobstor/delete.go +++ b/pkg/local_object_storage/blobstor/delete.go @@ -3,8 +3,8 @@ package blobstor import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" ) func (b *BlobStor) Delete(prm common.DeletePrm) (common.DeleteRes, error) { diff --git a/pkg/local_object_storage/blobstor/exists.go b/pkg/local_object_storage/blobstor/exists.go index 5c43acfae..09ce0ebc8 100644 --- a/pkg/local_object_storage/blobstor/exists.go +++ b/pkg/local_object_storage/blobstor/exists.go @@ -1,7 +1,7 @@ package blobstor import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/exists_test.go b/pkg/local_object_storage/blobstor/exists_test.go index 1db0c2cd9..492ab4188 100644 --- a/pkg/local_object_storage/blobstor/exists_test.go +++ b/pkg/local_object_storage/blobstor/exists_test.go @@ -5,16 +5,16 @@ import ( "path/filepath" "testing" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) func TestExists(t *testing.T) { - dir, err := os.MkdirTemp("", "neofs*") + dir, err := os.MkdirTemp("", "frostfs*") require.NoError(t, err) t.Cleanup(func() { _ = os.RemoveAll(dir) }) diff --git a/pkg/local_object_storage/blobstor/fstree/control.go b/pkg/local_object_storage/blobstor/fstree/control.go index 2c90d9b68..3fd14f606 100644 --- a/pkg/local_object_storage/blobstor/fstree/control.go +++ b/pkg/local_object_storage/blobstor/fstree/control.go @@ -1,7 +1,7 @@ package fstree import ( - "github.com/nspcc-dev/neofs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util" ) // Open implements common.Storage. diff --git a/pkg/local_object_storage/blobstor/fstree/fstree.go b/pkg/local_object_storage/blobstor/fstree/fstree.go index aef171d09..393e6b3fe 100644 --- a/pkg/local_object_storage/blobstor/fstree/fstree.go +++ b/pkg/local_object_storage/blobstor/fstree/fstree.go @@ -10,14 +10,14 @@ import ( "strings" "syscall" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/compression" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - "github.com/nspcc-dev/neofs-node/pkg/util" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/compression" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // FSTree represents an object storage as a filesystem tree. diff --git a/pkg/local_object_storage/blobstor/fstree/fstree_test.go b/pkg/local_object_storage/blobstor/fstree/fstree_test.go index 6a5b9f1a6..4bfcc0a95 100644 --- a/pkg/local_object_storage/blobstor/fstree/fstree_test.go +++ b/pkg/local_object_storage/blobstor/fstree/fstree_test.go @@ -3,7 +3,7 @@ package fstree import ( "testing" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/fstree/generic_test.go b/pkg/local_object_storage/blobstor/fstree/generic_test.go index eae12d289..0abc74c67 100644 --- a/pkg/local_object_storage/blobstor/fstree/generic_test.go +++ b/pkg/local_object_storage/blobstor/fstree/generic_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/internal/blobstortest" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/internal/blobstortest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/blobstor/generic_test.go b/pkg/local_object_storage/blobstor/generic_test.go index 79e411213..2f34969ea 100644 --- a/pkg/local_object_storage/blobstor/generic_test.go +++ b/pkg/local_object_storage/blobstor/generic_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/storagetest" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/blobstor/get.go b/pkg/local_object_storage/blobstor/get.go index 72b51a246..3f9fa9962 100644 --- a/pkg/local_object_storage/blobstor/get.go +++ b/pkg/local_object_storage/blobstor/get.go @@ -3,9 +3,9 @@ package blobstor import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" ) // Get reads the object from b. diff --git a/pkg/local_object_storage/blobstor/get_range.go b/pkg/local_object_storage/blobstor/get_range.go index ede6efec8..7666927f6 100644 --- a/pkg/local_object_storage/blobstor/get_range.go +++ b/pkg/local_object_storage/blobstor/get_range.go @@ -3,9 +3,9 @@ package blobstor import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" ) // GetRange reads object payload data from b. diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/common.go b/pkg/local_object_storage/blobstor/internal/blobstortest/common.go index 0d3a79e8e..798c9bf18 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/common.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/common.go @@ -4,12 +4,12 @@ import ( "math/rand" "testing" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/control.go b/pkg/local_object_storage/blobstor/internal/blobstortest/control.go index 2ab5d5bd7..c5ebb8595 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/control.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/control.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go b/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go index 026f9e80a..b13498a41 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/delete.go @@ -3,9 +3,9 @@ package blobstortest import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go b/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go index de20dc0da..744ccdbf8 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/exists.go @@ -3,8 +3,8 @@ package blobstortest import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/get.go b/pkg/local_object_storage/blobstor/internal/blobstortest/get.go index e8d8a4531..4b7110e6a 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/get.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/get.go @@ -3,9 +3,9 @@ package blobstortest import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go b/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go index 2254fe2bf..01ddc6ea5 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go @@ -4,9 +4,9 @@ import ( "math" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go b/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go index 215d18ead..a598098f7 100644 --- a/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go +++ b/pkg/local_object_storage/blobstor/internal/blobstortest/iterate.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/iterate.go b/pkg/local_object_storage/blobstor/iterate.go index b5d14e77c..4583b62b5 100644 --- a/pkg/local_object_storage/blobstor/iterate.go +++ b/pkg/local_object_storage/blobstor/iterate.go @@ -3,8 +3,8 @@ package blobstor import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/blobstor/iterate_test.go b/pkg/local_object_storage/blobstor/iterate_test.go index 78191e924..c2c1c05d5 100644 --- a/pkg/local_object_storage/blobstor/iterate_test.go +++ b/pkg/local_object_storage/blobstor/iterate_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/blobstor/logger.go b/pkg/local_object_storage/blobstor/logger.go index 5b6cb71a3..d21e0500d 100644 --- a/pkg/local_object_storage/blobstor/logger.go +++ b/pkg/local_object_storage/blobstor/logger.go @@ -1,9 +1,9 @@ package blobstor import ( - storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) const deleteOp = "DELETE" diff --git a/pkg/local_object_storage/blobstor/mode.go b/pkg/local_object_storage/blobstor/mode.go index 01f6590f9..42a4afc5a 100644 --- a/pkg/local_object_storage/blobstor/mode.go +++ b/pkg/local_object_storage/blobstor/mode.go @@ -3,7 +3,7 @@ package blobstor import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) // SetMode sets the blobstor mode of operation. diff --git a/pkg/local_object_storage/blobstor/put.go b/pkg/local_object_storage/blobstor/put.go index 0bf244d3b..9d94d7b1c 100644 --- a/pkg/local_object_storage/blobstor/put.go +++ b/pkg/local_object_storage/blobstor/put.go @@ -3,10 +3,10 @@ package blobstor import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" ) // ErrNoPlaceFound is returned when object can't be saved to any sub-storage component diff --git a/pkg/local_object_storage/engine/container.go b/pkg/local_object_storage/engine/container.go index 94eeebe18..ea508ab64 100644 --- a/pkg/local_object_storage/engine/container.go +++ b/pkg/local_object_storage/engine/container.go @@ -1,8 +1,8 @@ package engine import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/control.go b/pkg/local_object_storage/engine/control.go index 420691cd6..a56d7bbb2 100644 --- a/pkg/local_object_storage/engine/control.go +++ b/pkg/local_object_storage/engine/control.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/control_test.go b/pkg/local_object_storage/engine/control_test.go index 6929ab200..50ee1b552 100644 --- a/pkg/local_object_storage/engine/control_test.go +++ b/pkg/local_object_storage/engine/control_test.go @@ -8,12 +8,12 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/delete.go b/pkg/local_object_storage/engine/delete.go index 12810c5b9..9a355b56f 100644 --- a/pkg/local_object_storage/engine/delete.go +++ b/pkg/local_object_storage/engine/delete.go @@ -3,10 +3,10 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/delete_test.go b/pkg/local_object_storage/engine/delete_test.go index 72e6b3fa1..e62080b76 100644 --- a/pkg/local_object_storage/engine/delete_test.go +++ b/pkg/local_object_storage/engine/delete_test.go @@ -4,13 +4,13 @@ import ( "os" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/engine/dump.go b/pkg/local_object_storage/engine/dump.go index bdb123772..0b7c48641 100644 --- a/pkg/local_object_storage/engine/dump.go +++ b/pkg/local_object_storage/engine/dump.go @@ -1,6 +1,6 @@ package engine -import "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" +import "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" // DumpShard dumps objects from the shard with provided identifier. // diff --git a/pkg/local_object_storage/engine/engine.go b/pkg/local_object_storage/engine/engine.go index 275e51c02..d5265e0ed 100644 --- a/pkg/local_object_storage/engine/engine.go +++ b/pkg/local_object_storage/engine/engine.go @@ -4,11 +4,11 @@ import ( "errors" "sync" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/engine_test.go b/pkg/local_object_storage/engine/engine_test.go index 8911e3ebd..d554d3773 100644 --- a/pkg/local_object_storage/engine/engine_test.go +++ b/pkg/local_object_storage/engine/engine_test.go @@ -6,22 +6,22 @@ import ( "path/filepath" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/checksum" - checksumtest "github.com/nspcc-dev/neofs-sdk-go/checksum/test" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - usertest "github.com/nspcc-dev/neofs-sdk-go/user/test" - "github.com/nspcc-dev/neofs-sdk-go/version" - "github.com/nspcc-dev/tzhash/tz" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/checksum" + checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "github.com/TrueCloudLab/frostfs-sdk-go/version" + "github.com/TrueCloudLab/tzhash/tz" "github.com/panjf2000/ants/v2" "github.com/stretchr/testify/require" "go.uber.org/atomic" diff --git a/pkg/local_object_storage/engine/error_test.go b/pkg/local_object_storage/engine/error_test.go index cd0d10658..0444dde1d 100644 --- a/pkg/local_object_storage/engine/error_test.go +++ b/pkg/local_object_storage/engine/error_test.go @@ -7,16 +7,16 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/engine/evacuate.go b/pkg/local_object_storage/engine/evacuate.go index ad989fd3e..49df6fdfb 100644 --- a/pkg/local_object_storage/engine/evacuate.go +++ b/pkg/local_object_storage/engine/evacuate.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/hrw" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/util" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/hrw" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/evacuate_test.go b/pkg/local_object_storage/engine/evacuate_test.go index 9c0a84b8a..43fd63410 100644 --- a/pkg/local_object_storage/engine/evacuate_test.go +++ b/pkg/local_object_storage/engine/evacuate_test.go @@ -8,16 +8,16 @@ import ( "strconv" "testing" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/engine/exists.go b/pkg/local_object_storage/engine/exists.go index 16b5d8fb9..0248cf944 100644 --- a/pkg/local_object_storage/engine/exists.go +++ b/pkg/local_object_storage/engine/exists.go @@ -3,10 +3,10 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) func (e *StorageEngine) exists(addr oid.Address) (bool, error) { diff --git a/pkg/local_object_storage/engine/get.go b/pkg/local_object_storage/engine/get.go index 6eb50143c..bbe5688f8 100644 --- a/pkg/local_object_storage/engine/get.go +++ b/pkg/local_object_storage/engine/get.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/head.go b/pkg/local_object_storage/engine/head.go index 5f7851542..6f4b3b36b 100644 --- a/pkg/local_object_storage/engine/head.go +++ b/pkg/local_object_storage/engine/head.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // HeadPrm groups the parameters of Head operation. diff --git a/pkg/local_object_storage/engine/head_test.go b/pkg/local_object_storage/engine/head_test.go index 2ebf641d1..4d19b15ae 100644 --- a/pkg/local_object_storage/engine/head_test.go +++ b/pkg/local_object_storage/engine/head_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/info.go b/pkg/local_object_storage/engine/info.go index 396663b4d..da0d50b6a 100644 --- a/pkg/local_object_storage/engine/info.go +++ b/pkg/local_object_storage/engine/info.go @@ -1,7 +1,7 @@ package engine import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" ) // Info groups the information about StorageEngine. diff --git a/pkg/local_object_storage/engine/inhume.go b/pkg/local_object_storage/engine/inhume.go index a81a3243d..3e65343f6 100644 --- a/pkg/local_object_storage/engine/inhume.go +++ b/pkg/local_object_storage/engine/inhume.go @@ -4,11 +4,11 @@ import ( "context" "errors" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/inhume_test.go b/pkg/local_object_storage/engine/inhume_test.go index 10f92f7aa..e48a68736 100644 --- a/pkg/local_object_storage/engine/inhume_test.go +++ b/pkg/local_object_storage/engine/inhume_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/list.go b/pkg/local_object_storage/engine/list.go index 0845ded92..92cf2abf7 100644 --- a/pkg/local_object_storage/engine/list.go +++ b/pkg/local_object_storage/engine/list.go @@ -3,8 +3,8 @@ package engine import ( "sort" - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" ) // ErrEndOfListing is returned from an object listing with cursor diff --git a/pkg/local_object_storage/engine/list_test.go b/pkg/local_object_storage/engine/list_test.go index 2762aa37a..43e177e64 100644 --- a/pkg/local_object_storage/engine/list_test.go +++ b/pkg/local_object_storage/engine/list_test.go @@ -6,9 +6,9 @@ import ( "sort" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/lock.go b/pkg/local_object_storage/engine/lock.go index 9a6440719..9b5652e9b 100644 --- a/pkg/local_object_storage/engine/lock.go +++ b/pkg/local_object_storage/engine/lock.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) var errLockFailed = errors.New("lock operation failed") diff --git a/pkg/local_object_storage/engine/lock_test.go b/pkg/local_object_storage/engine/lock_test.go index d0fa53b54..03ba5a415 100644 --- a/pkg/local_object_storage/engine/lock_test.go +++ b/pkg/local_object_storage/engine/lock_test.go @@ -7,17 +7,17 @@ import ( "testing" "time" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/util" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - objecttest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/panjf2000/ants/v2" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/engine/put.go b/pkg/local_object_storage/engine/put.go index 8e3190f06..e15053311 100644 --- a/pkg/local_object_storage/engine/put.go +++ b/pkg/local_object_storage/engine/put.go @@ -3,13 +3,13 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/util" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/range.go b/pkg/local_object_storage/engine/range.go index 6ade45aa7..12984b042 100644 --- a/pkg/local_object_storage/engine/range.go +++ b/pkg/local_object_storage/engine/range.go @@ -3,12 +3,12 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/restore.go b/pkg/local_object_storage/engine/restore.go index 14738eafa..fd4ec456e 100644 --- a/pkg/local_object_storage/engine/restore.go +++ b/pkg/local_object_storage/engine/restore.go @@ -1,6 +1,6 @@ package engine -import "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" +import "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" // RestoreShard restores objects from dump to the shard with provided identifier. // diff --git a/pkg/local_object_storage/engine/select.go b/pkg/local_object_storage/engine/select.go index 0e5a8ca22..35a80cc13 100644 --- a/pkg/local_object_storage/engine/select.go +++ b/pkg/local_object_storage/engine/select.go @@ -1,10 +1,10 @@ package engine import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // SelectPrm groups the parameters of Select operation. diff --git a/pkg/local_object_storage/engine/shards.go b/pkg/local_object_storage/engine/shards.go index 8604b773e..e0510e359 100644 --- a/pkg/local_object_storage/engine/shards.go +++ b/pkg/local_object_storage/engine/shards.go @@ -3,12 +3,12 @@ package engine import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/hrw" "github.com/google/uuid" - "github.com/nspcc-dev/hrw" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "github.com/panjf2000/ants/v2" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/pkg/local_object_storage/engine/tree.go b/pkg/local_object_storage/engine/tree.go index c7f62a8cf..dc275b47f 100644 --- a/pkg/local_object_storage/engine/tree.go +++ b/pkg/local_object_storage/engine/tree.go @@ -3,9 +3,9 @@ package engine import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/engine/tree_test.go b/pkg/local_object_storage/engine/tree_test.go index 1c5b569ea..3c85002ba 100644 --- a/pkg/local_object_storage/engine/tree_test.go +++ b/pkg/local_object_storage/engine/tree_test.go @@ -4,9 +4,9 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" ) func BenchmarkTreeVsSearch(b *testing.B) { diff --git a/pkg/local_object_storage/engine/writecache.go b/pkg/local_object_storage/engine/writecache.go index 84359cdae..a9bb51fd1 100644 --- a/pkg/local_object_storage/engine/writecache.go +++ b/pkg/local_object_storage/engine/writecache.go @@ -1,7 +1,7 @@ package engine import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" ) // FlushWriteCachePrm groups the parameters of FlushWriteCache operation. diff --git a/pkg/local_object_storage/internal/log/log.go b/pkg/local_object_storage/internal/log/log.go index dcd336614..cd6df3f49 100644 --- a/pkg/local_object_storage/internal/log/log.go +++ b/pkg/local_object_storage/internal/log/log.go @@ -1,7 +1,7 @@ package storagelog import ( - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/internal/storagetest/storage.go b/pkg/local_object_storage/internal/storagetest/storage.go index 3f9a01242..658ff71da 100644 --- a/pkg/local_object_storage/internal/storagetest/storage.go +++ b/pkg/local_object_storage/internal/storagetest/storage.go @@ -3,7 +3,7 @@ package storagetest import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/containers.go b/pkg/local_object_storage/metabase/containers.go index c506ee641..6fab579b8 100644 --- a/pkg/local_object_storage/metabase/containers.go +++ b/pkg/local_object_storage/metabase/containers.go @@ -3,7 +3,7 @@ package meta import ( "encoding/binary" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/containers_test.go b/pkg/local_object_storage/metabase/containers_test.go index be8795bec..08fcef030 100644 --- a/pkg/local_object_storage/metabase/containers_test.go +++ b/pkg/local_object_storage/metabase/containers_test.go @@ -5,11 +5,11 @@ import ( "sort" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/control.go b/pkg/local_object_storage/metabase/control.go index 7292827e5..10f42d320 100644 --- a/pkg/local_object_storage/metabase/control.go +++ b/pkg/local_object_storage/metabase/control.go @@ -5,9 +5,9 @@ import ( "fmt" "path/filepath" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - "github.com/nspcc-dev/neofs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/util" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/metabase/control_test.go b/pkg/local_object_storage/metabase/control_test.go index df549031a..634be90f4 100644 --- a/pkg/local_object_storage/metabase/control_test.go +++ b/pkg/local_object_storage/metabase/control_test.go @@ -3,10 +3,10 @@ package meta_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/counter.go b/pkg/local_object_storage/metabase/counter.go index 8ce2152a2..d36e994f8 100644 --- a/pkg/local_object_storage/metabase/counter.go +++ b/pkg/local_object_storage/metabase/counter.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "fmt" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/counter_test.go b/pkg/local_object_storage/metabase/counter_test.go index 0604d7e0c..ca92460b7 100644 --- a/pkg/local_object_storage/metabase/counter_test.go +++ b/pkg/local_object_storage/metabase/counter_test.go @@ -3,11 +3,11 @@ package meta_test import ( "testing" - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/db.go b/pkg/local_object_storage/metabase/db.go index acf6031f0..d5036553b 100644 --- a/pkg/local_object_storage/metabase/db.go +++ b/pkg/local_object_storage/metabase/db.go @@ -11,11 +11,11 @@ import ( "sync" "time" + v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/mr-tron/base58" - v2object "github.com/nspcc-dev/neofs-api-go/v2/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/object" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/metabase/db_test.go b/pkg/local_object_storage/metabase/db_test.go index 0a43e66d4..fd97150ca 100644 --- a/pkg/local_object_storage/metabase/db_test.go +++ b/pkg/local_object_storage/metabase/db_test.go @@ -5,19 +5,19 @@ import ( "strconv" "testing" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-sdk-go/checksum" - checksumtest "github.com/nspcc-dev/neofs-sdk-go/checksum/test" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - usertest "github.com/nspcc-dev/neofs-sdk-go/user/test" - "github.com/nspcc-dev/neofs-sdk-go/version" - "github.com/nspcc-dev/tzhash/tz" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-sdk-go/checksum" + checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "github.com/TrueCloudLab/frostfs-sdk-go/version" + "github.com/TrueCloudLab/tzhash/tz" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/delete.go b/pkg/local_object_storage/metabase/delete.go index 772abb15a..2e6ac2a6e 100644 --- a/pkg/local_object_storage/metabase/delete.go +++ b/pkg/local_object_storage/metabase/delete.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/delete_test.go b/pkg/local_object_storage/metabase/delete_test.go index 9202ce63b..ab46c3ee4 100644 --- a/pkg/local_object_storage/metabase/delete_test.go +++ b/pkg/local_object_storage/metabase/delete_test.go @@ -4,13 +4,13 @@ import ( "errors" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/errors.go b/pkg/local_object_storage/metabase/errors.go index c02e0f498..9772971fa 100644 --- a/pkg/local_object_storage/metabase/errors.go +++ b/pkg/local_object_storage/metabase/errors.go @@ -3,8 +3,8 @@ package meta import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" ) // ErrObjectIsExpired is returned when the requested object's diff --git a/pkg/local_object_storage/metabase/exists.go b/pkg/local_object_storage/metabase/exists.go index a2c10fab5..3a021288d 100644 --- a/pkg/local_object_storage/metabase/exists.go +++ b/pkg/local_object_storage/metabase/exists.go @@ -4,12 +4,12 @@ import ( "fmt" "strconv" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/exists_test.go b/pkg/local_object_storage/metabase/exists_test.go index e5c3245d4..122ac53aa 100644 --- a/pkg/local_object_storage/metabase/exists_test.go +++ b/pkg/local_object_storage/metabase/exists_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/generic_test.go b/pkg/local_object_storage/metabase/generic_test.go index 376dd197a..54da0bf6e 100644 --- a/pkg/local_object_storage/metabase/generic_test.go +++ b/pkg/local_object_storage/metabase/generic_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/storagetest" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/metabase/get.go b/pkg/local_object_storage/metabase/get.go index d754a86ef..d3a3ad466 100644 --- a/pkg/local_object_storage/metabase/get.go +++ b/pkg/local_object_storage/metabase/get.go @@ -3,11 +3,11 @@ package meta import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/get_test.go b/pkg/local_object_storage/metabase/get_test.go index 8cead8e24..3f7c6fab5 100644 --- a/pkg/local_object_storage/metabase/get_test.go +++ b/pkg/local_object_storage/metabase/get_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/graveyard.go b/pkg/local_object_storage/metabase/graveyard.go index 00320c1f8..bcd67bc79 100644 --- a/pkg/local_object_storage/metabase/graveyard.go +++ b/pkg/local_object_storage/metabase/graveyard.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/graveyard_test.go b/pkg/local_object_storage/metabase/graveyard_test.go index c0f54c7e2..a7b6629a4 100644 --- a/pkg/local_object_storage/metabase/graveyard_test.go +++ b/pkg/local_object_storage/metabase/graveyard_test.go @@ -3,10 +3,10 @@ package meta_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/inhume.go b/pkg/local_object_storage/metabase/inhume.go index ab00ddd95..f0317a812 100644 --- a/pkg/local_object_storage/metabase/inhume.go +++ b/pkg/local_object_storage/metabase/inhume.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/inhume_test.go b/pkg/local_object_storage/metabase/inhume_test.go index 6e47b1070..2d69ffde3 100644 --- a/pkg/local_object_storage/metabase/inhume_test.go +++ b/pkg/local_object_storage/metabase/inhume_test.go @@ -3,11 +3,11 @@ package meta_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/iterators.go b/pkg/local_object_storage/metabase/iterators.go index 6deadde27..5a9e9dc25 100644 --- a/pkg/local_object_storage/metabase/iterators.go +++ b/pkg/local_object_storage/metabase/iterators.go @@ -5,11 +5,11 @@ import ( "fmt" "strconv" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/iterators_test.go b/pkg/local_object_storage/metabase/iterators_test.go index 2cd0398ce..a8b07323d 100644 --- a/pkg/local_object_storage/metabase/iterators_test.go +++ b/pkg/local_object_storage/metabase/iterators_test.go @@ -4,12 +4,12 @@ import ( "strconv" "testing" - objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" - object2 "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + objectV2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + object2 "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/list.go b/pkg/local_object_storage/metabase/list.go index 4dbcc0026..5220e48f9 100644 --- a/pkg/local_object_storage/metabase/list.go +++ b/pkg/local_object_storage/metabase/list.go @@ -1,11 +1,11 @@ package meta import ( - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/list_test.go b/pkg/local_object_storage/metabase/list_test.go index 3a325afa2..a873216f8 100644 --- a/pkg/local_object_storage/metabase/list_test.go +++ b/pkg/local_object_storage/metabase/list_test.go @@ -5,11 +5,11 @@ import ( "sort" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/lock.go b/pkg/local_object_storage/metabase/lock.go index 4c167f4a9..68ce0a89d 100644 --- a/pkg/local_object_storage/metabase/lock.go +++ b/pkg/local_object_storage/metabase/lock.go @@ -4,11 +4,11 @@ import ( "bytes" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/lock_test.go b/pkg/local_object_storage/metabase/lock_test.go index e06b7039e..9ae8ec0da 100644 --- a/pkg/local_object_storage/metabase/lock_test.go +++ b/pkg/local_object_storage/metabase/lock_test.go @@ -3,14 +3,14 @@ package meta_test import ( "testing" - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - objecttest "github.com/nspcc-dev/neofs-sdk-go/object/test" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/mode.go b/pkg/local_object_storage/metabase/mode.go index f5d4a8433..1bd59a04c 100644 --- a/pkg/local_object_storage/metabase/mode.go +++ b/pkg/local_object_storage/metabase/mode.go @@ -3,7 +3,7 @@ package meta import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" ) // SetMode sets the metabase mode of operation. diff --git a/pkg/local_object_storage/metabase/movable.go b/pkg/local_object_storage/metabase/movable.go index 42e9689cb..bdc1b5938 100644 --- a/pkg/local_object_storage/metabase/movable.go +++ b/pkg/local_object_storage/metabase/movable.go @@ -3,7 +3,7 @@ package meta import ( "fmt" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/movable_test.go b/pkg/local_object_storage/metabase/movable_test.go index 560b7d4cd..67b6cd565 100644 --- a/pkg/local_object_storage/metabase/movable_test.go +++ b/pkg/local_object_storage/metabase/movable_test.go @@ -3,9 +3,9 @@ package meta_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/put.go b/pkg/local_object_storage/metabase/put.go index c5ab5cfde..c534c9269 100644 --- a/pkg/local_object_storage/metabase/put.go +++ b/pkg/local_object_storage/metabase/put.go @@ -6,13 +6,13 @@ import ( "fmt" gio "io" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/io" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/put_test.go b/pkg/local_object_storage/metabase/put_test.go index f6b020d1b..1593c4c08 100644 --- a/pkg/local_object_storage/metabase/put_test.go +++ b/pkg/local_object_storage/metabase/put_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/util/rand" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - objecttest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/atomic" ) diff --git a/pkg/local_object_storage/metabase/select.go b/pkg/local_object_storage/metabase/select.go index 0b5492f90..5ca731492 100644 --- a/pkg/local_object_storage/metabase/select.go +++ b/pkg/local_object_storage/metabase/select.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - v2object "github.com/nspcc-dev/neofs-api-go/v2/object" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/metabase/select_test.go b/pkg/local_object_storage/metabase/select_test.go index 295f39c62..848b701f6 100644 --- a/pkg/local_object_storage/metabase/select_test.go +++ b/pkg/local_object_storage/metabase/select_test.go @@ -5,15 +5,15 @@ import ( "strconv" "testing" - v2object "github.com/nspcc-dev/neofs-api-go/v2/object" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - "github.com/nspcc-dev/neofs-sdk-go/version" + v2object "github.com/TrueCloudLab/frostfs-api-go/v2/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/storage_id.go b/pkg/local_object_storage/metabase/storage_id.go index 1c628a1eb..4369215ae 100644 --- a/pkg/local_object_storage/metabase/storage_id.go +++ b/pkg/local_object_storage/metabase/storage_id.go @@ -1,8 +1,8 @@ package meta import ( + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/util/slice" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/storage_id_test.go b/pkg/local_object_storage/metabase/storage_id_test.go index 155a8f418..e72611a61 100644 --- a/pkg/local_object_storage/metabase/storage_id_test.go +++ b/pkg/local_object_storage/metabase/storage_id_test.go @@ -3,9 +3,9 @@ package meta_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/metabase/util.go b/pkg/local_object_storage/metabase/util.go index 7102dd183..701d4f691 100644 --- a/pkg/local_object_storage/metabase/util.go +++ b/pkg/local_object_storage/metabase/util.go @@ -5,9 +5,9 @@ import ( "crypto/sha256" "fmt" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/metabase/version.go b/pkg/local_object_storage/metabase/version.go index 155beedc1..c8cfc08f2 100644 --- a/pkg/local_object_storage/metabase/version.go +++ b/pkg/local_object_storage/metabase/version.go @@ -4,7 +4,7 @@ import ( "encoding/binary" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/pilorama/boltdb.go b/pkg/local_object_storage/pilorama/boltdb.go index 32827bde4..35cd23e8f 100644 --- a/pkg/local_object_storage/pilorama/boltdb.go +++ b/pkg/local_object_storage/pilorama/boltdb.go @@ -11,10 +11,10 @@ import ( "sync" "time" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/io" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/pilorama/forest.go b/pkg/local_object_storage/pilorama/forest.go index 4efc20d8d..9dd40708a 100644 --- a/pkg/local_object_storage/pilorama/forest.go +++ b/pkg/local_object_storage/pilorama/forest.go @@ -4,8 +4,8 @@ import ( "sort" "strings" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" ) // memoryForest represents multiple replicating trees sharing a single storage. diff --git a/pkg/local_object_storage/pilorama/forest_test.go b/pkg/local_object_storage/pilorama/forest_test.go index 984284bf4..532060cf3 100644 --- a/pkg/local_object_storage/pilorama/forest_test.go +++ b/pkg/local_object_storage/pilorama/forest_test.go @@ -8,9 +8,9 @@ import ( "strconv" "testing" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/pilorama/generic_test.go b/pkg/local_object_storage/pilorama/generic_test.go index 2e2280641..204efbb9b 100644 --- a/pkg/local_object_storage/pilorama/generic_test.go +++ b/pkg/local_object_storage/pilorama/generic_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/storagetest" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" ) func TestGeneric(t *testing.T) { diff --git a/pkg/local_object_storage/pilorama/interface.go b/pkg/local_object_storage/pilorama/interface.go index 274e793b6..3e1c88f5b 100644 --- a/pkg/local_object_storage/pilorama/interface.go +++ b/pkg/local_object_storage/pilorama/interface.go @@ -1,9 +1,9 @@ package pilorama import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" ) // Forest represents CRDT tree. diff --git a/pkg/local_object_storage/pilorama/types.go b/pkg/local_object_storage/pilorama/types.go index 9d163256b..090fe3dc0 100644 --- a/pkg/local_object_storage/pilorama/types.go +++ b/pkg/local_object_storage/pilorama/types.go @@ -3,7 +3,7 @@ package pilorama import ( "math" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" ) // Timestamp is an alias for integer timestamp type. diff --git a/pkg/local_object_storage/shard/container.go b/pkg/local_object_storage/shard/container.go index a8684b58a..182525d56 100644 --- a/pkg/local_object_storage/shard/container.go +++ b/pkg/local_object_storage/shard/container.go @@ -3,7 +3,7 @@ package shard import ( "fmt" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" ) type ContainerSizePrm struct { diff --git a/pkg/local_object_storage/shard/control.go b/pkg/local_object_storage/shard/control.go index 22e64b91f..8cb465759 100644 --- a/pkg/local_object_storage/shard/control.go +++ b/pkg/local_object_storage/shard/control.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/control_test.go b/pkg/local_object_storage/shard/control_test.go index 0a5de6fd1..ad0de6d69 100644 --- a/pkg/local_object_storage/shard/control_test.go +++ b/pkg/local_object_storage/shard/control_test.go @@ -5,22 +5,22 @@ import ( "path/filepath" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - objecttest "github.com/nspcc-dev/neofs-sdk-go/object/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/test" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/shard/delete.go b/pkg/local_object_storage/shard/delete.go index e19f2c33d..22388a03a 100644 --- a/pkg/local_object_storage/shard/delete.go +++ b/pkg/local_object_storage/shard/delete.go @@ -3,10 +3,10 @@ package shard import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/delete_test.go b/pkg/local_object_storage/shard/delete_test.go index 2acd094b0..468e80ad9 100644 --- a/pkg/local_object_storage/shard/delete_test.go +++ b/pkg/local_object_storage/shard/delete_test.go @@ -3,10 +3,10 @@ package shard_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/dump.go b/pkg/local_object_storage/shard/dump.go index 53033232c..1607af460 100644 --- a/pkg/local_object_storage/shard/dump.go +++ b/pkg/local_object_storage/shard/dump.go @@ -5,9 +5,9 @@ import ( "io" "os" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" ) var dumpMagic = []byte("NEOF") diff --git a/pkg/local_object_storage/shard/dump_test.go b/pkg/local_object_storage/shard/dump_test.go index 2d7bda59a..2e5b233b4 100644 --- a/pkg/local_object_storage/shard/dump_test.go +++ b/pkg/local_object_storage/shard/dump_test.go @@ -9,20 +9,20 @@ import ( "testing" "time" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobovnicza" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/klauspost/compress/zstd" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobovnicza" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - objecttest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/shard/errors.go b/pkg/local_object_storage/shard/errors.go index 31cd5836a..d188bd308 100644 --- a/pkg/local_object_storage/shard/errors.go +++ b/pkg/local_object_storage/shard/errors.go @@ -3,8 +3,8 @@ package shard import ( "errors" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" ) // IsErrNotFound checks if error returned by Shard Get/Head/GetRange method diff --git a/pkg/local_object_storage/shard/exists.go b/pkg/local_object_storage/shard/exists.go index 768a8c84f..2e711253e 100644 --- a/pkg/local_object_storage/shard/exists.go +++ b/pkg/local_object_storage/shard/exists.go @@ -1,9 +1,9 @@ package shard import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // ExistsPrm groups the parameters of Exists operation. diff --git a/pkg/local_object_storage/shard/gc.go b/pkg/local_object_storage/shard/gc.go index c19e89cd4..dd76b7bb6 100644 --- a/pkg/local_object_storage/shard/gc.go +++ b/pkg/local_object_storage/shard/gc.go @@ -5,12 +5,12 @@ import ( "sync" "time" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/get.go b/pkg/local_object_storage/shard/get.go index bb8395b0f..9c65db4a7 100644 --- a/pkg/local_object_storage/shard/get.go +++ b/pkg/local_object_storage/shard/get.go @@ -3,14 +3,14 @@ package shard import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/get_test.go b/pkg/local_object_storage/shard/get_test.go index e0642b3c6..64aa29159 100644 --- a/pkg/local_object_storage/shard/get_test.go +++ b/pkg/local_object_storage/shard/get_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/head.go b/pkg/local_object_storage/shard/head.go index 73896383e..3136e99ce 100644 --- a/pkg/local_object_storage/shard/head.go +++ b/pkg/local_object_storage/shard/head.go @@ -3,9 +3,9 @@ package shard import ( "fmt" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // HeadPrm groups the parameters of Head operation. diff --git a/pkg/local_object_storage/shard/head_test.go b/pkg/local_object_storage/shard/head_test.go index 00de09cfd..079f96a71 100644 --- a/pkg/local_object_storage/shard/head_test.go +++ b/pkg/local_object_storage/shard/head_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/id.go b/pkg/local_object_storage/shard/id.go index c12d56e96..6e6242c4a 100644 --- a/pkg/local_object_storage/shard/id.go +++ b/pkg/local_object_storage/shard/id.go @@ -1,8 +1,8 @@ package shard import ( + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/mr-tron/base58" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/info.go b/pkg/local_object_storage/shard/info.go index d1e3e37d5..98e2b3ead 100644 --- a/pkg/local_object_storage/shard/info.go +++ b/pkg/local_object_storage/shard/info.go @@ -1,11 +1,11 @@ package shard import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" ) // Info groups the information about Shard. diff --git a/pkg/local_object_storage/shard/inhume.go b/pkg/local_object_storage/shard/inhume.go index 81ae4a7ae..41bfc972d 100644 --- a/pkg/local_object_storage/shard/inhume.go +++ b/pkg/local_object_storage/shard/inhume.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/inhume_test.go b/pkg/local_object_storage/shard/inhume_test.go index dc02a0374..119d5b2b5 100644 --- a/pkg/local_object_storage/shard/inhume_test.go +++ b/pkg/local_object_storage/shard/inhume_test.go @@ -3,10 +3,10 @@ package shard_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/list.go b/pkg/local_object_storage/shard/list.go index eedd4a019..6b379ee7e 100644 --- a/pkg/local_object_storage/shard/list.go +++ b/pkg/local_object_storage/shard/list.go @@ -3,10 +3,10 @@ package shard import ( "fmt" - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/list_test.go b/pkg/local_object_storage/shard/list_test.go index 07290106b..84d8e3da6 100644 --- a/pkg/local_object_storage/shard/list_test.go +++ b/pkg/local_object_storage/shard/list_test.go @@ -3,9 +3,9 @@ package shard_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/lock.go b/pkg/local_object_storage/shard/lock.go index 8961187cf..b41045279 100644 --- a/pkg/local_object_storage/shard/lock.go +++ b/pkg/local_object_storage/shard/lock.go @@ -3,9 +3,9 @@ package shard import ( "fmt" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // Lock marks objects as locked with another object. All objects from the diff --git a/pkg/local_object_storage/shard/lock_test.go b/pkg/local_object_storage/shard/lock_test.go index 7be647315..278b60a76 100644 --- a/pkg/local_object_storage/shard/lock_test.go +++ b/pkg/local_object_storage/shard/lock_test.go @@ -5,18 +5,18 @@ import ( "path/filepath" "testing" - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/metrics_test.go b/pkg/local_object_storage/shard/metrics_test.go index ea46896ed..72db4d99e 100644 --- a/pkg/local_object_storage/shard/metrics_test.go +++ b/pkg/local_object_storage/shard/metrics_test.go @@ -4,14 +4,14 @@ import ( "path/filepath" "testing" - objectcore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + objectcore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/mode.go b/pkg/local_object_storage/shard/mode.go index 7fc719166..426ed3b06 100644 --- a/pkg/local_object_storage/shard/mode.go +++ b/pkg/local_object_storage/shard/mode.go @@ -1,8 +1,8 @@ package shard import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" ) // ErrReadOnlyMode is returned when it is impossible to apply operation diff --git a/pkg/local_object_storage/shard/move.go b/pkg/local_object_storage/shard/move.go index 0068dc7dd..a9469cc34 100644 --- a/pkg/local_object_storage/shard/move.go +++ b/pkg/local_object_storage/shard/move.go @@ -1,8 +1,8 @@ package shard import ( - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/put.go b/pkg/local_object_storage/shard/put.go index 2148e973a..67c1edade 100644 --- a/pkg/local_object_storage/shard/put.go +++ b/pkg/local_object_storage/shard/put.go @@ -3,10 +3,10 @@ package shard import ( "fmt" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-sdk-go/object" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/range.go b/pkg/local_object_storage/shard/range.go index 9a8eb583a..8ad39291e 100644 --- a/pkg/local_object_storage/shard/range.go +++ b/pkg/local_object_storage/shard/range.go @@ -1,13 +1,13 @@ package shard import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // RngPrm groups the parameters of GetRange operation. diff --git a/pkg/local_object_storage/shard/range_test.go b/pkg/local_object_storage/shard/range_test.go index 1266ae205..21f233ab4 100644 --- a/pkg/local_object_storage/shard/range_test.go +++ b/pkg/local_object_storage/shard/range_test.go @@ -5,16 +5,16 @@ import ( "path/filepath" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/nspcc-dev/neo-go/pkg/util/slice" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/shard/reload_test.go b/pkg/local_object_storage/shard/reload_test.go index e6c52add6..f0816ce83 100644 --- a/pkg/local_object_storage/shard/reload_test.go +++ b/pkg/local_object_storage/shard/reload_test.go @@ -5,19 +5,19 @@ import ( "path/filepath" "testing" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - checksumtest "github.com/nspcc-dev/neofs-sdk-go/checksum/test" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - sessiontest "github.com/nspcc-dev/neofs-sdk-go/session/test" - usertest "github.com/nspcc-dev/neofs-sdk-go/user/test" - "github.com/nspcc-dev/neofs-sdk-go/version" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + sessiontest "github.com/TrueCloudLab/frostfs-sdk-go/session/test" + usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "github.com/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/shard/restore.go b/pkg/local_object_storage/shard/restore.go index 349d3ae29..0faeb5519 100644 --- a/pkg/local_object_storage/shard/restore.go +++ b/pkg/local_object_storage/shard/restore.go @@ -7,8 +7,8 @@ import ( "io" "os" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-sdk-go/object" ) // ErrInvalidMagic is returned when dump format is invalid. diff --git a/pkg/local_object_storage/shard/select.go b/pkg/local_object_storage/shard/select.go index 7d675c203..50156d1c3 100644 --- a/pkg/local_object_storage/shard/select.go +++ b/pkg/local_object_storage/shard/select.go @@ -3,10 +3,10 @@ package shard import ( "fmt" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // SelectPrm groups the parameters of Select operation. diff --git a/pkg/local_object_storage/shard/shard.go b/pkg/local_object_storage/shard/shard.go index ede56e912..c7a67a8fa 100644 --- a/pkg/local_object_storage/shard/shard.go +++ b/pkg/local_object_storage/shard/shard.go @@ -5,14 +5,14 @@ import ( "sync" "time" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/shard/shard_test.go b/pkg/local_object_storage/shard/shard_test.go index 35d8a72ba..2159bdb5c 100644 --- a/pkg/local_object_storage/shard/shard_test.go +++ b/pkg/local_object_storage/shard/shard_test.go @@ -6,22 +6,22 @@ import ( "path/filepath" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/blobovniczatree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/checksum" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - usertest "github.com/nspcc-dev/neofs-sdk-go/user/test" - "github.com/nspcc-dev/neofs-sdk-go/version" - "github.com/nspcc-dev/tzhash/tz" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/blobovniczatree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/checksum" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + "github.com/TrueCloudLab/frostfs-sdk-go/version" + "github.com/TrueCloudLab/tzhash/tz" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zaptest" diff --git a/pkg/local_object_storage/shard/shutdown_test.go b/pkg/local_object_storage/shard/shutdown_test.go index e4671d4e8..7618a0937 100644 --- a/pkg/local_object_storage/shard/shutdown_test.go +++ b/pkg/local_object_storage/shard/shutdown_test.go @@ -4,11 +4,11 @@ import ( "math/rand" "testing" - "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/writecache" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/writecache" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/shard/tree.go b/pkg/local_object_storage/shard/tree.go index dc4030254..56c3c0e06 100644 --- a/pkg/local_object_storage/shard/tree.go +++ b/pkg/local_object_storage/shard/tree.go @@ -1,9 +1,9 @@ package shard import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" ) var _ pilorama.Forest = (*Shard)(nil) diff --git a/pkg/local_object_storage/util/splitinfo.go b/pkg/local_object_storage/util/splitinfo.go index fcb97af1e..f2a4a24f3 100644 --- a/pkg/local_object_storage/util/splitinfo.go +++ b/pkg/local_object_storage/util/splitinfo.go @@ -1,7 +1,7 @@ package util import ( - "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-sdk-go/object" ) // MergeSplitInfo ignores conflicts and rewrites `to` with non empty values diff --git a/pkg/local_object_storage/util/splitinfo_test.go b/pkg/local_object_storage/util/splitinfo_test.go index 5b3b0b6eb..3b7cf9022 100644 --- a/pkg/local_object_storage/util/splitinfo_test.go +++ b/pkg/local_object_storage/util/splitinfo_test.go @@ -4,10 +4,10 @@ import ( "math/rand" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/google/uuid" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/local_object_storage/writecache/delete.go b/pkg/local_object_storage/writecache/delete.go index f9879b799..b8988dbb3 100644 --- a/pkg/local_object_storage/writecache/delete.go +++ b/pkg/local_object_storage/writecache/delete.go @@ -1,9 +1,9 @@ package writecache import ( - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/flush.go b/pkg/local_object_storage/writecache/flush.go index 77167f8a9..7340512f1 100644 --- a/pkg/local_object_storage/writecache/flush.go +++ b/pkg/local_object_storage/writecache/flush.go @@ -5,14 +5,14 @@ import ( "errors" "time" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/mr-tron/base58" "github.com/nspcc-dev/neo-go/pkg/util/slice" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/writecache/flush_test.go b/pkg/local_object_storage/writecache/flush_test.go index 5482befc6..6049b79af 100644 --- a/pkg/local_object_storage/writecache/flush_test.go +++ b/pkg/local_object_storage/writecache/flush_test.go @@ -5,21 +5,21 @@ import ( "path/filepath" "testing" - objectCore "github.com/nspcc-dev/neofs-node/pkg/core/object" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - checksumtest "github.com/nspcc-dev/neofs-sdk-go/checksum/test" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" - usertest "github.com/nspcc-dev/neofs-sdk-go/user/test" - versionSDK "github.com/nspcc-dev/neofs-sdk-go/version" + objectCore "github.com/TrueCloudLab/frostfs-node/pkg/core/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + checksumtest "github.com/TrueCloudLab/frostfs-sdk-go/checksum/test" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" + usertest "github.com/TrueCloudLab/frostfs-sdk-go/user/test" + versionSDK "github.com/TrueCloudLab/frostfs-sdk-go/version" "github.com/stretchr/testify/require" "go.etcd.io/bbolt" "go.uber.org/atomic" diff --git a/pkg/local_object_storage/writecache/generic_test.go b/pkg/local_object_storage/writecache/generic_test.go index 0fb39e59a..82d602ac1 100644 --- a/pkg/local_object_storage/writecache/generic_test.go +++ b/pkg/local_object_storage/writecache/generic_test.go @@ -6,8 +6,8 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/storagetest" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/storagetest" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/local_object_storage/writecache/get.go b/pkg/local_object_storage/writecache/get.go index 2e591fda4..ff71dedbd 100644 --- a/pkg/local_object_storage/writecache/get.go +++ b/pkg/local_object_storage/writecache/get.go @@ -1,12 +1,12 @@ package writecache import ( + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/nspcc-dev/neo-go/pkg/util/slice" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/init.go b/pkg/local_object_storage/writecache/init.go index dae13b1b1..0ccdb6851 100644 --- a/pkg/local_object_storage/writecache/init.go +++ b/pkg/local_object_storage/writecache/init.go @@ -3,11 +3,11 @@ package writecache import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/writecache/iterate.go b/pkg/local_object_storage/writecache/iterate.go index 6bd279ea9..ae3efffd1 100644 --- a/pkg/local_object_storage/writecache/iterate.go +++ b/pkg/local_object_storage/writecache/iterate.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/mode.go b/pkg/local_object_storage/writecache/mode.go index 0da8391ae..b790cc56c 100644 --- a/pkg/local_object_storage/writecache/mode.go +++ b/pkg/local_object_storage/writecache/mode.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/util/logicerr" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/util/logicerr" ) // ErrReadOnly is returned when Put/Write is performed in a read-only mode. diff --git a/pkg/local_object_storage/writecache/options.go b/pkg/local_object_storage/writecache/options.go index 31f291fee..6db4ae0ff 100644 --- a/pkg/local_object_storage/writecache/options.go +++ b/pkg/local_object_storage/writecache/options.go @@ -3,11 +3,11 @@ package writecache import ( "time" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - meta "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/metabase" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + meta "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/metabase" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + objectSDK "github.com/TrueCloudLab/frostfs-sdk-go/object" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/writecache/put.go b/pkg/local_object_storage/writecache/put.go index cbf39c61f..4a78c0b7e 100644 --- a/pkg/local_object_storage/writecache/put.go +++ b/pkg/local_object_storage/writecache/put.go @@ -3,8 +3,8 @@ package writecache import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" "go.etcd.io/bbolt" ) diff --git a/pkg/local_object_storage/writecache/storage.go b/pkg/local_object_storage/writecache/storage.go index 8cff21872..af25a01ec 100644 --- a/pkg/local_object_storage/writecache/storage.go +++ b/pkg/local_object_storage/writecache/storage.go @@ -5,14 +5,14 @@ import ( "fmt" "os" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + storagelog "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/internal/log" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" lru "github.com/hashicorp/golang-lru" "github.com/hashicorp/golang-lru/simplelru" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - storagelog "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/internal/log" - "github.com/nspcc-dev/neofs-node/pkg/util" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/local_object_storage/writecache/writecache.go b/pkg/local_object_storage/writecache/writecache.go index f5c3f8805..4d5110d65 100644 --- a/pkg/local_object_storage/writecache/writecache.go +++ b/pkg/local_object_storage/writecache/writecache.go @@ -3,12 +3,12 @@ package writecache import ( "sync" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/common" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/blobstor/fstree" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/shard/mode" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/common" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/blobstor/fstree" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/shard/mode" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.etcd.io/bbolt" "go.uber.org/zap" ) diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index 9e87f0ac1..640da2d5f 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -2,7 +2,7 @@ package metrics import "github.com/prometheus/client_golang/prometheus" -const namespace = "neofs_node" +const namespace = "frostfs_node" type NodeMetrics struct { objectServiceMetrics diff --git a/pkg/morph/client/audit/client.go b/pkg/morph/client/audit/client.go index da7485a94..5bb41791c 100644 --- a/pkg/morph/client/audit/client.go +++ b/pkg/morph/client/audit/client.go @@ -3,9 +3,9 @@ package audit import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // Client is a wrapper over StaticClient diff --git a/pkg/morph/client/audit/get_result.go b/pkg/morph/client/audit/get_result.go index a626db766..533f7f6fb 100644 --- a/pkg/morph/client/audit/get_result.go +++ b/pkg/morph/client/audit/get_result.go @@ -3,8 +3,8 @@ package audit import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - auditAPI "github.com/nspcc-dev/neofs-sdk-go/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" ) // GetAuditResult returns audit result structure stored in audit contract. diff --git a/pkg/morph/client/audit/list_results.go b/pkg/morph/client/audit/list_results.go index 6f30cf153..12a3989b7 100644 --- a/pkg/morph/client/audit/list_results.go +++ b/pkg/morph/client/audit/list_results.go @@ -4,9 +4,9 @@ import ( "crypto/sha256" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" ) // ListAllAuditResultID returns a list of all audit result IDs inside audit contract. diff --git a/pkg/morph/client/audit/put_result.go b/pkg/morph/client/audit/put_result.go index 71181c46f..fe99635dc 100644 --- a/pkg/morph/client/audit/put_result.go +++ b/pkg/morph/client/audit/put_result.go @@ -3,8 +3,8 @@ package audit import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - auditAPI "github.com/nspcc-dev/neofs-sdk-go/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" ) // ResultID is an identity of audit result inside audit contract. diff --git a/pkg/morph/client/audit/result_test.go b/pkg/morph/client/audit/result_test.go index 006bfba77..e6bcdb0a1 100644 --- a/pkg/morph/client/audit/result_test.go +++ b/pkg/morph/client/audit/result_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + auditAPI "github.com/TrueCloudLab/frostfs-sdk-go/audit" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - auditAPI "github.com/nspcc-dev/neofs-sdk-go/audit" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) @@ -16,7 +16,7 @@ func TestAuditResults(t *testing.T) { t.Skip() const epoch = 11 - endpoint := "http://morph_chain.neofs.devenv:30333" + endpoint := "http://morph_chain.frostfs.devenv:30333" sAuditHash := "cdfb3dab86e6d60e8a143d9e2ecb0b188f3dc2eb" irKeyWIF := "L3o221BojgcCPYgdbXsm6jn7ayTZ72xwREvBHXKknR8VJ3G4WmjB" diff --git a/pkg/morph/client/balance/balanceOf.go b/pkg/morph/client/balance/balanceOf.go index 7f2417a42..a81211ab4 100644 --- a/pkg/morph/client/balance/balanceOf.go +++ b/pkg/morph/client/balance/balanceOf.go @@ -4,9 +4,9 @@ import ( "fmt" "math/big" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/encoding/address" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/user" ) // BalanceOf receives the amount of funds in the client's account diff --git a/pkg/morph/client/balance/burn.go b/pkg/morph/client/balance/burn.go index 08d7aa60a..d1544301d 100644 --- a/pkg/morph/client/balance/burn.go +++ b/pkg/morph/client/balance/burn.go @@ -1,8 +1,8 @@ package balance import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // BurnPrm groups parameters of Burn operation. diff --git a/pkg/morph/client/balance/client.go b/pkg/morph/client/balance/client.go index 3c363f9c8..1fe8e5fb1 100644 --- a/pkg/morph/client/balance/client.go +++ b/pkg/morph/client/balance/client.go @@ -3,9 +3,9 @@ package balance import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // Client is a wrapper over StaticClient diff --git a/pkg/morph/client/balance/decimals.go b/pkg/morph/client/balance/decimals.go index 19110e3a0..88daa95ed 100644 --- a/pkg/morph/client/balance/decimals.go +++ b/pkg/morph/client/balance/decimals.go @@ -3,7 +3,7 @@ package balance import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // Decimals decimal precision of currency transactions diff --git a/pkg/morph/client/balance/lock.go b/pkg/morph/client/balance/lock.go index 1ef31cbf1..f14a23363 100644 --- a/pkg/morph/client/balance/lock.go +++ b/pkg/morph/client/balance/lock.go @@ -1,8 +1,8 @@ package balance import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // LockPrm groups parameters of Lock operation. diff --git a/pkg/morph/client/balance/mint.go b/pkg/morph/client/balance/mint.go index b52727a9f..e0d99bdb3 100644 --- a/pkg/morph/client/balance/mint.go +++ b/pkg/morph/client/balance/mint.go @@ -1,8 +1,8 @@ package balance import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // MintPrm groups parameters of Mint operation. diff --git a/pkg/morph/client/balance/transfer.go b/pkg/morph/client/balance/transfer.go index de81adc18..0b514f335 100644 --- a/pkg/morph/client/balance/transfer.go +++ b/pkg/morph/client/balance/transfer.go @@ -3,9 +3,9 @@ package balance import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/encoding/address" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/user" ) // TransferPrm groups parameters of TransferX method. diff --git a/pkg/morph/client/client.go b/pkg/morph/client/client.go index 804e80d4d..e2684bfe0 100644 --- a/pkg/morph/client/client.go +++ b/pkg/morph/client/client.go @@ -8,6 +8,7 @@ import ( "sync" "time" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/transaction" @@ -24,7 +25,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neo-go/pkg/vm/vmstate" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "go.uber.org/atomic" "go.uber.org/zap" ) @@ -164,17 +164,17 @@ func (e *notHaltStateError) Error() string { var errEmptyInvocationScript = errors.New("got empty invocation script from neo node") // implementation of error interface for NeoFS-specific errors. -type neofsError struct { +type frostfsError struct { err error } -func (e neofsError) Error() string { - return fmt.Sprintf("neofs error: %v", e.err) +func (e frostfsError) Error() string { + return fmt.Sprintf("frostfs error: %v", e.err) } -// wraps NeoFS-specific error into neofsError. Arg must not be nil. +// wraps NeoFS-specific error into frostfsError. Arg must not be nil. func wrapNeoFSError(err error) error { - return neofsError{err} + return frostfsError{err} } // Invoke invokes contract method by sending transaction into blockchain. @@ -383,7 +383,7 @@ func (c *Client) roleList(r noderoles.Role) (keys.PublicKeys, error) { // tries to resolve sc.Parameter from the arg. // -// Wraps any error to neofsError. +// Wraps any error to frostfsError. func toStackParameter(value interface{}) (sc.Parameter, error) { var result = sc.Parameter{ Value: value, diff --git a/pkg/morph/client/constructor.go b/pkg/morph/client/constructor.go index 7096511bc..7cdb2e0e1 100644 --- a/pkg/morph/client/constructor.go +++ b/pkg/morph/client/constructor.go @@ -7,6 +7,7 @@ import ( "sync" "time" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" lru "github.com/hashicorp/golang-lru" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" @@ -14,7 +15,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/rpcclient/actor" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/morph/client/container/client.go b/pkg/morph/client/container/client.go index 438505d9a..117fdd176 100644 --- a/pkg/morph/client/container/client.go +++ b/pkg/morph/client/container/client.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // Client is a wrapper over StaticClient diff --git a/pkg/morph/client/container/delete.go b/pkg/morph/client/container/delete.go index 7cd90bce8..67fc2dd26 100644 --- a/pkg/morph/client/container/delete.go +++ b/pkg/morph/client/container/delete.go @@ -4,8 +4,8 @@ import ( "crypto/sha256" "fmt" - core "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + core "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // Delete marshals container ID, and passes it to Wrapper's Delete method diff --git a/pkg/morph/client/container/eacl.go b/pkg/morph/client/container/eacl.go index dfb04c3ef..b5853d040 100644 --- a/pkg/morph/client/container/eacl.go +++ b/pkg/morph/client/container/eacl.go @@ -4,13 +4,13 @@ import ( "crypto/sha256" "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/session" ) // GetEACL reads the extended ACL table from NeoFS system diff --git a/pkg/morph/client/container/eacl_set.go b/pkg/morph/client/container/eacl_set.go index 93f46408d..19e31ace8 100644 --- a/pkg/morph/client/container/eacl_set.go +++ b/pkg/morph/client/container/eacl_set.go @@ -3,9 +3,9 @@ package container import ( "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - containercore "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // PutEACL marshals table, and passes it to Wrapper's PutEACLBinary method diff --git a/pkg/morph/client/container/estimations.go b/pkg/morph/client/container/estimations.go index 51e4b5b2e..6895a6650 100644 --- a/pkg/morph/client/container/estimations.go +++ b/pkg/morph/client/container/estimations.go @@ -3,7 +3,7 @@ package container import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // StartEstimationPrm groups parameters of StartEstimation operation. diff --git a/pkg/morph/client/container/get.go b/pkg/morph/client/container/get.go index 9649c51a5..2c99daeda 100644 --- a/pkg/morph/client/container/get.go +++ b/pkg/morph/client/container/get.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - containerContract "github.com/nspcc-dev/neofs-contract/container" - containercore "github.com/nspcc-dev/neofs-node/pkg/core/container" - core "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + containerContract "github.com/TrueCloudLab/frostfs-contract/container" + containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + core "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" ) type containerSource Client diff --git a/pkg/morph/client/container/list.go b/pkg/morph/client/container/list.go index 8fb37c266..a7afca519 100644 --- a/pkg/morph/client/container/list.go +++ b/pkg/morph/client/container/list.go @@ -3,9 +3,9 @@ package container import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) // List returns a list of container identifiers belonging diff --git a/pkg/morph/client/container/load.go b/pkg/morph/client/container/load.go index 7a4dd37e4..2de75f31f 100644 --- a/pkg/morph/client/container/load.go +++ b/pkg/morph/client/container/load.go @@ -4,10 +4,10 @@ import ( "crypto/sha256" "fmt" - v2refs "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + v2refs "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" ) // AnnounceLoadPrm groups parameters of AnnounceLoad operation. diff --git a/pkg/morph/client/container/put.go b/pkg/morph/client/container/put.go index 518de644f..f9acd2f7c 100644 --- a/pkg/morph/client/container/put.go +++ b/pkg/morph/client/container/put.go @@ -3,11 +3,11 @@ package container import ( "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - containercore "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" ) // Put marshals container, and passes it to Wrapper's Put method diff --git a/pkg/morph/client/neofs/bind.go b/pkg/morph/client/neofs/bind.go index 4a89e3c38..4b13d26bd 100644 --- a/pkg/morph/client/neofs/bind.go +++ b/pkg/morph/client/neofs/bind.go @@ -1,9 +1,9 @@ -package neofscontract +package frostfscontract import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) type commonBindArgs struct { diff --git a/pkg/morph/client/neofs/cheque.go b/pkg/morph/client/neofs/cheque.go index 0e384afa0..fd045751c 100644 --- a/pkg/morph/client/neofs/cheque.go +++ b/pkg/morph/client/neofs/cheque.go @@ -1,9 +1,9 @@ -package neofscontract +package frostfscontract import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // ChequePrm groups parameters of Cheque operation. diff --git a/pkg/morph/client/neofs/client.go b/pkg/morph/client/neofs/client.go index b22ecf42c..2257c5665 100644 --- a/pkg/morph/client/neofs/client.go +++ b/pkg/morph/client/neofs/client.go @@ -1,11 +1,11 @@ -package neofscontract +package frostfscontract import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // Client is a wrapper over StaticClient diff --git a/pkg/morph/client/neofsid/addrm_keys.go b/pkg/morph/client/neofsid/addrm_keys.go index 7e3032e63..e5b1bd75f 100644 --- a/pkg/morph/client/neofsid/addrm_keys.go +++ b/pkg/morph/client/neofsid/addrm_keys.go @@ -3,7 +3,7 @@ package neofsid import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) type CommonBindPrm struct { diff --git a/pkg/morph/client/neofsid/client.go b/pkg/morph/client/neofsid/client.go index 3799abe48..f2c6a59ac 100644 --- a/pkg/morph/client/neofsid/client.go +++ b/pkg/morph/client/neofsid/client.go @@ -3,9 +3,9 @@ package neofsid import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // Client is a wrapper over StaticClient diff --git a/pkg/morph/client/neofsid/keys.go b/pkg/morph/client/neofsid/keys.go index d0aa9fe2d..cde5d2f97 100644 --- a/pkg/morph/client/neofsid/keys.go +++ b/pkg/morph/client/neofsid/keys.go @@ -4,9 +4,9 @@ import ( "crypto/elliptic" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/user" ) // AccountKeysPrm groups parameters of AccountKeys operation. diff --git a/pkg/morph/client/netmap/add_peer.go b/pkg/morph/client/netmap/add_peer.go index d42fab2b1..5473ff50b 100644 --- a/pkg/morph/client/netmap/add_peer.go +++ b/pkg/morph/client/netmap/add_peer.go @@ -3,8 +3,8 @@ package netmap import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // AddPeerPrm groups parameters of AddPeer operation. @@ -27,7 +27,7 @@ func (c *Client) AddPeer(p AddPeerPrm) error { if c.client.WithNotary() && c.client.IsAlpha() { // In notary environments Alphabet must calls AddPeerIR method instead of AddPeer. // It differs from AddPeer only by name, so we can do this in the same form. - // See https://github.com/nspcc-dev/neofs-contract/issues/154. + // See https://github.com/nspcc-dev/frostfs-contract/issues/154. method += "IR" } diff --git a/pkg/morph/client/netmap/client.go b/pkg/morph/client/netmap/client.go index a8849546e..6e27896f0 100644 --- a/pkg/morph/client/netmap/client.go +++ b/pkg/morph/client/netmap/client.go @@ -3,10 +3,10 @@ package netmap import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/netmap" ) type NodeInfo = netmap.NodeInfo diff --git a/pkg/morph/client/netmap/config.go b/pkg/morph/client/netmap/config.go index b2e902256..2795555bf 100644 --- a/pkg/morph/client/netmap/config.go +++ b/pkg/morph/client/netmap/config.go @@ -5,9 +5,9 @@ import ( "fmt" "strconv" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/bigint" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) const ( diff --git a/pkg/morph/client/netmap/epoch.go b/pkg/morph/client/netmap/epoch.go index 489554b39..1e52d750f 100644 --- a/pkg/morph/client/netmap/epoch.go +++ b/pkg/morph/client/netmap/epoch.go @@ -3,7 +3,7 @@ package netmap import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // Epoch receives number of current NeoFS epoch diff --git a/pkg/morph/client/netmap/innerring.go b/pkg/morph/client/netmap/innerring.go index ad812cf76..d28a299ca 100644 --- a/pkg/morph/client/netmap/innerring.go +++ b/pkg/morph/client/netmap/innerring.go @@ -4,9 +4,9 @@ import ( "crypto/elliptic" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // UpdateIRPrm groups parameters of UpdateInnerRing diff --git a/pkg/morph/client/netmap/netmap.go b/pkg/morph/client/netmap/netmap.go index d22221623..071154313 100644 --- a/pkg/morph/client/netmap/netmap.go +++ b/pkg/morph/client/netmap/netmap.go @@ -3,10 +3,10 @@ package netmap import ( "fmt" + netmapcontract "github.com/TrueCloudLab/frostfs-contract/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - netmapcontract "github.com/nspcc-dev/neofs-contract/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/netmap" ) // GetNetMapByEpoch calls "snapshotByEpoch" method with the given epoch and diff --git a/pkg/morph/client/netmap/netmap_test.go b/pkg/morph/client/netmap/netmap_test.go index e914a40a7..da3d36728 100644 --- a/pkg/morph/client/netmap/netmap_test.go +++ b/pkg/morph/client/netmap/netmap_test.go @@ -6,9 +6,9 @@ import ( "strconv" "testing" + netmapcontract "github.com/TrueCloudLab/frostfs-contract/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - netmapcontract "github.com/nspcc-dev/neofs-contract/netmap" - "github.com/nspcc-dev/neofs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/client/netmap/new_epoch.go b/pkg/morph/client/netmap/new_epoch.go index 3f3fcd50f..df8c5f5f3 100644 --- a/pkg/morph/client/netmap/new_epoch.go +++ b/pkg/morph/client/netmap/new_epoch.go @@ -3,7 +3,7 @@ package netmap import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // NewEpoch updates NeoFS epoch number through diff --git a/pkg/morph/client/netmap/snapshot.go b/pkg/morph/client/netmap/snapshot.go index 1896225a2..b11cfd39f 100644 --- a/pkg/morph/client/netmap/snapshot.go +++ b/pkg/morph/client/netmap/snapshot.go @@ -1,8 +1,8 @@ package netmap import ( - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // GetNetMap calls "snapshot" method and decodes netmap.NetMap from the response. diff --git a/pkg/morph/client/netmap/update_state.go b/pkg/morph/client/netmap/update_state.go index 2e719975f..383fae8a3 100644 --- a/pkg/morph/client/netmap/update_state.go +++ b/pkg/morph/client/netmap/update_state.go @@ -3,8 +3,8 @@ package netmap import ( "fmt" - "github.com/nspcc-dev/neofs-contract/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-contract/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // UpdatePeerPrm groups parameters of UpdatePeerState operation. @@ -42,7 +42,7 @@ func (c *Client) UpdatePeerState(p UpdatePeerPrm) error { if c.client.WithNotary() && c.client.IsAlpha() { // In notary environments Alphabet must calls UpdateStateIR method instead of UpdateState. // It differs from UpdateState only by name, so we can do this in the same form. - // See https://github.com/nspcc-dev/neofs-contract/issues/225. + // See https://github.com/nspcc-dev/frostfs-contract/issues/225. method += "IR" } diff --git a/pkg/morph/client/nns.go b/pkg/morph/client/nns.go index d22faf08e..616d67b19 100644 --- a/pkg/morph/client/nns.go +++ b/pkg/morph/client/nns.go @@ -6,6 +6,7 @@ import ( "math/big" "strconv" + "github.com/TrueCloudLab/frostfs-contract/nns" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/encoding/address" @@ -14,30 +15,29 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neo-go/pkg/vm/vmstate" - "github.com/nspcc-dev/neofs-contract/nns" ) const ( nnsContractID = 1 // NNS contract must be deployed first in the sidechain // NNSAuditContractName is a name of the audit contract in NNS. - NNSAuditContractName = "audit.neofs" + NNSAuditContractName = "audit.frostfs" // NNSBalanceContractName is a name of the balance contract in NNS. - NNSBalanceContractName = "balance.neofs" + NNSBalanceContractName = "balance.frostfs" // NNSContainerContractName is a name of the container contract in NNS. - NNSContainerContractName = "container.neofs" - // NNSNeoFSIDContractName is a name of the neofsid contract in NNS. - NNSNeoFSIDContractName = "neofsid.neofs" + NNSContainerContractName = "container.frostfs" + // NNSNeoFSIDContractName is a name of the frostfsid contract in NNS. + NNSNeoFSIDContractName = "frostfsid.frostfs" // NNSNetmapContractName is a name of the netmap contract in NNS. - NNSNetmapContractName = "netmap.neofs" + NNSNetmapContractName = "netmap.frostfs" // NNSProxyContractName is a name of the proxy contract in NNS. - NNSProxyContractName = "proxy.neofs" + NNSProxyContractName = "proxy.frostfs" // NNSReputationContractName is a name of the reputation contract in NNS. - NNSReputationContractName = "reputation.neofs" + NNSReputationContractName = "reputation.frostfs" // NNSSubnetworkContractName is a name of the subnet contract in NNS. - NNSSubnetworkContractName = "subnet.neofs" + NNSSubnetworkContractName = "subnet.frostfs" // NNSGroupKeyName is a name for the NeoFS group key record in NNS. - NNSGroupKeyName = "group.neofs" + NNSGroupKeyName = "group.frostfs" ) var ( @@ -50,7 +50,7 @@ var ( // NNSAlphabetContractName returns contract name of the alphabet contract in NNS // based on alphabet index. func NNSAlphabetContractName(index int) string { - return "alphabet" + strconv.Itoa(index) + ".neofs" + return "alphabet" + strconv.Itoa(index) + ".frostfs" } // NNSContractAddress returns contract address script hash based on its name @@ -152,7 +152,7 @@ func nnsResolve(c *rpcclient.WSClient, nnsHash util.Uint160, domain string) (uti } // We support several formats for hash encoding, this logic should be maintained in sync - // with parseNNSResolveResult from cmd/neofs-adm/internal/modules/morph/initialize_nns.go + // with parseNNSResolveResult from cmd/frostfs-adm/internal/modules/morph/initialize_nns.go h, err := util.Uint160DecodeStringLE(string(bs)) if err == nil { return h, nil diff --git a/pkg/morph/client/notary.go b/pkg/morph/client/notary.go index f609003b5..8f20dcb81 100644 --- a/pkg/morph/client/notary.go +++ b/pkg/morph/client/notary.go @@ -8,6 +8,7 @@ import ( "math/big" "strings" + "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" "github.com/nspcc-dev/neo-go/pkg/core/native/nativenames" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/transaction" @@ -20,7 +21,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" "github.com/nspcc-dev/neo-go/pkg/wallet" - "github.com/nspcc-dev/neofs-node/pkg/util/rand" "go.uber.org/zap" ) diff --git a/pkg/morph/client/reputation/client.go b/pkg/morph/client/reputation/client.go index c34498e30..b0a39bbfd 100644 --- a/pkg/morph/client/reputation/client.go +++ b/pkg/morph/client/reputation/client.go @@ -3,9 +3,9 @@ package reputation import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // Client is a wrapper over StaticClient diff --git a/pkg/morph/client/reputation/get.go b/pkg/morph/client/reputation/get.go index fb56d6c10..abd6cc2d2 100644 --- a/pkg/morph/client/reputation/get.go +++ b/pkg/morph/client/reputation/get.go @@ -3,9 +3,9 @@ package reputation import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/reputation" ) type ( diff --git a/pkg/morph/client/reputation/list.go b/pkg/morph/client/reputation/list.go index 6ccb9926c..036a2f1b6 100644 --- a/pkg/morph/client/reputation/list.go +++ b/pkg/morph/client/reputation/list.go @@ -3,7 +3,7 @@ package reputation import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) type ( diff --git a/pkg/morph/client/reputation/put.go b/pkg/morph/client/reputation/put.go index 89060ea52..20f563bc6 100644 --- a/pkg/morph/client/reputation/put.go +++ b/pkg/morph/client/reputation/put.go @@ -3,8 +3,8 @@ package reputation import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-sdk-go/reputation" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-sdk-go/reputation" ) type ( diff --git a/pkg/morph/client/subnet/admin.go b/pkg/morph/client/subnet/admin.go index 832c40a0d..4c913b2aa 100644 --- a/pkg/morph/client/subnet/admin.go +++ b/pkg/morph/client/subnet/admin.go @@ -1,6 +1,6 @@ package morphsubnet -import "github.com/nspcc-dev/neofs-node/pkg/morph/client" +import "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" // ManageAdminsPrm groups parameters of administer methods of Subnet contract. // diff --git a/pkg/morph/client/subnet/client.go b/pkg/morph/client/subnet/client.go index 6a7a795a8..deecf93b4 100644 --- a/pkg/morph/client/subnet/client.go +++ b/pkg/morph/client/subnet/client.go @@ -3,8 +3,8 @@ package morphsubnet import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // Client represents Subnet contract client. diff --git a/pkg/morph/client/subnet/clients.go b/pkg/morph/client/subnet/clients.go index 3d0ed4ed0..0d4179b44 100644 --- a/pkg/morph/client/subnet/clients.go +++ b/pkg/morph/client/subnet/clients.go @@ -3,7 +3,7 @@ package morphsubnet import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // UserAllowedPrm groups parameters of UserAllowed method of Subnet contract. diff --git a/pkg/morph/client/subnet/delete.go b/pkg/morph/client/subnet/delete.go index 6fed72f9f..9bb5a99ab 100644 --- a/pkg/morph/client/subnet/delete.go +++ b/pkg/morph/client/subnet/delete.go @@ -1,8 +1,8 @@ package morphsubnet import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // DeletePrm groups parameters of Delete method of Subnet contract. diff --git a/pkg/morph/client/subnet/get.go b/pkg/morph/client/subnet/get.go index 7fcefc760..a7b0b57a9 100644 --- a/pkg/morph/client/subnet/get.go +++ b/pkg/morph/client/subnet/get.go @@ -3,7 +3,7 @@ package morphsubnet import ( "errors" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // GetPrm groups parameters of Get method of Subnet contract. diff --git a/pkg/morph/client/subnet/node.go b/pkg/morph/client/subnet/node.go index 14afbd47c..aa38d61c5 100644 --- a/pkg/morph/client/subnet/node.go +++ b/pkg/morph/client/subnet/node.go @@ -3,7 +3,7 @@ package morphsubnet import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" ) // NodeAllowedPrm groups parameters of NodeAllowed method of Subnet contract. diff --git a/pkg/morph/client/subnet/nodes.go b/pkg/morph/client/subnet/nodes.go index 79e846379..cc714fb78 100644 --- a/pkg/morph/client/subnet/nodes.go +++ b/pkg/morph/client/subnet/nodes.go @@ -1,6 +1,6 @@ package morphsubnet -import "github.com/nspcc-dev/neofs-node/pkg/morph/client" +import "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" // ManageNodesPrm groups parameters of node management in Subnet contract. // diff --git a/pkg/morph/client/subnet/put.go b/pkg/morph/client/subnet/put.go index d2736613a..a8ce44c99 100644 --- a/pkg/morph/client/subnet/put.go +++ b/pkg/morph/client/subnet/put.go @@ -1,8 +1,8 @@ package morphsubnet import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) // PutPrm groups parameters of Put method of Subnet contract. diff --git a/pkg/morph/event/balance/lock.go b/pkg/morph/event/balance/lock.go index da30ddc7e..c99c6f2fc 100644 --- a/pkg/morph/event/balance/lock.go +++ b/pkg/morph/event/balance/lock.go @@ -3,10 +3,10 @@ package balance import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // Lock structure of balance.Lock notification from morph chain. diff --git a/pkg/morph/event/balance/lock_test.go b/pkg/morph/event/balance/lock_test.go index d2a8ed6b6..ecda69b7e 100644 --- a/pkg/morph/event/balance/lock_test.go +++ b/pkg/morph/event/balance/lock_test.go @@ -4,10 +4,10 @@ import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/container/delete.go b/pkg/morph/event/container/delete.go index 863a99ce7..5f3da4bcf 100644 --- a/pkg/morph/event/container/delete.go +++ b/pkg/morph/event/container/delete.go @@ -3,11 +3,11 @@ package container import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" ) // Delete structure of container.Delete notification from morph chain. diff --git a/pkg/morph/event/container/delete_notary.go b/pkg/morph/event/container/delete_notary.go index 042fa9a7b..c17df3dd4 100644 --- a/pkg/morph/event/container/delete_notary.go +++ b/pkg/morph/event/container/delete_notary.go @@ -1,8 +1,8 @@ package container import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) func (d *Delete) setContainerID(v []byte) { diff --git a/pkg/morph/event/container/delete_test.go b/pkg/morph/event/container/delete_test.go index 7ca10331a..8dc328b3c 100644 --- a/pkg/morph/event/container/delete_test.go +++ b/pkg/morph/event/container/delete_test.go @@ -4,9 +4,9 @@ import ( "crypto/sha256" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/container/eacl.go b/pkg/morph/event/container/eacl.go index 9405136be..86e68ad7b 100644 --- a/pkg/morph/event/container/eacl.go +++ b/pkg/morph/event/container/eacl.go @@ -3,10 +3,10 @@ package container import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // SetEACL represents structure of notification about diff --git a/pkg/morph/event/container/eacl_notary.go b/pkg/morph/event/container/eacl_notary.go index 388eb3259..dcd994549 100644 --- a/pkg/morph/event/container/eacl_notary.go +++ b/pkg/morph/event/container/eacl_notary.go @@ -1,8 +1,8 @@ package container import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) func (x *SetEACL) setTable(v []byte) { diff --git a/pkg/morph/event/container/eacl_test.go b/pkg/morph/event/container/eacl_test.go index 4d99b8401..24b122ae4 100644 --- a/pkg/morph/event/container/eacl_test.go +++ b/pkg/morph/event/container/eacl_test.go @@ -3,9 +3,9 @@ package container import ( "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/container/estimates.go b/pkg/morph/event/container/estimates.go index 078441b5b..47e4d8401 100644 --- a/pkg/morph/event/container/estimates.go +++ b/pkg/morph/event/container/estimates.go @@ -3,10 +3,10 @@ package container import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // StartEstimation structure of container.StartEstimation notification from diff --git a/pkg/morph/event/container/estimates_test.go b/pkg/morph/event/container/estimates_test.go index 1f7a59672..54933d0a3 100644 --- a/pkg/morph/event/container/estimates_test.go +++ b/pkg/morph/event/container/estimates_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/container/put.go b/pkg/morph/event/container/put.go index 51f1f4aa2..80cab9005 100644 --- a/pkg/morph/event/container/put.go +++ b/pkg/morph/event/container/put.go @@ -3,11 +3,11 @@ package container import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" ) // Put structure of container.Put notification from morph chain. diff --git a/pkg/morph/event/container/put_notary.go b/pkg/morph/event/container/put_notary.go index f489537f3..6992e9d31 100644 --- a/pkg/morph/event/container/put_notary.go +++ b/pkg/morph/event/container/put_notary.go @@ -3,9 +3,9 @@ package container import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/network/payload" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) func (p *Put) setRawContainer(v []byte) { diff --git a/pkg/morph/event/container/put_test.go b/pkg/morph/event/container/put_test.go index 4f55e5ad8..5030ef7b0 100644 --- a/pkg/morph/event/container/put_test.go +++ b/pkg/morph/event/container/put_test.go @@ -4,9 +4,9 @@ import ( "crypto/sha256" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/listener.go b/pkg/morph/event/listener.go index 0c0a845b9..0506d87b2 100644 --- a/pkg/morph/event/listener.go +++ b/pkg/morph/event/listener.go @@ -6,13 +6,13 @@ import ( "fmt" "sync" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/subscriber" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/neorpc/result" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/subscriber" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/pkg/morph/event/neofs/bind.go b/pkg/morph/event/neofs/bind.go index a976bcbd7..ce5cb2827 100644 --- a/pkg/morph/event/neofs/bind.go +++ b/pkg/morph/event/neofs/bind.go @@ -1,13 +1,13 @@ -package neofs +package frostfs import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) type Bind struct { diff --git a/pkg/morph/event/neofs/bind_test.go b/pkg/morph/event/neofs/bind_test.go index 4c0f5609b..53421ae99 100644 --- a/pkg/morph/event/neofs/bind_test.go +++ b/pkg/morph/event/neofs/bind_test.go @@ -1,11 +1,11 @@ -package neofs +package frostfs import ( "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/neofs/cheque.go b/pkg/morph/event/neofs/cheque.go index 66f16ca81..192c0a98e 100644 --- a/pkg/morph/event/neofs/cheque.go +++ b/pkg/morph/event/neofs/cheque.go @@ -1,15 +1,15 @@ -package neofs +package frostfs import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) -// Cheque structure of neofs.Cheque notification from mainnet chain. +// Cheque structure of frostfs.Cheque notification from mainnet chain. type Cheque struct { id []byte amount int64 // Fixed8 diff --git a/pkg/morph/event/neofs/cheque_test.go b/pkg/morph/event/neofs/cheque_test.go index 744844682..0c2b14d88 100644 --- a/pkg/morph/event/neofs/cheque_test.go +++ b/pkg/morph/event/neofs/cheque_test.go @@ -1,12 +1,12 @@ -package neofs +package frostfs import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/neofs/config.go b/pkg/morph/event/neofs/config.go index 8a74233db..6db54f7e4 100644 --- a/pkg/morph/event/neofs/config.go +++ b/pkg/morph/event/neofs/config.go @@ -1,12 +1,12 @@ -package neofs +package frostfs import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) type Config struct { diff --git a/pkg/morph/event/neofs/config_test.go b/pkg/morph/event/neofs/config_test.go index b6a3222e8..c50b3d05b 100644 --- a/pkg/morph/event/neofs/config_test.go +++ b/pkg/morph/event/neofs/config_test.go @@ -1,10 +1,10 @@ -package neofs +package frostfs import ( "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/neofs/deposit.go b/pkg/morph/event/neofs/deposit.go index cbfb20219..ac0ee68c6 100644 --- a/pkg/morph/event/neofs/deposit.go +++ b/pkg/morph/event/neofs/deposit.go @@ -1,15 +1,15 @@ -package neofs +package frostfs import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) -// Deposit structure of neofs.Deposit notification from mainnet chain. +// Deposit structure of frostfs.Deposit notification from mainnet chain. type Deposit struct { id []byte amount int64 // Fixed8 diff --git a/pkg/morph/event/neofs/deposit_test.go b/pkg/morph/event/neofs/deposit_test.go index dfd455828..29ad08e5e 100644 --- a/pkg/morph/event/neofs/deposit_test.go +++ b/pkg/morph/event/neofs/deposit_test.go @@ -1,12 +1,12 @@ -package neofs +package frostfs import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/neofs/ir_update.go b/pkg/morph/event/neofs/ir_update.go index 5387bbe1c..687555f0f 100644 --- a/pkg/morph/event/neofs/ir_update.go +++ b/pkg/morph/event/neofs/ir_update.go @@ -1,13 +1,13 @@ -package neofs +package frostfs import ( "crypto/elliptic" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) type UpdateInnerRing struct { diff --git a/pkg/morph/event/neofs/ir_update_test.go b/pkg/morph/event/neofs/ir_update_test.go index d9e484f76..c7ee00faf 100644 --- a/pkg/morph/event/neofs/ir_update_test.go +++ b/pkg/morph/event/neofs/ir_update_test.go @@ -1,11 +1,11 @@ -package neofs +package frostfs import ( "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/neofs/unbind.go b/pkg/morph/event/neofs/unbind.go index 61044e0d3..9a0a08ea1 100644 --- a/pkg/morph/event/neofs/unbind.go +++ b/pkg/morph/event/neofs/unbind.go @@ -1,10 +1,10 @@ -package neofs +package frostfs import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) type Unbind struct { diff --git a/pkg/morph/event/neofs/unbind_test.go b/pkg/morph/event/neofs/unbind_test.go index b2cd93e06..393534f54 100644 --- a/pkg/morph/event/neofs/unbind_test.go +++ b/pkg/morph/event/neofs/unbind_test.go @@ -1,10 +1,10 @@ -package neofs +package frostfs import ( "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/neofs/withdraw.go b/pkg/morph/event/neofs/withdraw.go index ab8a29f00..5718adad6 100644 --- a/pkg/morph/event/neofs/withdraw.go +++ b/pkg/morph/event/neofs/withdraw.go @@ -1,15 +1,15 @@ -package neofs +package frostfs import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) -// Withdraw structure of neofs.Withdraw notification from mainnet chain. +// Withdraw structure of frostfs.Withdraw notification from mainnet chain. type Withdraw struct { id []byte amount int64 // Fixed8 diff --git a/pkg/morph/event/neofs/withdraw_test.go b/pkg/morph/event/neofs/withdraw_test.go index d251d9559..42891364a 100644 --- a/pkg/morph/event/neofs/withdraw_test.go +++ b/pkg/morph/event/neofs/withdraw_test.go @@ -1,12 +1,12 @@ -package neofs +package frostfs import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/netmap/add_peer.go b/pkg/morph/event/netmap/add_peer.go index 7cae418b9..3468aa728 100644 --- a/pkg/morph/event/netmap/add_peer.go +++ b/pkg/morph/event/netmap/add_peer.go @@ -3,10 +3,10 @@ package netmap import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) type AddPeer struct { diff --git a/pkg/morph/event/netmap/add_peer_notary.go b/pkg/morph/event/netmap/add_peer_notary.go index d957b0a19..48be88994 100644 --- a/pkg/morph/event/netmap/add_peer_notary.go +++ b/pkg/morph/event/netmap/add_peer_notary.go @@ -1,8 +1,8 @@ package netmap import ( + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) func (s *AddPeer) setNode(v []byte) { diff --git a/pkg/morph/event/netmap/add_peer_test.go b/pkg/morph/event/netmap/add_peer_test.go index a5efa96ef..6e1818bc4 100644 --- a/pkg/morph/event/netmap/add_peer_test.go +++ b/pkg/morph/event/netmap/add_peer_test.go @@ -3,9 +3,9 @@ package netmap import ( "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/netmap/epoch.go b/pkg/morph/event/netmap/epoch.go index 224b91988..0032098e7 100644 --- a/pkg/morph/event/netmap/epoch.go +++ b/pkg/morph/event/netmap/epoch.go @@ -3,10 +3,10 @@ package netmap import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // NewEpoch is a new epoch Neo:Morph event. diff --git a/pkg/morph/event/netmap/epoch_test.go b/pkg/morph/event/netmap/epoch_test.go index bf7ea66d5..603efc16a 100644 --- a/pkg/morph/event/netmap/epoch_test.go +++ b/pkg/morph/event/netmap/epoch_test.go @@ -4,8 +4,8 @@ import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/netmap/update_peer.go b/pkg/morph/event/netmap/update_peer.go index 553b58a96..a2f4058fb 100644 --- a/pkg/morph/event/netmap/update_peer.go +++ b/pkg/morph/event/netmap/update_peer.go @@ -4,12 +4,12 @@ import ( "crypto/elliptic" "fmt" + "github.com/TrueCloudLab/frostfs-contract/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/network/payload" - "github.com/nspcc-dev/neofs-contract/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) type UpdatePeer struct { diff --git a/pkg/morph/event/netmap/update_peer_notary.go b/pkg/morph/event/netmap/update_peer_notary.go index 4b38ffcba..4fb0e1bb9 100644 --- a/pkg/morph/event/netmap/update_peer_notary.go +++ b/pkg/morph/event/netmap/update_peer_notary.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) var errNilPubKey = errors.New("could not parse public key: public key is nil") diff --git a/pkg/morph/event/netmap/update_peer_test.go b/pkg/morph/event/netmap/update_peer_test.go index c7e91b88d..878783a6b 100644 --- a/pkg/morph/event/netmap/update_peer_test.go +++ b/pkg/morph/event/netmap/update_peer_test.go @@ -4,10 +4,10 @@ import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-contract/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-contract/netmap" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/notary_preparator.go b/pkg/morph/event/notary_preparator.go index facb679f1..e354b14a1 100644 --- a/pkg/morph/event/notary_preparator.go +++ b/pkg/morph/event/notary_preparator.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/interop/interopnames" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/hash" @@ -16,7 +17,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" ) var ( diff --git a/pkg/morph/event/notary_preparator_test.go b/pkg/morph/event/notary_preparator_test.go index aa7ef1adb..6e9b732a8 100644 --- a/pkg/morph/event/notary_preparator_test.go +++ b/pkg/morph/event/notary_preparator_test.go @@ -5,6 +5,7 @@ import ( "github.com/nspcc-dev/neo-go/pkg/vm" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" "github.com/nspcc-dev/neo-go/pkg/core/interop/interopnames" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/crypto/hash" @@ -16,7 +17,6 @@ import ( "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/emit" "github.com/nspcc-dev/neo-go/pkg/vm/opcode" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/reputation/put.go b/pkg/morph/event/reputation/put.go index 8ac197a29..a85a38f76 100644 --- a/pkg/morph/event/reputation/put.go +++ b/pkg/morph/event/reputation/put.go @@ -3,11 +3,11 @@ package reputation import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-sdk-go/reputation" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/network/payload" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-sdk-go/reputation" ) // Put structure of reputation.reputationPut notification from diff --git a/pkg/morph/event/reputation/put_notary.go b/pkg/morph/event/reputation/put_notary.go index 6d05ffde5..167955374 100644 --- a/pkg/morph/event/reputation/put_notary.go +++ b/pkg/morph/event/reputation/put_notary.go @@ -3,7 +3,7 @@ package reputation import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" ) func (p *Put) setEpoch(v uint64) { diff --git a/pkg/morph/event/reputation/put_test.go b/pkg/morph/event/reputation/put_test.go index beeb26330..2a016cad2 100644 --- a/pkg/morph/event/reputation/put_test.go +++ b/pkg/morph/event/reputation/put_test.go @@ -4,11 +4,11 @@ import ( "math/big" "testing" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" + "github.com/TrueCloudLab/frostfs-sdk-go/reputation" + reputationtest "github.com/TrueCloudLab/frostfs-sdk-go/reputation/test" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" - "github.com/nspcc-dev/neofs-sdk-go/reputation" - reputationtest "github.com/nspcc-dev/neofs-sdk-go/reputation/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/rolemanagement/designate.go b/pkg/morph/event/rolemanagement/designate.go index 9640641b9..460fa1dc2 100644 --- a/pkg/morph/event/rolemanagement/designate.go +++ b/pkg/morph/event/rolemanagement/designate.go @@ -3,10 +3,10 @@ package rolemanagement import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/native/noderoles" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // Designate represents designation event of the mainnet RoleManagement contract. diff --git a/pkg/morph/event/subnet/delete.go b/pkg/morph/event/subnet/delete.go index 2c3ae9d91..11f7d80d9 100644 --- a/pkg/morph/event/subnet/delete.go +++ b/pkg/morph/event/subnet/delete.go @@ -3,10 +3,10 @@ package subnetevents import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // Delete structures information about the notification generated by Delete method of Subnet contract. diff --git a/pkg/morph/event/subnet/delete_test.go b/pkg/morph/event/subnet/delete_test.go index 28c9c8471..0b47b0242 100644 --- a/pkg/morph/event/subnet/delete_test.go +++ b/pkg/morph/event/subnet/delete_test.go @@ -3,8 +3,8 @@ package subnetevents_test import ( "testing" + subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - subnetevents "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/subnet/put.go b/pkg/morph/event/subnet/put.go index fb03935cd..81293b6ac 100644 --- a/pkg/morph/event/subnet/put.go +++ b/pkg/morph/event/subnet/put.go @@ -3,12 +3,12 @@ package subnetevents import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/transaction" "github.com/nspcc-dev/neo-go/pkg/network/payload" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // Put structures information about the notification generated by Put method of Subnet contract. diff --git a/pkg/morph/event/subnet/put_test.go b/pkg/morph/event/subnet/put_test.go index 85e7fc5cc..f7a7ac7dc 100644 --- a/pkg/morph/event/subnet/put_test.go +++ b/pkg/morph/event/subnet/put_test.go @@ -3,8 +3,8 @@ package subnetevents_test import ( "testing" + subnetevents "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - subnetevents "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/subnet/remove_node.go b/pkg/morph/event/subnet/remove_node.go index a8793dc29..0a5829181 100644 --- a/pkg/morph/event/subnet/remove_node.go +++ b/pkg/morph/event/subnet/remove_node.go @@ -3,10 +3,10 @@ package subnetevents import ( "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/event" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/morph/event" ) // RemoveNode structure of subnet.RemoveNode notification from morph chain. diff --git a/pkg/morph/event/subnet/remove_node_test.go b/pkg/morph/event/subnet/remove_node_test.go index 57d00326e..fc4008742 100644 --- a/pkg/morph/event/subnet/remove_node_test.go +++ b/pkg/morph/event/subnet/remove_node_test.go @@ -3,11 +3,11 @@ package subnetevents_test import ( "testing" + . "github.com/TrueCloudLab/frostfs-node/pkg/morph/event/subnet" + subnetid "github.com/TrueCloudLab/frostfs-sdk-go/subnet/id" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - . "github.com/nspcc-dev/neofs-node/pkg/morph/event/subnet" - subnetid "github.com/nspcc-dev/neofs-sdk-go/subnet/id" "github.com/stretchr/testify/require" ) diff --git a/pkg/morph/event/utils.go b/pkg/morph/event/utils.go index 5e6a33701..9ae87852e 100644 --- a/pkg/morph/event/utils.go +++ b/pkg/morph/event/utils.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + util2 "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/mempoolevent" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - util2 "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/morph/subscriber/subscriber.go b/pkg/morph/subscriber/subscriber.go index 3d9b57eaf..d4e424f1c 100644 --- a/pkg/morph/subscriber/subscriber.go +++ b/pkg/morph/subscriber/subscriber.go @@ -6,13 +6,13 @@ import ( "fmt" "sync" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "github.com/nspcc-dev/neo-go/pkg/core/block" "github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/neorpc" "github.com/nspcc-dev/neo-go/pkg/neorpc/result" "github.com/nspcc-dev/neo-go/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/morph/client" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/morph/timer/block_test.go b/pkg/morph/timer/block_test.go index a0981ca5a..bf00adc85 100644 --- a/pkg/morph/timer/block_test.go +++ b/pkg/morph/timer/block_test.go @@ -3,7 +3,7 @@ package timer_test import ( "testing" - "github.com/nspcc-dev/neofs-node/pkg/morph/timer" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/timer" "github.com/stretchr/testify/require" ) diff --git a/pkg/network/address.go b/pkg/network/address.go index f5e0345e8..22ea16faf 100644 --- a/pkg/network/address.go +++ b/pkg/network/address.go @@ -6,9 +6,9 @@ import ( "net/url" "strings" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" "github.com/multiformats/go-multiaddr" manet "github.com/multiformats/go-multiaddr/net" - "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" ) /* diff --git a/pkg/network/address_test.go b/pkg/network/address_test.go index c4e7bea2e..deac8a20f 100644 --- a/pkg/network/address_test.go +++ b/pkg/network/address_test.go @@ -48,7 +48,7 @@ func TestAddress_HostAddrString(t *testing.T) { ma multiaddr.Multiaddr exp string }{ - {buildMultiaddr("/dns4/neofs.bigcorp.com/tcp/8080", t), "neofs.bigcorp.com:8080"}, + {buildMultiaddr("/dns4/frostfs.bigcorp.com/tcp/8080", t), "frostfs.bigcorp.com:8080"}, {buildMultiaddr("/ip4/172.16.14.1/tcp/8080", t), "172.16.14.1:8080"}, {buildMultiaddr("/ip4/192.168.0.1/tcp/8888/tls", t), "grpcs://192.168.0.1:8888"}, } diff --git a/pkg/network/cache/client.go b/pkg/network/cache/client.go index 3a1edfa02..c032c2af3 100644 --- a/pkg/network/cache/client.go +++ b/pkg/network/cache/client.go @@ -5,12 +5,12 @@ import ( "sync" "time" - clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client" - "github.com/nspcc-dev/neofs-sdk-go/client" + clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "github.com/TrueCloudLab/frostfs-sdk-go/client" ) type ( - // ClientCache is a structure around neofs-sdk-go/client to reuse + // ClientCache is a structure around frostfs-sdk-go/client to reuse // already created clients. ClientCache struct { mu sync.RWMutex diff --git a/pkg/network/cache/multi.go b/pkg/network/cache/multi.go index 792863bd6..f60c1e6a8 100644 --- a/pkg/network/cache/multi.go +++ b/pkg/network/cache/multi.go @@ -6,10 +6,10 @@ import ( "fmt" "sync" - rawclient "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - clientcore "github.com/nspcc-dev/neofs-node/pkg/core/client" - "github.com/nspcc-dev/neofs-node/pkg/network" - "github.com/nspcc-dev/neofs-sdk-go/client" + rawclient "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + clientcore "github.com/TrueCloudLab/frostfs-node/pkg/core/client" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + "github.com/TrueCloudLab/frostfs-sdk-go/client" ) type multiClient struct { diff --git a/pkg/network/group.go b/pkg/network/group.go index 657d752e0..0cc523795 100644 --- a/pkg/network/group.go +++ b/pkg/network/group.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // AddressGroup represents list of network addresses of the node. diff --git a/pkg/network/group_test.go b/pkg/network/group_test.go index f53526163..5b335fa52 100644 --- a/pkg/network/group_test.go +++ b/pkg/network/group_test.go @@ -9,8 +9,8 @@ import ( func TestAddressGroup_FromStringSlice(t *testing.T) { addrs := []string{ - "/dns4/node1.neofs/tcp/8080", - "/dns4/node2.neofs/tcp/1234/tls", + "/dns4/node1.frostfs/tcp/8080", + "/dns4/node2.frostfs/tcp/1234/tls", } expected := make(AddressGroup, len(addrs)) for i := range addrs { @@ -33,8 +33,8 @@ func TestAddressGroup_FromStringSlice(t *testing.T) { func TestAddressGroup_FromIterator(t *testing.T) { addrs := testIterator{ - "/dns4/node1.neofs/tcp/8080", - "/dns4/node2.neofs/tcp/1234/tls", + "/dns4/node1.frostfs/tcp/8080", + "/dns4/node2.frostfs/tcp/1234/tls", } expected := make(AddressGroup, len(addrs)) for i := range addrs { diff --git a/pkg/network/transport/accounting/grpc/service.go b/pkg/network/transport/accounting/grpc/service.go index e15193673..0919a1f0e 100644 --- a/pkg/network/transport/accounting/grpc/service.go +++ b/pkg/network/transport/accounting/grpc/service.go @@ -3,9 +3,9 @@ package accounting import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/accounting" - accountingGRPC "github.com/nspcc-dev/neofs-api-go/v2/accounting/grpc" - accountingsvc "github.com/nspcc-dev/neofs-node/pkg/services/accounting" + "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" + accountingGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/accounting/grpc" + accountingsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting" ) // Server wraps NeoFS API Accounting service and diff --git a/pkg/network/transport/container/grpc/service.go b/pkg/network/transport/container/grpc/service.go index 308589851..db1dbe9a1 100644 --- a/pkg/network/transport/container/grpc/service.go +++ b/pkg/network/transport/container/grpc/service.go @@ -3,9 +3,9 @@ package container import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/container" - containerGRPC "github.com/nspcc-dev/neofs-api-go/v2/container/grpc" - containersvc "github.com/nspcc-dev/neofs-node/pkg/services/container" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" + containerGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/container/grpc" + containersvc "github.com/TrueCloudLab/frostfs-node/pkg/services/container" ) // Server wraps NeoFS API Container service and diff --git a/pkg/network/transport/netmap/grpc/service.go b/pkg/network/transport/netmap/grpc/service.go index dc293e0fd..f942cd13b 100644 --- a/pkg/network/transport/netmap/grpc/service.go +++ b/pkg/network/transport/netmap/grpc/service.go @@ -3,9 +3,9 @@ package grpc import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/netmap" - netmapGRPC "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc" - netmapsvc "github.com/nspcc-dev/neofs-node/pkg/services/netmap" + "github.com/TrueCloudLab/frostfs-api-go/v2/netmap" + netmapGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/netmap/grpc" + netmapsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/netmap" ) // Server wraps NeoFS API Netmap service and diff --git a/pkg/network/transport/object/grpc/get.go b/pkg/network/transport/object/grpc/get.go index bca8906bf..93bffb2a7 100644 --- a/pkg/network/transport/object/grpc/get.go +++ b/pkg/network/transport/object/grpc/get.go @@ -1,8 +1,8 @@ package object import ( - "github.com/nspcc-dev/neofs-api-go/v2/object" - objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc" + "github.com/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" ) type getStreamerV2 struct { diff --git a/pkg/network/transport/object/grpc/range.go b/pkg/network/transport/object/grpc/range.go index 4288c337a..65d4808b8 100644 --- a/pkg/network/transport/object/grpc/range.go +++ b/pkg/network/transport/object/grpc/range.go @@ -1,8 +1,8 @@ package object import ( - "github.com/nspcc-dev/neofs-api-go/v2/object" - objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc" + "github.com/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" ) type getRangeStreamerV2 struct { diff --git a/pkg/network/transport/object/grpc/search.go b/pkg/network/transport/object/grpc/search.go index b51dc51a1..cd00000fa 100644 --- a/pkg/network/transport/object/grpc/search.go +++ b/pkg/network/transport/object/grpc/search.go @@ -1,8 +1,8 @@ package object import ( - "github.com/nspcc-dev/neofs-api-go/v2/object" - objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc" + "github.com/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" ) type searchStreamerV2 struct { diff --git a/pkg/network/transport/object/grpc/service.go b/pkg/network/transport/object/grpc/service.go index 6e051719a..0ddfcde0d 100644 --- a/pkg/network/transport/object/grpc/service.go +++ b/pkg/network/transport/object/grpc/service.go @@ -5,10 +5,10 @@ import ( "errors" "io" - "github.com/nspcc-dev/neofs-api-go/v2/object" - objectGRPC "github.com/nspcc-dev/neofs-api-go/v2/object/grpc" - objectSvc "github.com/nspcc-dev/neofs-node/pkg/services/object" - "github.com/nspcc-dev/neofs-node/pkg/services/util" + "github.com/TrueCloudLab/frostfs-api-go/v2/object" + objectGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/object/grpc" + objectSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/object" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util" ) // Server wraps NeoFS API Object service and diff --git a/pkg/network/transport/reputation/grpc/service.go b/pkg/network/transport/reputation/grpc/service.go index eec4e4f7e..45a03392f 100644 --- a/pkg/network/transport/reputation/grpc/service.go +++ b/pkg/network/transport/reputation/grpc/service.go @@ -3,9 +3,9 @@ package grpcreputation import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/reputation" - reputation2 "github.com/nspcc-dev/neofs-api-go/v2/reputation/grpc" - reputationrpc "github.com/nspcc-dev/neofs-node/pkg/services/reputation/rpc" + "github.com/TrueCloudLab/frostfs-api-go/v2/reputation" + reputation2 "github.com/TrueCloudLab/frostfs-api-go/v2/reputation/grpc" + reputationrpc "github.com/TrueCloudLab/frostfs-node/pkg/services/reputation/rpc" ) // Server wraps NeoFS API v2 Reputation service server diff --git a/pkg/network/transport/session/grpc/service.go b/pkg/network/transport/session/grpc/service.go index 33de95361..e1f7e4134 100644 --- a/pkg/network/transport/session/grpc/service.go +++ b/pkg/network/transport/session/grpc/service.go @@ -3,9 +3,9 @@ package session import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/session" - sessionGRPC "github.com/nspcc-dev/neofs-api-go/v2/session/grpc" - sessionsvc "github.com/nspcc-dev/neofs-node/pkg/services/session" + "github.com/TrueCloudLab/frostfs-api-go/v2/session" + sessionGRPC "github.com/TrueCloudLab/frostfs-api-go/v2/session/grpc" + sessionsvc "github.com/TrueCloudLab/frostfs-node/pkg/services/session" ) // Server wraps NeoFS API Session service and diff --git a/pkg/network/validation.go b/pkg/network/validation.go index 8d818943a..be0224828 100644 --- a/pkg/network/validation.go +++ b/pkg/network/validation.go @@ -3,7 +3,7 @@ package network import ( "errors" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) const ( diff --git a/pkg/network/validation_test.go b/pkg/network/validation_test.go index 0c3859668..17e6d9140 100644 --- a/pkg/network/validation_test.go +++ b/pkg/network/validation_test.go @@ -3,7 +3,7 @@ package network import ( "testing" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/accounting/executor.go b/pkg/services/accounting/executor.go index 4a2c14ccb..d71980d25 100644 --- a/pkg/services/accounting/executor.go +++ b/pkg/services/accounting/executor.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/accounting" + "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" ) type ServiceExecutor interface { diff --git a/pkg/services/accounting/morph/executor.go b/pkg/services/accounting/morph/executor.go index 58280226e..0e7a65c8d 100644 --- a/pkg/services/accounting/morph/executor.go +++ b/pkg/services/accounting/morph/executor.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/accounting" - "github.com/nspcc-dev/neofs-node/pkg/morph/client/balance" - accountingSvc "github.com/nspcc-dev/neofs-node/pkg/services/accounting" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" + "github.com/TrueCloudLab/frostfs-node/pkg/morph/client/balance" + accountingSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/accounting" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) type morphExecutor struct { diff --git a/pkg/services/accounting/response.go b/pkg/services/accounting/response.go index 32eb804ad..d2d3d10e4 100644 --- a/pkg/services/accounting/response.go +++ b/pkg/services/accounting/response.go @@ -3,9 +3,9 @@ package accounting import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/accounting" - "github.com/nspcc-dev/neofs-node/pkg/services/util" - "github.com/nspcc-dev/neofs-node/pkg/services/util/response" + "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type responseService struct { diff --git a/pkg/services/accounting/server.go b/pkg/services/accounting/server.go index f76b4f4eb..b3127faba 100644 --- a/pkg/services/accounting/server.go +++ b/pkg/services/accounting/server.go @@ -3,7 +3,7 @@ package accounting import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/accounting" + "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" ) // Server is an interface of the NeoFS API Accounting service server. diff --git a/pkg/services/accounting/sign.go b/pkg/services/accounting/sign.go index 7c0e3c892..2b5f6d426 100644 --- a/pkg/services/accounting/sign.go +++ b/pkg/services/accounting/sign.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" - "github.com/nspcc-dev/neofs-api-go/v2/accounting" - "github.com/nspcc-dev/neofs-node/pkg/services/util" + "github.com/TrueCloudLab/frostfs-api-go/v2/accounting" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util" ) type signService struct { diff --git a/pkg/services/audit/auditor/context.go b/pkg/services/audit/auditor/context.go index 9727065e5..b4ef45a27 100644 --- a/pkg/services/audit/auditor/context.go +++ b/pkg/services/audit/auditor/context.go @@ -5,14 +5,14 @@ import ( "sync" "time" - "github.com/nspcc-dev/neofs-node/pkg/services/audit" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" - "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "go.uber.org/atomic" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/pdp.go b/pkg/services/audit/auditor/pdp.go index 04b996f45..89fbe9855 100644 --- a/pkg/services/audit/auditor/pdp.go +++ b/pkg/services/audit/auditor/pdp.go @@ -5,11 +5,11 @@ import ( "sync" "time" - "github.com/nspcc-dev/neofs-node/pkg/util/rand" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/tzhash/tz" + "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/tzhash/tz" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/pop.go b/pkg/services/audit/auditor/pop.go index a5b18c074..8e6f0b3d0 100644 --- a/pkg/services/audit/auditor/pop.go +++ b/pkg/services/audit/auditor/pop.go @@ -1,9 +1,9 @@ package auditor import ( - "github.com/nspcc-dev/neofs-sdk-go/netmap" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/tzhash/tz" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/tzhash/tz" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/por.go b/pkg/services/audit/auditor/por.go index cdde8cd78..9ab8cec8a 100644 --- a/pkg/services/audit/auditor/por.go +++ b/pkg/services/audit/auditor/por.go @@ -4,13 +4,13 @@ import ( "bytes" "sync" - "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" - "github.com/nspcc-dev/neofs-node/pkg/util/rand" - containerSDK "github.com/nspcc-dev/neofs-sdk-go/container" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - storagegroupSDK "github.com/nspcc-dev/neofs-sdk-go/storagegroup" - "github.com/nspcc-dev/tzhash/tz" + "github.com/TrueCloudLab/frostfs-node/pkg/services/object_manager/placement" + "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" + containerSDK "github.com/TrueCloudLab/frostfs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + storagegroupSDK "github.com/TrueCloudLab/frostfs-sdk-go/storagegroup" + "github.com/TrueCloudLab/tzhash/tz" "go.uber.org/zap" ) diff --git a/pkg/services/audit/auditor/util.go b/pkg/services/audit/auditor/util.go index 71f7c180c..e5a7469a9 100644 --- a/pkg/services/audit/auditor/util.go +++ b/pkg/services/audit/auditor/util.go @@ -1,7 +1,7 @@ package auditor import ( - "github.com/nspcc-dev/neofs-node/pkg/util/rand" + "github.com/TrueCloudLab/frostfs-node/pkg/util/rand" ) // nextRandUint64 returns random uint64 number [0; n) outside exclude map. diff --git a/pkg/services/audit/report.go b/pkg/services/audit/report.go index 61fc6241c..d3c608a95 100644 --- a/pkg/services/audit/report.go +++ b/pkg/services/audit/report.go @@ -3,9 +3,9 @@ package audit import ( "sync" - "github.com/nspcc-dev/neofs-sdk-go/audit" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/audit" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // Report tracks the progress of auditing container data. diff --git a/pkg/services/audit/task.go b/pkg/services/audit/task.go index b45c09441..5e76bfdbb 100644 --- a/pkg/services/audit/task.go +++ b/pkg/services/audit/task.go @@ -3,10 +3,10 @@ package audit import ( "context" - "github.com/nspcc-dev/neofs-node/pkg/core/storagegroup" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/core/storagegroup" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // Task groups groups the container audit parameters. diff --git a/pkg/services/audit/taskmanager/listen.go b/pkg/services/audit/taskmanager/listen.go index 1f5ef3f96..ed8bb208f 100644 --- a/pkg/services/audit/taskmanager/listen.go +++ b/pkg/services/audit/taskmanager/listen.go @@ -3,8 +3,8 @@ package audittask import ( "context" - "github.com/nspcc-dev/neofs-node/pkg/services/audit" - "github.com/nspcc-dev/neofs-node/pkg/services/audit/auditor" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" "go.uber.org/zap" ) diff --git a/pkg/services/audit/taskmanager/manager.go b/pkg/services/audit/taskmanager/manager.go index 081939e7d..69e8a344e 100644 --- a/pkg/services/audit/taskmanager/manager.go +++ b/pkg/services/audit/taskmanager/manager.go @@ -3,10 +3,10 @@ package audittask import ( "time" - "github.com/nspcc-dev/neofs-node/pkg/services/audit" - "github.com/nspcc-dev/neofs-node/pkg/services/audit/auditor" - "github.com/nspcc-dev/neofs-node/pkg/util" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit/auditor" + "github.com/TrueCloudLab/frostfs-node/pkg/util" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/audit/taskmanager/push.go b/pkg/services/audit/taskmanager/push.go index e52ac6215..ea8b84b61 100644 --- a/pkg/services/audit/taskmanager/push.go +++ b/pkg/services/audit/taskmanager/push.go @@ -1,7 +1,7 @@ package audittask import ( - "github.com/nspcc-dev/neofs-node/pkg/services/audit" + "github.com/TrueCloudLab/frostfs-node/pkg/services/audit" ) // PushTask adds a task to the queue for processing. diff --git a/pkg/services/container/announcement/load/controller/calls.go b/pkg/services/container/announcement/load/controller/calls.go index 056c31553..205f66b4c 100644 --- a/pkg/services/container/announcement/load/controller/calls.go +++ b/pkg/services/container/announcement/load/controller/calls.go @@ -3,8 +3,8 @@ package loadcontroller import ( "context" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/container" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/controller/calls_test.go b/pkg/services/container/announcement/load/controller/calls_test.go index e61c9fe78..19aa075e4 100644 --- a/pkg/services/container/announcement/load/controller/calls_test.go +++ b/pkg/services/container/announcement/load/controller/calls_test.go @@ -6,9 +6,9 @@ import ( "sync" "testing" - loadcontroller "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/controller" - "github.com/nspcc-dev/neofs-sdk-go/container" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/container/announcement/load/controller/deps.go b/pkg/services/container/announcement/load/controller/deps.go index 83bd8836d..67dba49f2 100644 --- a/pkg/services/container/announcement/load/controller/deps.go +++ b/pkg/services/container/announcement/load/controller/deps.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/nspcc-dev/neofs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-sdk-go/container" ) // UsedSpaceHandler describes the signature of the container.SizeEstimation diff --git a/pkg/services/container/announcement/load/controller/opts.go b/pkg/services/container/announcement/load/controller/opts.go index b4ca55edc..2a6ae8d83 100644 --- a/pkg/services/container/announcement/load/controller/opts.go +++ b/pkg/services/container/announcement/load/controller/opts.go @@ -1,7 +1,7 @@ package loadcontroller import ( - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/controller/util.go b/pkg/services/container/announcement/load/controller/util.go index 3542c0492..c954f7475 100644 --- a/pkg/services/container/announcement/load/controller/util.go +++ b/pkg/services/container/announcement/load/controller/util.go @@ -3,7 +3,7 @@ package loadcontroller import ( "context" - "github.com/nspcc-dev/neofs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-sdk-go/container" ) func usedSpaceFilterEpochEQ(epoch uint64) UsedSpaceFilter { diff --git a/pkg/services/container/announcement/load/route/calls.go b/pkg/services/container/announcement/load/route/calls.go index f18c10e83..d145dad6b 100644 --- a/pkg/services/container/announcement/load/route/calls.go +++ b/pkg/services/container/announcement/load/route/calls.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "sync" - loadcontroller "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/controller" - "github.com/nspcc-dev/neofs-sdk-go/container" + loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "github.com/TrueCloudLab/frostfs-sdk-go/container" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/route/deps.go b/pkg/services/container/announcement/load/route/deps.go index bef958c41..72155542b 100644 --- a/pkg/services/container/announcement/load/route/deps.go +++ b/pkg/services/container/announcement/load/route/deps.go @@ -1,8 +1,8 @@ package loadroute import ( - loadcontroller "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/controller" - "github.com/nspcc-dev/neofs-sdk-go/container" + loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "github.com/TrueCloudLab/frostfs-sdk-go/container" ) // ServerInfo describes a set of diff --git a/pkg/services/container/announcement/load/route/opts.go b/pkg/services/container/announcement/load/route/opts.go index 91a9afcc9..0fad64305 100644 --- a/pkg/services/container/announcement/load/route/opts.go +++ b/pkg/services/container/announcement/load/route/opts.go @@ -1,7 +1,7 @@ package loadroute import ( - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" "go.uber.org/zap" ) diff --git a/pkg/services/container/announcement/load/route/placement/calls.go b/pkg/services/container/announcement/load/route/placement/calls.go index 0c4fa702d..5a952c724 100644 --- a/pkg/services/container/announcement/load/route/placement/calls.go +++ b/pkg/services/container/announcement/load/route/placement/calls.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - netmapcore "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - loadroute "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/route" - "github.com/nspcc-dev/neofs-sdk-go/container" + netmapcore "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + loadroute "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/route" + "github.com/TrueCloudLab/frostfs-sdk-go/container" ) // NextStage composes container nodes for the container and epoch from a, diff --git a/pkg/services/container/announcement/load/route/placement/deps.go b/pkg/services/container/announcement/load/route/placement/deps.go index 0a4527cd9..3f3b7a94a 100644 --- a/pkg/services/container/announcement/load/route/placement/deps.go +++ b/pkg/services/container/announcement/load/route/placement/deps.go @@ -1,8 +1,8 @@ package placementrouter import ( - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" ) // PlacementBuilder describes interface of NeoFS placement calculator. diff --git a/pkg/services/container/announcement/load/route/router.go b/pkg/services/container/announcement/load/route/router.go index ba4e9c582..6f8dd5f17 100644 --- a/pkg/services/container/announcement/load/route/router.go +++ b/pkg/services/container/announcement/load/route/router.go @@ -3,7 +3,7 @@ package loadroute import ( "fmt" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" ) // Prm groups the required parameters of the Router's constructor. diff --git a/pkg/services/container/announcement/load/route/util.go b/pkg/services/container/announcement/load/route/util.go index b47934735..d0b06ae45 100644 --- a/pkg/services/container/announcement/load/route/util.go +++ b/pkg/services/container/announcement/load/route/util.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "github.com/nspcc-dev/neofs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-sdk-go/container" ) var errWrongRoute = errors.New("wrong route") diff --git a/pkg/services/container/announcement/load/storage/storage.go b/pkg/services/container/announcement/load/storage/storage.go index 9957248e6..0478b7370 100644 --- a/pkg/services/container/announcement/load/storage/storage.go +++ b/pkg/services/container/announcement/load/storage/storage.go @@ -4,8 +4,8 @@ import ( "sort" "sync" - loadcontroller "github.com/nspcc-dev/neofs-node/pkg/services/container/announcement/load/controller" - "github.com/nspcc-dev/neofs-sdk-go/container" + loadcontroller "github.com/TrueCloudLab/frostfs-node/pkg/services/container/announcement/load/controller" + "github.com/TrueCloudLab/frostfs-sdk-go/container" ) type usedSpaceEstimations struct { diff --git a/pkg/services/container/announcement/load/storage/storage_test.go b/pkg/services/container/announcement/load/storage/storage_test.go index 4b1881b8d..83407991e 100644 --- a/pkg/services/container/announcement/load/storage/storage_test.go +++ b/pkg/services/container/announcement/load/storage/storage_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - "github.com/nspcc-dev/neofs-sdk-go/container" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" "github.com/stretchr/testify/require" ) diff --git a/pkg/services/container/executor.go b/pkg/services/container/executor.go index 3fffadb95..78da59d76 100644 --- a/pkg/services/container/executor.go +++ b/pkg/services/container/executor.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/container" - "github.com/nspcc-dev/neofs-api-go/v2/session" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" + "github.com/TrueCloudLab/frostfs-api-go/v2/session" ) type ServiceExecutor interface { diff --git a/pkg/services/container/morph/executor.go b/pkg/services/container/morph/executor.go index 22c5f7be7..de35f4686 100644 --- a/pkg/services/container/morph/executor.go +++ b/pkg/services/container/morph/executor.go @@ -5,15 +5,15 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/container" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - sessionV2 "github.com/nspcc-dev/neofs-api-go/v2/session" - containercore "github.com/nspcc-dev/neofs-node/pkg/core/container" - containerSvc "github.com/nspcc-dev/neofs-node/pkg/services/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - eaclSDK "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/session" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + sessionV2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" + containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + containerSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) type morphExecutor struct { diff --git a/pkg/services/container/morph/executor_test.go b/pkg/services/container/morph/executor_test.go index 52b0da947..3a7dd7cda 100644 --- a/pkg/services/container/morph/executor_test.go +++ b/pkg/services/container/morph/executor_test.go @@ -4,19 +4,19 @@ import ( "context" "testing" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + "github.com/TrueCloudLab/frostfs-api-go/v2/session" + containerCore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + containerSvc "github.com/TrueCloudLab/frostfs-node/pkg/services/container" + containerSvcMorph "github.com/TrueCloudLab/frostfs-node/pkg/services/container/morph" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + containertest "github.com/TrueCloudLab/frostfs-sdk-go/container/test" + frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + sessiontest "github.com/TrueCloudLab/frostfs-sdk-go/session/test" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-api-go/v2/container" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-api-go/v2/session" - containerCore "github.com/nspcc-dev/neofs-node/pkg/core/container" - containerSvc "github.com/nspcc-dev/neofs-node/pkg/services/container" - containerSvcMorph "github.com/nspcc-dev/neofs-node/pkg/services/container/morph" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - containertest "github.com/nspcc-dev/neofs-sdk-go/container/test" - neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - sessiontest "github.com/nspcc-dev/neofs-sdk-go/session/test" "github.com/stretchr/testify/require" ) @@ -52,8 +52,8 @@ func TestInvalidToken(t *testing.T) { StableMarshal([]byte) []byte SetSignature(signature *refs.Signature) }) { - signer := neofsecdsa.Signer(priv.PrivateKey) - var sig neofscrypto.Signature + signer := frostfsecdsa.Signer(priv.PrivateKey) + var sig frostfscrypto.Signature require.NoError(t, sig.Calculate(signer, reqBody.StableMarshal(nil))) var sigV2 refs.Signature diff --git a/pkg/services/container/response.go b/pkg/services/container/response.go index d1ca9b8fe..f29ebce93 100644 --- a/pkg/services/container/response.go +++ b/pkg/services/container/response.go @@ -3,9 +3,9 @@ package container import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/container" - "github.com/nspcc-dev/neofs-node/pkg/services/util" - "github.com/nspcc-dev/neofs-node/pkg/services/util/response" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util/response" ) type responseService struct { diff --git a/pkg/services/container/server.go b/pkg/services/container/server.go index 090c79a00..60610f9e7 100644 --- a/pkg/services/container/server.go +++ b/pkg/services/container/server.go @@ -3,7 +3,7 @@ package container import ( "context" - "github.com/nspcc-dev/neofs-api-go/v2/container" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" ) // Server is an interface of the NeoFS API Container service server. diff --git a/pkg/services/container/sign.go b/pkg/services/container/sign.go index 51e7644f5..5aa9bbd75 100644 --- a/pkg/services/container/sign.go +++ b/pkg/services/container/sign.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" - "github.com/nspcc-dev/neofs-api-go/v2/container" - "github.com/nspcc-dev/neofs-node/pkg/services/util" + "github.com/TrueCloudLab/frostfs-api-go/v2/container" + "github.com/TrueCloudLab/frostfs-node/pkg/services/util" ) type signService struct { diff --git a/pkg/services/control/convert.go b/pkg/services/control/convert.go index 041af61e4..540e43b51 100644 --- a/pkg/services/control/convert.go +++ b/pkg/services/control/convert.go @@ -1,8 +1,8 @@ package control import ( - "github.com/nspcc-dev/neofs-api-go/v2/rpc/grpc" - "github.com/nspcc-dev/neofs-api-go/v2/rpc/message" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/grpc" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/message" ) type requestWrapper struct { diff --git a/pkg/services/control/ir/convert.go b/pkg/services/control/ir/convert.go index 24235e520..6b12d78e1 100644 --- a/pkg/services/control/ir/convert.go +++ b/pkg/services/control/ir/convert.go @@ -1,8 +1,8 @@ package control import ( - "github.com/nspcc-dev/neofs-api-go/v2/rpc/grpc" - "github.com/nspcc-dev/neofs-api-go/v2/rpc/message" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/grpc" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/message" ) type requestWrapper struct { diff --git a/pkg/services/control/ir/rpc.go b/pkg/services/control/ir/rpc.go index e7b7c2320..3082ae01e 100644 --- a/pkg/services/control/ir/rpc.go +++ b/pkg/services/control/ir/rpc.go @@ -1,8 +1,8 @@ package control import ( - "github.com/nspcc-dev/neofs-api-go/v2/rpc/client" - "github.com/nspcc-dev/neofs-api-go/v2/rpc/common" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/client" + "github.com/TrueCloudLab/frostfs-api-go/v2/rpc/common" ) const serviceName = "ircontrol.ControlService" diff --git a/pkg/services/control/ir/server/calls.go b/pkg/services/control/ir/server/calls.go index c567eed7b..8be0bd042 100644 --- a/pkg/services/control/ir/server/calls.go +++ b/pkg/services/control/ir/server/calls.go @@ -3,7 +3,7 @@ package control import ( "context" - control "github.com/nspcc-dev/neofs-node/pkg/services/control/ir" + control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/services/control/ir/server/deps.go b/pkg/services/control/ir/server/deps.go index 2fdc6751f..6c84852da 100644 --- a/pkg/services/control/ir/server/deps.go +++ b/pkg/services/control/ir/server/deps.go @@ -1,6 +1,6 @@ package control -import control "github.com/nspcc-dev/neofs-node/pkg/services/control/ir" +import control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" // HealthChecker is component interface for calculating // the current health status of a node. diff --git a/pkg/services/control/ir/server/sign.go b/pkg/services/control/ir/server/sign.go index ad2b18e9e..5dc909a60 100644 --- a/pkg/services/control/ir/server/sign.go +++ b/pkg/services/control/ir/server/sign.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - control "github.com/nspcc-dev/neofs-node/pkg/services/control/ir" - neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + control "github.com/TrueCloudLab/frostfs-node/pkg/services/control/ir" + frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" ) // SignedMessage is an interface of Control service message. @@ -56,7 +56,7 @@ func (s *Server) isValidRequest(req SignedMessage) error { sigV2.SetSign(sign.GetSign()) sigV2.SetScheme(refs.ECDSA_SHA512) - var sig neofscrypto.Signature + var sig frostfscrypto.Signature if err := sig.ReadFromV2(sigV2); err != nil { return fmt.Errorf("can't read signature: %w", err) } @@ -76,9 +76,9 @@ func SignMessage(key *ecdsa.PrivateKey, msg SignedMessage) error { return fmt.Errorf("marshal request body: %w", err) } - var sig neofscrypto.Signature + var sig frostfscrypto.Signature - err = sig.Calculate(neofsecdsa.Signer(*key), binBody) + err = sig.Calculate(frostfsecdsa.Signer(*key), binBody) if err != nil { return fmt.Errorf("calculate signature: %w", err) } diff --git a/pkg/services/control/ir/service.pb.go b/pkg/services/control/ir/service.pb.go index 9d69f51bc121450dae9b998bfd3c53c2a1b065a3..f8d0984642b47c63660267058b5e269e5c976d7f 100644 GIT binary patch delta 18 acmX?5c(8E7{>he%@)P$~Z;oKhFb4ouO9&GH delta 17 ZcmX?Dc%X2?{)rDNC+<_&9Lbnr4ggt42)Fyw-CaN`4AJ^&eQ1eE{) delta 10 RcmeB^>y?}EaN{E#J^&eW1eO2* diff --git a/pkg/services/control/ir/service_neofs.pb.go b/pkg/services/control/ir/service_neofs.pb.go index 77ce39f342072e51bd8d9322c53078ebe3400bbd..d4cbffa526acc3ecf2998cb7183ebc07aba84590 100644 GIT binary patch delta 38 qcmZqF?9iN`%$in|UtBU#%}gkys5I3%C%-hsCoxGMEV?mMLIeN=vki&> delta 31 lcmeCsY}A~f%$%2+KT*SsH?O!LIaxO)wM-u5UIp9aYyy$U`F3U0N241DF6Tf delta 19 bcmZ4ZlySjR#tFM7-maXuQ(^tf1-vNZ(eahaBz>^x#x$k-05&iWnE(I) delta 33 ncmeC*&)l(}d4e)?UTXeC4P)NC;)3L4-IUZaeW1X`T&4Q}(2@+G diff --git a/pkg/services/tree/signature.go b/pkg/services/tree/signature.go index eaeda5961..40446226e 100644 --- a/pkg/services/tree/signature.go +++ b/pkg/services/tree/signature.go @@ -7,17 +7,17 @@ import ( "errors" "fmt" + "github.com/TrueCloudLab/frostfs-api-go/v2/refs" + core "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" + cidSDK "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + frostfscrypto "github.com/TrueCloudLab/frostfs-sdk-go/crypto" + frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - core "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/client" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" - cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" - neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) @@ -132,7 +132,7 @@ func verifyMessage(m message) error { sigV2.SetSign(sig.GetSign()) sigV2.SetScheme(refs.ECDSA_SHA512) - var sigSDK neofscrypto.Signature + var sigSDK frostfscrypto.Signature if err := sigSDK.ReadFromV2(sigV2); err != nil { return fmt.Errorf("can't read signature: %w", err) } @@ -145,14 +145,14 @@ func verifyMessage(m message) error { // SignMessage uses the provided key and signs any protobuf // message that was generated for the TreeService by the -// protoc-gen-go-neofs generator. Returns any errors directly. +// protoc-gen-go-frostfs generator. Returns any errors directly. func SignMessage(m message, key *ecdsa.PrivateKey) error { binBody, err := m.ReadSignedData(nil) if err != nil { return err } - keySDK := neofsecdsa.Signer(*key) + keySDK := frostfsecdsa.Signer(*key) data, err := keySDK.Sign(binBody) if err != nil { return err @@ -218,7 +218,7 @@ var errNoAllowRules = errors.New("not found allowing rules for the request") // requests do not contain any "object" information that could be filtered and, // therefore, filtering leads to unexpected results. // The code was copied with the minor updates from the SDK repo: -// https://github.com/nspcc-dev/neofs-sdk-go/blob/43a57d42dd50dc60465bfd3482f7f12bcfcf3411/eacl/validator.go#L28. +// https://github.com/nspcc-dev/frostfs-sdk-go/blob/43a57d42dd50dc60465bfd3482f7f12bcfcf3411/eacl/validator.go#L28. func checkEACL(tb eacl.Table, signer []byte, role eacl.Role, op eacl.Operation) error { for _, record := range tb.Records() { // check type of operation diff --git a/pkg/services/tree/signature_test.go b/pkg/services/tree/signature_test.go index 6e3189cc6..79ee0a0be 100644 --- a/pkg/services/tree/signature_test.go +++ b/pkg/services/tree/signature_test.go @@ -6,19 +6,19 @@ import ( "errors" "testing" + aclV2 "github.com/TrueCloudLab/frostfs-api-go/v2/acl" + containercore "github.com/TrueCloudLab/frostfs-node/pkg/core/container" + "github.com/TrueCloudLab/frostfs-node/pkg/core/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/util/logger" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + eaclSDK "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - aclV2 "github.com/nspcc-dev/neofs-api-go/v2/acl" - containercore "github.com/nspcc-dev/neofs-node/pkg/core/container" - "github.com/nspcc-dev/neofs-node/pkg/core/netmap" - "github.com/nspcc-dev/neofs-node/pkg/util/logger" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/container" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - eaclSDK "github.com/nspcc-dev/neofs-sdk-go/eacl" - netmapSDK "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" ) diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go index 9fa6829d2..04be0ead4 100644 --- a/pkg/services/tree/sync.go +++ b/pkg/services/tree/sync.go @@ -7,10 +7,10 @@ import ( "fmt" "io" - "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/pilorama" - "github.com/nspcc-dev/neofs-node/pkg/network" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - netmapSDK "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-node/pkg/local_object_storage/pilorama" + "github.com/TrueCloudLab/frostfs-node/pkg/network" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + netmapSDK "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/pkg/services/tree/types.pb.go b/pkg/services/tree/types.pb.go index ba35057b2581e8c7a5da915a83e671701d09c9c6..340e1ac5c56e921ab08194f2a90571168efe2453 100644 GIT binary patch delta 18 acmezD^TlVv>&dB%@)KWHZ*F0HuL1yHa0ycY delta 18 acmez3^Vw&@>&ZNfl@nhnY;I+IuL1yEvIzSC diff --git a/pkg/services/tree/types.proto b/pkg/services/tree/types.proto index 317631bd5..2a1800a1f 100644 --- a/pkg/services/tree/types.proto +++ b/pkg/services/tree/types.proto @@ -5,7 +5,7 @@ syntax = "proto3"; package tree; -option go_package = "github.com/nspcc-dev/neofs-node/pkg/services/tree"; +option go_package = "github.com/TrueCloudLab/frostfs-node/pkg/services/tree"; // KeyValue represents key-value pair attached to an object. message KeyValue { diff --git a/pkg/services/tree/types_neofs.pb.go b/pkg/services/tree/types_neofs.pb.go index e6053d96b61b5927024bf2f7d244174961bd8c2b..cc18b1c991ba100807ff89f1350937c674127b11 100644 GIT binary patch delta 38 qcmX>seoB0TGHY5lepq~hGIL&P{zMI9-n`<1