From 1f6dc37cf1771660b7d8f15d34012d356e4ffa34 Mon Sep 17 00:00:00 2001 From: Svetoslav Blyahov Date: Tue, 29 Oct 2024 22:51:43 +0200 Subject: [PATCH 1/2] Add error messages for contradicting flags Signed-off-by: Svetoslav Blyahov --- cmd/init.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/cmd/init.go b/cmd/init.go index 212f355..d61deeb 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -92,6 +92,14 @@ func initCommon(args []string) error { return err } + if err := validateRemoteNodeVsBlockChainNodeFlags(initOptions.RemoteNodeURL, initOptions.BlockchainNodeProvider); err != nil { + return err + } + + if err := validateRemoteNodeDeployVsContractAddressFlags(initOptions.RemoteNodeDeploy, initOptions.ContractAddress); err != nil { + return err + } + fmt.Println("initializing new FireFly stack...") if len(args) > 0 { @@ -260,6 +268,20 @@ func validatePrivateTransactionManagerBlockchainConnectorCombination(privateTran return nil } +func validateRemoteNodeVsBlockChainNodeFlags(remoteNodeUrl, blockchainNodePorvider string) error { + if len(remoteNodeUrl) != 0 && blockchainNodePorvider != "geth" { + return errors.New("`remote-noted-url` and `blockchain-node` can't both be specified") + } + return nil +} + +func validateRemoteNodeDeployVsContractAddressFlags(remoteNodeDeploy bool, contractAddress string) error { + if remoteNodeDeploy && len(contractAddress) != 0 { + return errors.New("`contract-address` and `remote-node-deploy` can't both be specified") + } + return nil +} + func validateTokensProvider(input []string, blockchainNodeProviderInput string) error { tokenProviders := make([]fftypes.FFEnum, len(input)) for i, t := range input { From 47a6cbcfcd6c444772576f0aa0fefb897c905c8d Mon Sep 17 00:00:00 2001 From: Svetoslav Blyahov Date: Wed, 13 Nov 2024 10:46:01 +0200 Subject: [PATCH 2/2] fixup! Add error messages for contradicting flags --- cmd/init.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/init.go b/cmd/init.go index d61deeb..8907bb6 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -270,14 +270,14 @@ func validatePrivateTransactionManagerBlockchainConnectorCombination(privateTran func validateRemoteNodeVsBlockChainNodeFlags(remoteNodeUrl, blockchainNodePorvider string) error { if len(remoteNodeUrl) != 0 && blockchainNodePorvider != "geth" { - return errors.New("`remote-noted-url` and `blockchain-node` can't both be specified") + return errors.New("both flags `remote-node-url` and `blockchain-node` can't be specified") } return nil } func validateRemoteNodeDeployVsContractAddressFlags(remoteNodeDeploy bool, contractAddress string) error { if remoteNodeDeploy && len(contractAddress) != 0 { - return errors.New("`contract-address` and `remote-node-deploy` can't both be specified") + return errors.New("both flags `contract-address` and `remote-node-deploy` can't be specified") } return nil }