diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2018-04-28 19:40:51 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2018-05-30 11:27:50 -0400 |
| commit | 4f8704d57f8fb2958a43534779b20201b77eecae (patch) | |
| tree | 4ccb64e2e65e99726786919d6d0feecde2e26377 /src/bitcoin-tx.cpp | |
| parent | 174f7c80801383cde5ea514b19fb8b108b56b31c (diff) | |
| download | bitcoin-4f8704d57f8fb2958a43534779b20201b77eecae.tar.xz | |
Give an error and exit if there are unknown parameters
If an unknown option is given via either the command line args or
the conf file, throw an error and exit
Update tests for ArgsManager knowing args
Ignore unknown options in the config file for bitcoin-cli
Fix tests and bitcoin-cli to match actual options used
Diffstat (limited to 'src/bitcoin-tx.cpp')
| -rw-r--r-- | src/bitcoin-tx.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index 8b542dc9b8..3fb505d739 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -64,6 +64,10 @@ static void SetupBitcoinTxArgs() gArgs.AddArg("load=NAME:FILENAME", "Load JSON file FILENAME into register NAME", false, OptionsCategory::REGISTER_COMMANDS); gArgs.AddArg("set=NAME:JSON-STRING", "Set register NAME to given JSON-STRING", false, OptionsCategory::REGISTER_COMMANDS); + + // Hidden + gArgs.AddArg("-h", "", false, OptionsCategory::HIDDEN); + gArgs.AddArg("-help", "", false, OptionsCategory::HIDDEN); } // @@ -76,7 +80,11 @@ static int AppInitRawTx(int argc, char* argv[]) // Parameters // SetupBitcoinTxArgs(); - gArgs.ParseParameters(argc, argv); + std::string error; + if (!gArgs.ParseParameters(argc, argv, error)) { + fprintf(stderr, "Error parsing command line arguments: %s\n", error.c_str()); + return EXIT_FAILURE; + } // Check for -testnet or -regtest parameter (Params() calls are only valid after this clause) try { |