Rename relayer allow private peers (#2409)

* reenable allow private peers param

* update dep

* lint

cmd/blockchaincmd/add_validator.go

@@ -69,6 +69,7 @@ var (
 	errMutuallyExclusiveWeightOptions   = errors.New("--use-default-validator-params and --weight are mutually exclusive")
 	ErrNotPermissionedSubnet            = errors.New("subnet is not permissioned")
 	aggregatorExtraEndpoints            []string
+	aggregatorAllowPrivatePeers         bool
 	clusterNameFlagValue                string
 )
 
@@ -103,6 +104,7 @@ Testnet or Mainnet.`,
 	cmd.Flags().StringVar(&disableOwnerAddr, "disable-owner", "", "P-Chain address that will able to disable the validator with a P-Chain transaction")
 	cmd.Flags().StringVar(&nodeEndpoint, "node-endpoint", "", "gather node id/bls from publicly available avalanchego apis on the given endpoint")
 	cmd.Flags().StringSliceVar(&aggregatorExtraEndpoints, "aggregator-extra-endpoints", nil, "endpoints for extra nodes that are needed in signature aggregation")
+	cmd.Flags().BoolVar(&aggregatorAllowPrivatePeers, "aggregator-allow-private-peers", true, "allow the signature aggregator to connect to peers with private IP")
 	privateKeyFlags.AddToCmd(cmd, "to pay fees for completing the validator's registration (blockchain gas token)")
 	cmd.Flags().StringVar(&rpcURL, "rpc", "", "connect to validator manager at the given rpc endpoint")
 	cmd.Flags().StringVar(&aggregatorLogLevel, "aggregator-log-level", "Off", "log level to use with signature aggregator")
@@ -382,6 +384,7 @@ func CallAddValidator(
 		disableOwners,
 		weight,
 		extraAggregatorPeers,
+		aggregatorAllowPrivatePeers,
 		aggregatorLogLevel,
 		pos,
 		delegationFee,
@@ -413,6 +416,7 @@ func CallAddValidator(
 		ownerPrivateKey,
 		validationID,
 		extraAggregatorPeers,
+		aggregatorAllowPrivatePeers,
 		aggregatorLogLevel,
 	); err != nil {
 		return err

cmd/blockchaincmd/deploy.go

@@ -189,6 +189,7 @@ so you can take your locally tested Subnet and deploy it on Fuji or Mainnet.`,
 	cmd.Flags().BoolVar(&convertOnly, "convert-only", false, "avoid node track, restart and poa manager setup")
 	cmd.Flags().StringVar(&aggregatorLogLevel, "aggregator-log-level", "Off", "log level to use with signature aggregator")
 	cmd.Flags().StringSliceVar(&aggregatorExtraEndpoints, "aggregator-extra-endpoints", nil, "endpoints for extra nodes that are needed in signature aggregation")
+	cmd.Flags().BoolVar(&aggregatorAllowPrivatePeers, "aggregator-allow-private-peers", true, "allow the signature aggregator to connect to peers with private IP")
 	cmd.Flags().BoolVar(&useLocalMachine, "use-local-machine", false, "use local machine as a blockchain validator")
 	cmd.Flags().IntVar(&numBootstrapValidators, "num-bootstrap-validators", 0, "(only if --generate-node-id is true) number of bootstrap validators to set up in sovereign L1 validator)")
 	cmd.Flags().IntVar(&numLocalNodes, "num-local-nodes", 0, "number of nodes to be created on local machine")
@@ -1036,6 +1037,7 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 					network,
 					genesisPrivateKey,
 					extraAggregatorPeers,
+					aggregatorAllowPrivatePeers,
 					logLvl,
 					validatorManagerSDK.PoSParams{
 						MinimumStakeAmount:      big.NewInt(int64(poSMinimumStakeAmount)),
@@ -1052,7 +1054,13 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
 				ux.Logger.GreenCheckmarkToUser("Proof of Stake Validator Manager contract successfully initialized on blockchain %s", blockchainName)
 			} else {
 				ux.Logger.PrintToUser("Initializing Proof of Authority Validator Manager contract on blockchain %s ...", blockchainName)
-				if err := subnetSDK.InitializeProofOfAuthority(network, genesisPrivateKey, extraAggregatorPeers, logLvl); err != nil {
+				if err := subnetSDK.InitializeProofOfAuthority(
+					network,
+					genesisPrivateKey,
+					extraAggregatorPeers,
+					aggregatorAllowPrivatePeers,
+					logLvl,
+				); err != nil {
 					return err
 				}
 				ux.Logger.GreenCheckmarkToUser("Proof of Authority Validator Manager contract successfully initialized on blockchain %s", blockchainName)

cmd/blockchaincmd/remove_validator.go

@@ -58,6 +58,7 @@ these prompts by providing the values with flags.`,
 	cmd.Flags().StringVar(&nodeIDStr, "node-id", "", "node-id of the validator")
 	cmd.Flags().StringVar(&nodeEndpoint, "node-endpoint", "", "remove validator that responds to the given endpoint")
 	cmd.Flags().StringSliceVar(&aggregatorExtraEndpoints, "aggregator-extra-endpoints", nil, "endpoints for extra nodes that are needed in signature aggregation")
+	cmd.Flags().BoolVar(&aggregatorAllowPrivatePeers, "aggregator-allow-private-peers", true, "allow the signature aggregator to connect to peers with private IP")
 	privateKeyFlags.AddToCmd(cmd, "to pay fees for completing the validator's removal (blockchain gas token)")
 	cmd.Flags().StringVar(&rpcURL, "rpc", "", "connect to validator manager at the given rpc endpoint")
 	cmd.Flags().StringVar(&aggregatorLogLevel, "aggregator-log-level", "Off", "log level to use with signature aggregator")
@@ -261,6 +262,7 @@ func removeValidatorSOV(
 		ownerPrivateKey,
 		nodeID,
 		extraAggregatorPeers,
+		aggregatorAllowPrivatePeers,
 		aggregatorLogLevel,
 		sc.PoS(),
 		force,
@@ -284,6 +286,7 @@ func removeValidatorSOV(
 		ownerPrivateKey,
 		validationID,
 		extraAggregatorPeers,
+		aggregatorAllowPrivatePeers,
 		aggregatorLogLevel,
 	); err != nil {
 		return err

cmd/contractcmd/init_validator_manager.go

@@ -23,11 +23,12 @@ import (
 )
 
 type ValidatorManagerFlags struct {
-	Network                  networkoptions.NetworkFlags
-	PrivateKeyFlags          contract.PrivateKeyFlags
-	rpcEndpoint              string
-	aggregatorLogLevel       string
-	aggregatorExtraEndpoints []string
+	Network                     networkoptions.NetworkFlags
+	PrivateKeyFlags             contract.PrivateKeyFlags
+	rpcEndpoint                 string
+	aggregatorLogLevel          string
+	aggregatorExtraEndpoints    []string
+	aggregatorAllowPrivatePeers bool
 }
 
 type POSManagerSpecFlags struct {
@@ -64,6 +65,7 @@ func newInitValidatorManagerCmd() *cobra.Command {
 	validatorManagerFlags.PrivateKeyFlags.AddToCmd(cmd, "as contract deployer")
 	cmd.Flags().StringVar(&validatorManagerFlags.rpcEndpoint, "rpc", "", "deploy the contract into the given rpc endpoint")
 	cmd.Flags().StringSliceVar(&validatorManagerFlags.aggregatorExtraEndpoints, "aggregator-extra-endpoints", nil, "endpoints for extra nodes that are needed in signature aggregation")
+	cmd.Flags().BoolVar(&validatorManagerFlags.aggregatorAllowPrivatePeers, "aggregator-allow-private-peers", true, "allow the signature aggregator to connect to peers with private IP")
 	cmd.Flags().StringVar(&validatorManagerFlags.aggregatorLogLevel, "aggregator-log-level", "Off", "log level to use with signature aggregator")
 
 	cmd.Flags().StringVar(&initPOSManagerFlags.rewardCalculatorAddress, "pos-reward-calculator-address", "", "(PoS only) initialize the ValidatorManager with reward calculator address")
@@ -184,6 +186,7 @@ func initValidatorManager(_ *cobra.Command, args []string) error {
 			network,
 			privateKey,
 			extraAggregatorPeers,
+			validatorManagerFlags.aggregatorAllowPrivatePeers,
 			validatorManagerFlags.aggregatorLogLevel,
 		); err != nil {
 			return err
@@ -199,6 +202,7 @@ func initValidatorManager(_ *cobra.Command, args []string) error {
 			network,
 			privateKey,
 			extraAggregatorPeers,
+			validatorManagerFlags.aggregatorAllowPrivatePeers,
 			validatorManagerFlags.aggregatorLogLevel,
 			validatorManagerSDK.PoSParams{
 				MinimumStakeAmount:      big.NewInt(int64(initPOSManagerFlags.minimumStakeAmount)),

go.mod

@@ -5,9 +5,9 @@ go 1.22.10
 require (
 	github.com/ava-labs/apm v1.0.0
 	github.com/ava-labs/avalanche-network-runner v1.8.4-0.20241130135139-a0946c5366be
-	github.com/ava-labs/avalanchego v1.12.0
+	github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e
 	github.com/ava-labs/coreth v0.13.9-rc.1
-	github.com/ava-labs/icm-services v1.4.1-0.20241204155340-088ac5680293
+	github.com/ava-labs/icm-services v1.4.1-0.20241206150258-be351e56eea0
 	github.com/ava-labs/subnet-evm v0.6.12
 	github.com/aws/aws-sdk-go-v2 v1.32.6
 	github.com/aws/aws-sdk-go-v2/config v1.28.6
@@ -45,7 +45,7 @@ require (
 	golang.org/x/mod v0.22.0
 	golang.org/x/net v0.31.0
 	golang.org/x/oauth2 v0.23.0
-	golang.org/x/sync v0.9.0
+	golang.org/x/sync v0.10.0
 	golang.org/x/text v0.20.0
 	google.golang.org/api v0.184.0
 	google.golang.org/protobuf v1.35.2
@@ -223,7 +223,7 @@ require (
 	gonum.org/v1/gonum v0.11.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.68.0 // indirect
+	google.golang.org/grpc v1.68.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

go.sum

@@ -85,12 +85,12 @@ github.com/ava-labs/apm v1.0.0 h1:6FwozH67hEkbWVsOXNZGexBy5KLpNeYucN9zcFUHv+Q=
 github.com/ava-labs/apm v1.0.0/go.mod h1:TJL7pTlZNvQatsQPsLUtDHApEwVZ/qS7iSNtRFU83mc=
 github.com/ava-labs/avalanche-network-runner v1.8.4-0.20241130135139-a0946c5366be h1:6KxDYXwG5ErQl4+mHhLhj+j71CzHYJVTRd9onWYs6gE=
 github.com/ava-labs/avalanche-network-runner v1.8.4-0.20241130135139-a0946c5366be/go.mod h1:TOfc8r6sxs01mi2mWOYsRcJAbf3x3a4x0uxi8gVThso=
-github.com/ava-labs/avalanchego v1.12.0 h1:NBx0vSOY1dCT0PeJzojIhNhx0NMQNem4GgTEN+v8Sx4=
-github.com/ava-labs/avalanchego v1.12.0/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0=
+github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e h1:pJJYryEedoOobUPuRNUYBwQgsaQXMqBkeMq28lRDpSo=
+github.com/ava-labs/avalanchego v1.12.1-0.20241203223023-13e07a1b3a1e/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0=
 github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU=
 github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo=
-github.com/ava-labs/icm-services v1.4.1-0.20241204155340-088ac5680293 h1:sG3bGDbR/ylZJkUDiMhZYZq8FRFK/j/EpGTvCZDorQM=
-github.com/ava-labs/icm-services v1.4.1-0.20241204155340-088ac5680293/go.mod h1:3mvatxLz24pHyTQtWmrnCUryq1pjfIxWEzVCAaIXV9Y=
+github.com/ava-labs/icm-services v1.4.1-0.20241206150258-be351e56eea0 h1:tmR+oBO0ODzFDIkur/6tcruo+nLFu6dxXKYvB2XTqIA=
+github.com/ava-labs/icm-services v1.4.1-0.20241206150258-be351e56eea0/go.mod h1:insjVlfHLuCnEA2ZFbclnGAanO9EeXkryQO04WBSgE8=
 github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60 h1:EL66gtXOAwR/4KYBjOV03LTWgkEXvLePribLlJNu4g0=
 github.com/ava-labs/ledger-avalanche/go v0.0.0-20241009183145-e6f90a8a1a60/go.mod h1:/7qKobTfbzBu7eSTVaXMTr56yTYk4j2Px6/8G+idxHo=
 github.com/ava-labs/subnet-evm v0.6.12 h1:jL3FmjdFcNfS0qwbehwN6DkAg9y7zexB1riiGBxRsM0=
@@ -1050,8 +1050,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1239,8 +1239,8 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
-google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
+google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0=
+google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

pkg/validatormanager/registration.go

@@ -361,6 +361,7 @@ func InitValidatorRegistration(
 	disableOwners warpMessage.PChainOwner,
 	weight uint64,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevelStr string,
 	initWithPos bool,
 	delegationFee uint16,
@@ -455,7 +456,7 @@ func InitValidatorRegistration(
 		network,
 		aggregatorLogLevel,
 		0,
-		network.Kind == models.Local,
+		aggregatorAllowPrivatePeers,
 		aggregatorExtraPeerEndpoints,
 		subnetID,
 		blockchainID,
@@ -478,6 +479,7 @@ func FinishValidatorRegistration(
 	privateKey string,
 	validationID ids.ID,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevelStr string,
 ) error {
 	subnetID, err := contract.GetSubnetID(
@@ -498,7 +500,7 @@ func FinishValidatorRegistration(
 		rpcURL,
 		aggregatorLogLevel,
 		0,
-		network.Kind == models.Local,
+		aggregatorAllowPrivatePeers,
 		aggregatorExtraPeerEndpoints,
 		subnetID,
 		validationID,

pkg/validatormanager/removal.go

@@ -124,6 +124,7 @@ func InitValidatorRemoval(
 	ownerPrivateKey string,
 	nodeID ids.NodeID,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevelStr string,
 	initWithPos bool,
 	force bool,
@@ -178,7 +179,7 @@ func InitValidatorRemoval(
 		network,
 		aggregatorLogLevel,
 		0,
-		network.Kind == models.Local,
+		aggregatorAllowPrivatePeers,
 		aggregatorExtraPeerEndpoints,
 		subnetID,
 		blockchainID,
@@ -217,6 +218,7 @@ func FinishValidatorRemoval(
 	privateKey string,
 	validationID ids.ID,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevelStr string,
 ) error {
 	managerAddress := common.HexToAddress(validatorManagerSDK.ProxyContractAddress)
@@ -237,7 +239,7 @@ func FinishValidatorRemoval(
 		rpcURL,
 		aggregatorLogLevel,
 		0,
-		network.Kind == models.Local,
+		aggregatorAllowPrivatePeers,
 		aggregatorExtraPeerEndpoints,
 		subnetID,
 		validationID,

pkg/validatormanager/validatormanager.go

@@ -111,13 +111,14 @@ func SetupPoA(
 	network models.Network,
 	privateKey string,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevelStr string,
 ) error {
 	aggregatorLogLevel, err := logging.ToLevel(aggregatorLogLevelStr)
 	if err != nil {
 		aggregatorLogLevel = defaultAggregatorLogLevel
 	}
-	return subnet.InitializeProofOfAuthority(network, privateKey, aggregatorExtraPeerEndpoints, aggregatorLogLevel)
+	return subnet.InitializeProofOfAuthority(network, privateKey, aggregatorExtraPeerEndpoints, aggregatorAllowPrivatePeers, aggregatorLogLevel)
 }
 
 // setups PoA manager after a successful execution of
@@ -130,6 +131,7 @@ func SetupPoS(
 	network models.Network,
 	privateKey string,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevelStr string,
 	posParams validatorManagerSDK.PoSParams,
 ) error {
@@ -140,6 +142,7 @@ func SetupPoS(
 	return subnet.InitializeProofOfStake(network,
 		privateKey,
 		aggregatorExtraPeerEndpoints,
+		aggregatorAllowPrivatePeers,
 		aggregatorLogLevel,
 		posParams,
 	)

sdk/blockchain/blockchain.go

@@ -345,6 +345,7 @@ func (c *Subnet) InitializeProofOfAuthority(
 	network models.Network,
 	privateKey string,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevel logging.Level,
 ) error {
 	if c.SubnetID == ids.Empty {
@@ -393,7 +394,7 @@ func (c *Subnet) InitializeProofOfAuthority(
 		network,
 		aggregatorLogLevel,
 		0,
-		network.Kind == models.Local,
+		aggregatorAllowPrivatePeers,
 		aggregatorExtraPeerEndpoints,
 		c.SubnetID,
 		c.BlockchainID,
@@ -424,6 +425,7 @@ func (c *Subnet) InitializeProofOfStake(
 	network models.Network,
 	privateKey string,
 	aggregatorExtraPeerEndpoints []info.Peer,
+	aggregatorAllowPrivatePeers bool,
 	aggregatorLogLevel logging.Level,
 	posParams validatormanager.PoSParams,
 ) error {
@@ -451,7 +453,7 @@ func (c *Subnet) InitializeProofOfStake(
 		network,
 		aggregatorLogLevel,
 		0,
-		network.Kind == models.Local,
+		aggregatorAllowPrivatePeers,
 		aggregatorExtraPeerEndpoints,
 		c.SubnetID,
 		c.BlockchainID,

sdk/interchain/signature-aggregator.go

@@ -54,7 +54,6 @@ func createAppRequestNetwork(
 	allowPrivatePeers bool,
 	extraPeerEndpoints []info.Peer,
 ) (peers.AppRequestNetwork, error) {
-	_ = allowPrivatePeers
 	peerNetwork, err := peers.NewNetwork(
 		logLevel,
 		registerer,
@@ -68,6 +67,7 @@ func createAppRequestNetwork(
 				BaseURL: network.Endpoint,
 			},
 		},
+		allowPrivatePeers,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create peer network: %w", err)

tests/e2e/testcases/validatormanager/suite.go

@@ -211,7 +211,7 @@ var _ = ginkgo.Describe("[Validator Manager POA Set Up]", ginkgo.Ordered, func()
 			BootstrapValidators: avaGoBootstrapValidators,
 		}
 
-		err = subnetSDK.InitializeProofOfAuthority(network, k.PrivKeyHex(), extraAggregatorPeers, logging.Off)
+		err = subnetSDK.InitializeProofOfAuthority(network, k.PrivKeyHex(), extraAggregatorPeers, true, logging.Off)
 		gomega.Expect(err).Should(gomega.BeNil())
 	})
 })