Address minor review issues

ethereum · Jan 30, 2019 · 8b3cfa0 · 8b3cfa0
1 parent 2df73ac
commit 8b3cfa0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/libaleth-interpreter/VM.cpp b/libaleth-interpreter/VM.cpp
@@ -1360,13 +1360,12 @@ void VM::interpretCases()
                 m_runGas = VMSchedule::sstoreSetGas;
             else if (status == EVMC_STORAGE_MODIFIED || status == EVMC_STORAGE_DELETED)
                 m_runGas = VMSchedule::sstoreResetGas;
-            else if (status == EVMC_STORAGE_UNCHANGED &&
-                     (m_rev < EVMC_CONSTANTINOPLE || m_rev >= EVMC_CONSTANTINOPLE2))
+            else if (status == EVMC_STORAGE_UNCHANGED && m_rev != EVMC_CONSTANTINOPLE)
                 m_runGas = VMSchedule::sstoreResetGas;
             else
             {
                 assert(status == EVMC_STORAGE_UNCHANGED || status == EVMC_STORAGE_MODIFIED_AGAIN);
-                assert(m_rev >= EVMC_CONSTANTINOPLE && m_rev < EVMC_CONSTANTINOPLE2);
+                assert(m_rev == EVMC_CONSTANTINOPLE);
                 m_runGas = VMSchedule::sstoreUnchangedGas;
             }
 

diff --git a/test/unittests/libtesteth/testHelperTest.cpp b/test/unittests/libtesteth/testHelperTest.cpp
@@ -32,8 +32,8 @@ BOOST_AUTO_TEST_CASE(translateNetworks_gtConstantinople)
 {
     set<string> networks = {">Constantinople"};
     networks = test::translateNetworks(networks);
-    BOOST_REQUIRE(networks.count("Constantinople") == 0);
-    BOOST_REQUIRE(networks.count("ConstantinopleFix") == 1);
+    BOOST_CHECK(!contains(networks, "Constantinople"));
+    BOOST_CHECK(contains(networks, "ConstantinopleFix"));
 }
 
 BOOST_AUTO_TEST_CASE(translateNetworks_gtHomestead)