*: Drop subnets support

See nspcc-dev/neofs-api#261. Signed-off-by: Pavel Karpy <carpawell@morphbits.io>
notimetoname · Jun 29, 2023 · d42e1b4 · d42e1b4
1 parent 5ca26a8
commit d42e1b4
Show file tree

Hide file tree

Showing 57 changed files with 93 additions and 3,218 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Changelog for NeoFS Node
 ### Removed
 - Deprecated `morph.rpc_endpoint` SN and `morph.endpoint.client` IR config sections (#2400)
 - `neofs_node_object_epoch` metric for IR and SN (#2347)
+- Subnets support (#2411)
 
 ### Changed
 - CLI `--timeout` flag configures whole execution timeout from now (#2124)
@@ -32,6 +33,11 @@ have been removed. Use `morph.endpoints` for both instead.
 Deprecated `neofs_node_object_epoch` metric for IR and SN (the same for both)
 has been removed. Use `neofs_node_state_epoch` for SN and `neofs_ir_state_epoch`
 for IR instead.
+Subnets support has been removed:
+- IR's `workers.subnet` and `contracts.subnet` configs are not used anymore.
+- SN's `node.subnet` config section is not used anymore.
+- `neoofs-amd morph` does not have `subnet` subcommand anymore.
+- `neofs-cli container create` does not have `--subnet` flag anymore.
 
 ## [0.37.0] - 2023-06-15 - Sogado
 

diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go b/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go
@@ -47,7 +47,6 @@ const (
 	netmapContract     = "netmap"
 	proxyContract      = "proxy"
 	reputationContract = "reputation"
-	subnetContract     = "subnet"
 )
 
 const (
@@ -77,7 +76,6 @@ var (
 		netmapContract,
 		proxyContract,
 		reputationContract,
-		subnetContract,
 	}
 
 	fullContractList = append([]string{
@@ -597,7 +595,6 @@ func (c *initializeContext) getContractDeployData(ctrHash util.Uint160, ctrName
 	case proxyContract:
 		items = nil
 	case reputationContract:
-	case subnetContract:
 	default:
 		panic(fmt.Sprintf("invalid contract name: %s", ctrName))
 	}

diff --git a/cmd/neofs-adm/internal/modules/morph/internal/types.go b/cmd/neofs-adm/internal/modules/morph/internal/types.go
diff --git a/cmd/neofs-adm/internal/modules/morph/internal/types.pb.go b/cmd/neofs-adm/internal/modules/morph/internal/types.pb.go
diff --git a/cmd/neofs-adm/internal/modules/morph/internal/types.proto b/cmd/neofs-adm/internal/modules/morph/internal/types.proto
diff --git a/cmd/neofs-adm/internal/modules/morph/root.go b/cmd/neofs-adm/internal/modules/morph/root.go
@@ -344,8 +344,6 @@ func init() {
 	refillGasCmd.Flags().String(refillGasAmountFlag, "", "Additional amount of GAS to transfer")
 	refillGasCmd.MarkFlagsMutuallyExclusive(walletAddressFlag, storageWalletFlag)
 
-	RootCmd.AddCommand(cmdSubnet)
-
 	RootCmd.AddCommand(depositNotaryCmd)
 	depositNotaryCmd.Flags().StringP(endpointFlag, "r", "", "N3 RPC node endpoint")
 	depositNotaryCmd.Flags().String(storageWalletFlag, "", "Path to storage node wallet")