rename internal struct at network iface

Author: felipemadero

local/blockchain.go

@@ -154,14 +154,26 @@ func (ln *localNetwork) RegisterBlockchainAliases(
 	return nil
 }
 
+/*
+func (ln *localNetwork) AddSubnetValidators(
+	ctx context.Context,
+	subnetSpecs []network.SubnetValidatorsSpec,
+) error {
+	ln.lock.Lock()
+	defer ln.lock.Unlock()
+
+	return ln.addSubnetValidators(ctx, subnetSpecs)
+}
+*/
+
 func (ln *localNetwork) RemoveSubnetValidators(
 	ctx context.Context,
-	removeSubnetSpecs []network.RemoveSubnetValidatorSpec,
+	subnetSpecs []network.SubnetValidatorsSpec,
 ) error {
 	ln.lock.Lock()
 	defer ln.lock.Unlock()
 
-	return ln.removeSubnetValidators(ctx, removeSubnetSpecs)
+	return ln.removeSubnetValidators(ctx, subnetSpecs)
 }
 
 func (ln *localNetwork) AddPermissionlessValidators(
@@ -586,7 +598,7 @@ func (ln *localNetwork) restartNodes(
 	subnetIDs []ids.ID,
 	subnetSpecs []network.SubnetSpec,
 	validatorSpecs []network.PermissionlessStakerSpec,
-	removeValidatorSpecs []network.RemoveSubnetValidatorSpec,
+	removeValidatorSpecs []network.SubnetValidatorsSpec,
 	nodesToRestartForBlockchainConfigUpdate set.Set[string],
 ) (err error) {
 	if (subnetSpecs != nil && validatorSpecs != nil) || (subnetSpecs != nil && removeValidatorSpecs != nil) ||
@@ -879,7 +891,7 @@ func importPChainFromXChain(ctx context.Context, w *wallet, owner *secp256k1fx.O
 
 func (ln *localNetwork) removeSubnetValidators(
 	ctx context.Context,
-	removeSubnetSpecs []network.RemoveSubnetValidatorSpec,
+	removeSubnetSpecs []network.SubnetValidatorsSpec,
 ) error {
 	ln.log.Info("removing subnet validator tx")
 	removeSubnetSpecIDs := make([]ids.ID, len(removeSubnetSpecs))

network/network.go

@@ -47,7 +47,7 @@ type SubnetSpec struct {
 	SubnetConfig []byte
 }
 
-type RemoveSubnetValidatorSpec struct {
+type SubnetValidatorsSpec struct {
 	NodeNames []string
 	SubnetID  string
 }
@@ -120,7 +120,7 @@ type Network interface {
 	// Add a validator into an elastic subnet
 	AddPermissionlessValidators(context.Context, []PermissionlessStakerSpec) error
 	// Remove a validator from a subnet
-	RemoveSubnetValidators(context.Context, []RemoveSubnetValidatorSpec) error
+	RemoveSubnetValidators(context.Context, []SubnetValidatorsSpec) error
 	// Get the elastic subnet tx id for the given subnet id
 	GetElasticSubnetID(context.Context, ids.ID) (ids.ID, error)
 }

server/network.go

@@ -377,7 +377,7 @@ func (lc *localNetwork) AddPermissionlessValidators(ctx context.Context, validat
 	return nil
 }
 
-func (lc *localNetwork) RemoveSubnetValidator(ctx context.Context, validatorSpecs []network.RemoveSubnetValidatorSpec) error {
+func (lc *localNetwork) RemoveSubnetValidator(ctx context.Context, validatorSpecs []network.SubnetValidatorsSpec) error {
 	lc.lock.Lock()
 	defer lc.lock.Unlock()
 

server/server.go

@@ -655,7 +655,7 @@ func (s *server) RemoveSubnetValidator(
 		return nil, ErrNoValidatorSpec
 	}
 
-	validatorSpecList := []network.RemoveSubnetValidatorSpec{}
+	validatorSpecList := []network.SubnetValidatorsSpec{}
 	for _, spec := range req.GetValidatorSpec() {
 		validatorSpec := getRemoveSubnetValidatorSpec(spec)
 		validatorSpecList = append(validatorSpecList, validatorSpec)
@@ -1552,12 +1552,11 @@ func getPermissionlessValidatorSpec(
 
 func getRemoveSubnetValidatorSpec(
 	spec *rpcpb.RemoveSubnetValidatorSpec,
-) network.RemoveSubnetValidatorSpec {
-	validatorSpec := network.RemoveSubnetValidatorSpec{
+) network.SubnetValidatorsSpec {
+	return network.SubnetValidatorsSpec{
 		SubnetID:  spec.SubnetId,
 		NodeNames: spec.GetNodeNames(),
 	}
-	return validatorSpec
 }
 
 func getNetworkBlockchainSpec(