Merge pull request #374 from ethereumjs/run-blockchain-tests-as-default

Run blockchain tests as default on CI

.circleci/config.yml

@@ -46,24 +46,6 @@ jobs:
       - run:
           name: testAPI
           command: npm run testAPI
-  test_gas_limit:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/project
-      - *restore_node_modules
-      - run:
-          name: testBlockchainBlockGasLimit
-          command: npm run testBlockchainBlockGasLimit
-  test_total_difficulty:
-    <<: *defaults
-    steps:
-      - attach_workspace:
-          at: ~/project
-      - *restore_node_modules
-      - run:
-          name: testBlockchainTotalDifficulty
-          command: npm run testBlockchainTotalDifficulty
   test_state_byzantium:
     <<: *defaults
     steps:
@@ -82,6 +64,15 @@ jobs:
       - run:
           name: testStateConstantinople
           command: npm run testStateConstantinople
+  test_blockchain:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/project
+      - *restore_node_modules
+      - run:
+          name: testBlockchain
+          command: npm run testBlockchain
   coveralls:
     <<: *defaults
     steps:
@@ -102,18 +93,15 @@ workflows:
       - test_api:
           requires:
             - install
-      - test_gas_limit:
-          requires:
-            - install
-      - test_total_difficulty:
-          requires:
-            - install
       - test_state_byzantium:
           requires:
             - install
       - test_state_constantinople:
           requires:
             - install
+      - test_blockchain:
+          requires:
+            - install
       - coveralls:
           requires:
             - install

.travis.yml

@@ -1,3 +1,5 @@
+# Travis CI runs are deactivated in favour of CircleCI build checks
+# Turn to the CircleCI configuration in .circleci directory for changing build settings
 sudo: false
 os:
   - linux

README.md

@@ -320,13 +320,6 @@ It is also possible to only run the tests from the skip lists:
 
 Tests are run on ``CircleCI`` on every PR, configuration can be found in ``.circleci/config.yml``.
 
-Since ``BlockchainTests`` take too much time to run on every PR, only a selected set
-of blockchain tests is triggered on a normal PR test run.
-
-For a complete test run, create a new branch named ``run-blockchain-tests``, rename
-``.circleci/config.yml`` -> ``.circleci/config-save.yml`` and ``.circleci/config-blockchain-tests.yml``
--> ``.circleci/config.yml`` and submit a PR with an additional ``[DO-NOT-MERGE]`` note. This will trigger a blockchain test run.
-
 ### Debugging
 
 #### Local Debugging

package.json

@@ -16,9 +16,6 @@
     "testBuildIntegrity": "npm run build:dist && node ./tests/tester -s --dist --test='stackOverflow'",
     "testBlockchain": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --excludeDir='GeneralStateTests'",
     "testBlockchainGeneralStateTests": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='GeneralStateTests'",
-    "testBlockchainBlockGasLimit": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='bcBlockGasLimitTest'",
-    "testBlockchainValid": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='bcValidBlockTest'",
-    "testBlockchainTotalDifficulty": "npm run build:dist && node --stack-size=1500 ./tests/tester -b --dist --dir='bcTotalDifficultyTest'",
     "testAPI": "tape ./tests/api/*.js",
     "test": "node ./tests/tester -a",
     "lint": "standard",