Test PR

.gitignore

@@ -120,3 +120,12 @@ libzcashconsensus.pc
 
 contrib/debian/files
 contrib/debian/substvars
+src/zendoo/mcTest
+
+# IDE files
+/.idea
+/*.iml
+# pyenv
+.python-version
+# custom folders
+./test/

.travis.yml

@@ -2,13 +2,7 @@ language: shell
 
 os: linux
 
-.com.github.horizenofficial.zen.env-definitions:
-  - &docker_amd64_linux_ubuntu_xenial
-    env:
-      - DOCKER_ARCH=amd64
-      - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_xenial
-      - DOCKER_IS_DEB=true
+.com.github.horizenofficial.zend_oo.env-definitions:
   - &docker_amd64_linux_ubuntu_bionic
     env:
       - DOCKER_ARCH=amd64
@@ -21,77 +15,99 @@ os: linux
       - DOCKER_TARGET_OS=windows
       - DOCKER_FROM=ubuntu_bionic
       - DOCKER_IS_DEB=true
-  - &docker_amd64_linux_ubuntu_xenial_unit-tests
+  - &docker_amd64_linux_ubuntu_focal
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_xenial
+      - DOCKER_FROM=ubuntu_focal
+      - DOCKER_IS_DEB=true
+  - &docker_amd64_linux_ubuntu_bionic_unit-tests
+    env:
+      - DOCKER_ARCH=amd64
+      - DOCKER_TARGET_OS=linux
+      - DOCKER_FROM=ubuntu_bionic
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
       - TEST_ARGS="btest gtest sec-hard no-dot-so util-test secp256k1 libsnark univalue"
-  - &docker_amd64_linux_ubuntu_xenial_rpc-tests_1
+  - &docker_amd64_linux_ubuntu_bionic_rpc-tests_1
+    env:
+      - DOCKER_ARCH=amd64
+      - DOCKER_TARGET_OS=linux
+      - DOCKER_FROM=ubuntu_bionic
+      - DOCKER_IS_DEB=true
+      - TEST_CMD="./qa/zcash/full_test_suite.py"
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:1"
+  - &docker_amd64_linux_ubuntu_bionic_rpc-tests_2
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_xenial
+      - DOCKER_FROM=ubuntu_bionic
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
-      - TEST_ARGS="rpc --rpc-extended --rpc-split=3:1"
-  - &docker_amd64_linux_ubuntu_xenial_rpc-tests_2
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:2"
+  - &docker_amd64_linux_ubuntu_bionic_rpc-tests_3
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_xenial
+      - DOCKER_FROM=ubuntu_bionic
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
-      - TEST_ARGS="rpc --rpc-extended --rpc-split=3:2"
-  - &docker_amd64_linux_ubuntu_xenial_rpc-tests_3
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:3"
+  - &docker_amd64_linux_ubuntu_bionic_rpc-tests_4
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_xenial
+      - DOCKER_FROM=ubuntu_bionic
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
-      - TEST_ARGS="rpc --rpc-extended --rpc-split=3:3"
-  - &docker_amd64_linux_ubuntu_xenial_test-fetch-params
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:4"
+  - &docker_amd64_linux_ubuntu_bionic_test-fetch-params
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_xenial
+      - DOCKER_FROM=ubuntu_bionic
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zen/test-fetch-params.sh"
-  - &docker_amd64_linux_ubuntu_bionic_unit-tests
+  - &docker_amd64_linux_ubuntu_focal_unit-tests
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_bionic
+      - DOCKER_FROM=ubuntu_focal
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
       - TEST_ARGS="btest gtest sec-hard no-dot-so util-test secp256k1 libsnark univalue"
-  - &docker_amd64_linux_ubuntu_bionic_rpc-tests_1
+  - &docker_amd64_linux_ubuntu_focal_rpc-tests_1
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_bionic
+      - DOCKER_FROM=ubuntu_focal
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
-      - TEST_ARGS="rpc --rpc-extended --rpc-split=3:1"
-  - &docker_amd64_linux_ubuntu_bionic_rpc-tests_2
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:1"
+  - &docker_amd64_linux_ubuntu_focal_rpc-tests_2
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_bionic
+      - DOCKER_FROM=ubuntu_focal
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
-      - TEST_ARGS="rpc --rpc-extended --rpc-split=3:2"
-  - &docker_amd64_linux_ubuntu_bionic_rpc-tests_3
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:2"
+  - &docker_amd64_linux_ubuntu_focal_rpc-tests_3
     env:
       - DOCKER_ARCH=amd64
       - DOCKER_TARGET_OS=linux
-      - DOCKER_FROM=ubuntu_bionic
+      - DOCKER_FROM=ubuntu_focal
+      - DOCKER_IS_DEB=true
+      - TEST_CMD="./qa/zcash/full_test_suite.py"
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:3"
+  - &docker_amd64_linux_ubuntu_focal_rpc-tests_4
+    env:
+      - DOCKER_ARCH=amd64
+      - DOCKER_TARGET_OS=linux
+      - DOCKER_FROM=ubuntu_focal
       - DOCKER_IS_DEB=true
       - TEST_CMD="./qa/zcash/full_test_suite.py"
-      - TEST_ARGS="rpc --rpc-extended --rpc-split=3:3"
+      - TEST_ARGS="rpc --rpc-extended --rpc-split=4:4"
   - &amd64_osx_xcode9_4_unit-tests
     env:
       - TEST_CMD="./qa/zcash/full_test_suite.py"
@@ -110,17 +126,19 @@ os: linux
       - TEST_CMD="./qa/zcash/full_test_suite.py"
       - TEST_ARGS="rpc --rpc-extended --rpc-exclude=rpcbind_test.py,invalidblockrequest.py,invalidblockposthalving.py,p2p-acceptblock.py --rpc-split=3:3"
 
-.com.github.horizenofficial.zen.job-definitions:
+.com.github.horizenofficial.zend_oo.job-definitions:
   - &prepare_docker_amd64
     os: linux
-    dist: bionic
+    dist: focal
     cache: false
     script:
       - bash "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/prepare/docker_image_build.sh"
       - bash "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/prepare/docker_image_deploy.sh"
-  - &build_docker_amd64
+  - &build_docker_amd64_x-large
     os: linux
-    dist: bionic
+    dist: focal
+    vm:
+      size: x-large
     cache:
       directories:
         - "$HOME/.ccache"
@@ -130,7 +148,20 @@ os: linux
   - &test_docker_amd64
     if: env(SKIP_TESTS) != true
     os: linux
-    dist: bionic
+    dist: focal
+    cache:
+      directories:
+        - "$HOME/.zcash-params"
+    script:
+      - bash -c "RENAME_FOLDER='true' RENAME_SUFFIX='_clean' ${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/get_archive.sh ${B2_DL_DECOMPRESS_FOLDER} ${B2_DL_FILENAME}"
+      - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/travis_stay_alive.sh"
+      - bash -c '${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/test/run_test.sh "${TEST_CMD}" "${TEST_ARGS}"'
+  - &test_docker_amd64_x-large
+    if: env(SKIP_TESTS) != true
+    os: linux
+    dist: focal
+    vm:
+      size: x-large
     cache:
       directories:
         - "$HOME/.zcash-params"
@@ -139,7 +170,7 @@ os: linux
       - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/travis_stay_alive.sh"
       - bash -c '${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/test/run_test.sh "${TEST_CMD}" "${TEST_ARGS}"'
   - &test_osx_xcode9_4
-    if: (env(SKIP_TESTS) != true) OR (env(SKIP_OSX) != true)
+    if: (env(SKIP_TESTS) != true) AND (env(SKIP_OSX) != true)
     os: osx
     osx_image: xcode9.4
     cache:
@@ -150,6 +181,10 @@ os: linux
       - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/travis_stay_alive.sh"
       - bash -c '${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/test/run_test.sh "${TEST_CMD}" "${TEST_ARGS}"'
 
+env:
+  global:
+    - SKIP_OSX=true
+
 before_install:
   - source "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/setup_environment.sh"
 
@@ -161,10 +196,10 @@ jobs:
     # build and push docker build/test dependency images
     - stage: Prepare
       <<: *prepare_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_xenial
+      <<: *docker_amd64_linux_ubuntu_bionic
     - stage: Prepare
       <<: *prepare_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_bionic
+      <<: *docker_amd64_linux_ubuntu_focal
     - stage: Prepare
       <<: *prepare_docker_amd64
       <<: *docker_amd64_windows_ubuntu_bionic
@@ -179,13 +214,13 @@ jobs:
         - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/push_archive.sh ${B2_UL_COMPRESS_FOLDER} ${B2_UL_FILENAME}"
     # Docker based builds
     - stage: Build
-      <<: *build_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_xenial
-    - stage: Build
-      <<: *build_docker_amd64
+      <<: *build_docker_amd64_x-large
       <<: *docker_amd64_linux_ubuntu_bionic
     - stage: Build
-      <<: *build_docker_amd64
+      <<: *build_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_focal
+    - stage: Build
+      <<: *build_docker_amd64_x-large
       <<: *docker_amd64_windows_ubuntu_bionic
     # osx build
     - stage: Build
@@ -201,32 +236,38 @@ jobs:
         - bash -c "${TRAVIS_BUILD_DIR}/contrib/ci-horizen/scripts/common/push_archive.sh ${B2_UL_COMPRESS_FOLDER} ${B2_UL_FILENAME}"
     # Docker based tests
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_xenial_unit-tests
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_bionic_unit-tests
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_xenial_rpc-tests_1
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_1
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_xenial_rpc-tests_2
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_2
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_xenial_rpc-tests_3
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_3
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_xenial_test-fetch-params
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_4
     - stage: Test
       <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_bionic_unit-tests
+      <<: *docker_amd64_linux_ubuntu_bionic_test-fetch-params
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_1
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_focal_unit-tests
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_2
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_1
     - stage: Test
-      <<: *test_docker_amd64
-      <<: *docker_amd64_linux_ubuntu_bionic_rpc-tests_3
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_2
+    - stage: Test
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_3
+    - stage: Test
+      <<: *test_docker_amd64_x-large
+      <<: *docker_amd64_linux_ubuntu_focal_rpc-tests_4
     # osx based tests
     - stage: Test
       <<: *test_osx_xcode9_4

Makefile.am

@@ -17,6 +17,7 @@ BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
 BITCOIN_CLI_BIN=$(top_builddir)/src/zen-cli$(EXEEXT)
 BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
 
+
 ##OSX_APP=Bitcoin-Qt.app
 ##OSX_DMG=Bitcoin-Core.dmg
 ##OSX_BACKGROUND_IMAGE=background.tiff
@@ -145,6 +146,7 @@ $(BITCOIND_BIN): FORCE
 $(BITCOIN_CLI_BIN): FORCE
 	$(MAKE) -C src $(@F)
 
+
 if USE_LCOV
 
 baseline.info: