This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Change exit calls to returns in testeth, closes #4667 #4971

Open

Grubbly wants to merge 2 commits into ethereum:master from Grubbly:develop

Grubbly commented Apr 20, 2018

return should be used over exit calls because return guarentees the destructor is called for locally scoped objects.

Grubbly added 2 commits

April 19, 2018 20:05


          Change exit calls to returns in testeth

e416ffd


          Format fix and error code change

417a918

codecov-io commented Apr 20, 2018 •

edited

Codecov Report

Merging #4971 into develop will increase coverage by 0.07%.
The diff coverage is 0%.

@@             Coverage Diff             @@
##           develop    #4971      +/-   ##
===========================================
+ Coverage     61.1%   61.17%   +0.07%     
===========================================
  Files          350      350              
  Lines        28298    28291       -7     
  Branches      2886     2889       +3     
===========================================
+ Hits         17291    17308      +17     
+ Misses       10048    10021      -27     
- Partials       959      962       +3

gumb0 requested review from pirapira and winsvega

April 24, 2018 08:49

winsvega approved these changes

View reviewed changes

pirapira suggested changes

View reviewed changes

test/tools/libtesteth/ImportTest.cpp

                       // Can't use boost at this point
                       std::cerr << TestOutputHelper::get().testName() + " Specified Network not found: "
                                 << _network << "\n";
-                      exit(1);
+                      return;

Member

pirapira Apr 24, 2018

The caller of this function should terminate the test when this happens.

test/tools/libtesteth/Options.cpp

@@ @@ -127,12 +127,12 @@ Options::Options(int argc, const char** argv) @@
                       if (arg == "--help")
                       {
                           printHelp();
-                          exit(0);
+              			return;

Member

pirapira Apr 24, 2018

Make sure that the process terminates when this constructor takes this path.

test/tools/libtesteth/Options.cpp

                       }
                       else if (arg == "--version")
                       {
                           printVersion();
-                          exit(0);
+              			return;

Member

pirapira Apr 24, 2018

Make sure that the process terminates after the execution takes this path.

Collaborator

chfast Apr 24, 2018

You can throw an exception instead of silently returning.

test/tools/libtesteth/Options.cpp

@@ @@ -147,7 +147,7 @@ Options::Options(int argc, const char** argv) @@
                           g_logVerbosity = 13;
               #else
                           cerr << "--vmtrace option requires a build with cmake -DVMTRACE=1\n";
-                          exit(1);
+              			return;

Member

pirapira Apr 24, 2018

Make sure that the process terminates after the execution takes this path.

test/tools/libtesteth/Options.cpp

@@ @@ -232,7 +232,7 @@ Options::Options(int argc, const char** argv) @@
                           else
                           {
                               std::cerr << "Options file not found! Default options at: tests/src/randomCodeOptions.json\n";
-                              exit(0);
+                              return;

Member

pirapira Apr 24, 2018

Same as above.

test/tools/libtesteth/Options.cpp

@@ @@ -272,11 +272,11 @@ Options::Options(int argc, const char** argv) @@
                           if (maxCodes > 1000 || maxCodes <= 0)
                           {
                               cerr << "Argument for the option is invalid! (use range: 1...1000)\n";
-                              exit(1);
+                              return;

Member

pirapira Apr 24, 2018

Same as above.

test/tools/libtesteth/Options.cpp

                           }
                           test::RandomCodeOptions options;
                           cout << test::RandomCode::get().generate(maxCodes, options) << "\n";
-                          exit(0);
+                          return;

Member

pirapira Apr 24, 2018

Same as above.

test/tools/libtesteth/Options.cpp

@@ @@ -309,7 +309,7 @@ Options::Options(int argc, const char** argv) @@
                       else if (seenSeparator)
                       {
                           cerr << "Unknown option: " + arg << "\n";
-                          exit(1);
+                          return;

Member

pirapira Apr 24, 2018

Same as above.

test/tools/libtesteth/Options.cpp

@@ @@ -322,7 +322,7 @@ Options::Options(int argc, const char** argv) @@
                           cerr << "--createRandomTest cannot be used with any of the options: " <<
                                   "trValueIndex, trGasIndex, trDataIndex, nonetwork, singleTest, all, " <<
                                   "stats, filltests, fillchain \n";
-                          exit(1);
+                          return;

Member

pirapira Apr 24, 2018

Same as above.

test/tools/libtesteth/boostTest.cpp

@@ @@ -136,7 +136,7 @@ int main(int argc, const char* argv[]) @@
                   catch (dev::test::InvalidOption const& e)
                   {
                       std::cerr << *boost::get_error_info<errinfo_comment>(e) << "\n";
-                      exit(1);
+                      return 1;

Member

pirapira Apr 24, 2018

This one is fine.

Contributor

winsvega commented Apr 24, 2018

@chfast what are the plans for testeth in cpp client ?

Collaborator

chfast commented Apr 24, 2018

@winsvega I don't have any.

chfast changed the base branch from develop to master

August 2, 2018 08:38

axic added the testeth label

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.