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/interfaces | |
parent | 174f7c80801383cde5ea514b19fb8b108b56b31c (diff) |
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/interfaces')
-rw-r--r-- | src/interfaces/node.cpp | 6 | ||||
-rw-r--r-- | src/interfaces/node.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp index 9270351176..4189ff7497 100644 --- a/src/interfaces/node.cpp +++ b/src/interfaces/node.cpp @@ -48,11 +48,11 @@ namespace { class NodeImpl : public Node { - void parseParameters(int argc, const char* const argv[]) override + bool parseParameters(int argc, const char* const argv[], std::string& error) override { - gArgs.ParseParameters(argc, argv); + return gArgs.ParseParameters(argc, argv, error); } - void readConfigFiles() override { gArgs.ReadConfigFiles(); } + bool readConfigFiles(std::string& error) override { return gArgs.ReadConfigFiles(error); } bool softSetArg(const std::string& arg, const std::string& value) override { return gArgs.SoftSetArg(arg, value); } bool softSetBoolArg(const std::string& arg, bool value) override { return gArgs.SoftSetBoolArg(arg, value); } void selectParams(const std::string& network) override { SelectParams(network); } diff --git a/src/interfaces/node.h b/src/interfaces/node.h index 2a1a8152df..8185c015a9 100644 --- a/src/interfaces/node.h +++ b/src/interfaces/node.h @@ -38,7 +38,7 @@ public: virtual ~Node() {} //! Set command line arguments. - virtual void parseParameters(int argc, const char* const argv[]) = 0; + virtual bool parseParameters(int argc, const char* const argv[], std::string& error) = 0; //! Set a command line argument if it doesn't already have a value virtual bool softSetArg(const std::string& arg, const std::string& value) = 0; @@ -47,7 +47,7 @@ public: virtual bool softSetBoolArg(const std::string& arg, bool value) = 0; //! Load settings from configuration file. - virtual void readConfigFiles() = 0; + virtual bool readConfigFiles(std::string& error) = 0; //! Choose network parameters. virtual void selectParams(const std::string& network) = 0; |