better error when client config is incorrect

ethereum · Nov 26, 2019 · 7fdbe6c · 7fdbe6c
1 parent 1fa84b5
commit 7fdbe6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/retesteth/configs/ClientConfig.h b/retesteth/configs/ClientConfig.h
@@ -40,10 +40,12 @@ struct ClientConfigID
 class ClientConfig : public object
 {
 public:
-    ClientConfig(DataObject const& _obj, ClientConfigID const& _id, fs::path _shell = fs::path())
+    ClientConfig(fs::path const& _clientConfigPath, DataObject const& _obj,
+        ClientConfigID const& _id, fs::path _shell = fs::path())
       : object(_obj), m_shellPath(_shell), m_id(_id)
     {
-        requireJsonFields(_obj, "ClientConfig ",
+        m_configFilePath = _clientConfigPath;
+        requireJsonFields(_obj, "ClientConfig (" + m_configFilePath.string() + ")",
             {
                 {"name", {DataType::String}},
                 {"socketType", {DataType::String}},
@@ -125,7 +127,6 @@ class ClientConfig : public object
     {
         m_configCorrectMiningRewardFilePath = _path;
     }
-    void setConfigFilePath(fs::path const& _path) { m_configFilePath = _path; }
     DataObject const& getMiningRewardInfo() const { return m_correctReward; }
 
 private:

diff --git a/retesteth/configs/Options.cpp b/retesteth/configs/Options.cpp
@@ -113,9 +113,8 @@ std::vector<ClientConfig> const& Options::DynamicOptions::getClientConfigs()
             ETH_FAIL_REQUIRE_MESSAGE(fs::exists(configFilePath),
                 string("Client config not found: ") + configFilePath.c_str());
 
-            ClientConfig cfg(test::readJsonData(configFilePath), ClientConfigID(),
+            ClientConfig cfg(configFilePath, test::readJsonData(configFilePath), ClientConfigID(),
                 configPath / string(clientName + ".sh"));
-            cfg.setConfigFilePath(configFilePath);
 
             // Load genesis templates
             fs::path genesisTemplatePath = configPath / "genesis";