From ccbd20bc94887fe90d10476d618ca444108debf4 Mon Sep 17 00:00:00 2001 From: Gene Hoffman <30377676+hoffmang9@users.noreply.github.com> Date: Wed, 3 Mar 2021 20:54:19 -0800 Subject: [PATCH] Chia VDF to 0.9 (#1138) * Chia VDF to 0.9 * Try test-cache 20 --- .github/workflows/build-test-macos-blockchain.yml | 2 +- .github/workflows/build-test-macos-core.yml | 6 +++--- .github/workflows/build-test-macos-simulation.yml | 2 +- .github/workflows/build-test-macos-wallet.yml | 2 +- .github/workflows/build-test-ubuntu-blockchain.yml | 2 +- .github/workflows/build-test-ubuntu-core.yml | 2 +- .github/workflows/build-test-ubuntu-simulation.yml | 2 +- .github/workflows/build-test-ubuntu-wallet.yml | 8 ++++---- run-py-tests.sh | 3 ++- setup.py | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-test-macos-blockchain.yml b/.github/workflows/build-test-macos-blockchain.yml index ca94d056ac..aa794af92e 100644 --- a/.github/workflows/build-test-macos-blockchain.yml +++ b/.github/workflows/build-test-macos-blockchain.yml @@ -58,7 +58,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-macos-core.yml b/.github/workflows/build-test-macos-core.yml index a0beaeaa84..c00948a0ad 100644 --- a/.github/workflows/build-test-macos-core.yml +++ b/.github/workflows/build-test-macos-core.yml @@ -14,7 +14,7 @@ jobs: build: name: MacOS Core Tests runs-on: ${{ matrix.os }} - timeout-minutes: 80 + timeout-minutes: 70 strategy: fail-fast: false max-parallel: 4 @@ -58,7 +58,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory @@ -90,4 +90,4 @@ jobs: - name: Test blockchain code with pytest run: | . ./activate - ./venv/bin/py.test tests/core -v --durations 0 + ./venv/bin/py.test tests/core -s -v --durations 0 diff --git a/.github/workflows/build-test-macos-simulation.yml b/.github/workflows/build-test-macos-simulation.yml index 5c5ebcd339..85ead264ec 100644 --- a/.github/workflows/build-test-macos-simulation.yml +++ b/.github/workflows/build-test-macos-simulation.yml @@ -58,7 +58,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-macos-wallet.yml b/.github/workflows/build-test-macos-wallet.yml index 77747567c6..6df5f5661e 100644 --- a/.github/workflows/build-test-macos-wallet.yml +++ b/.github/workflows/build-test-macos-wallet.yml @@ -58,7 +58,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-ubuntu-blockchain.yml b/.github/workflows/build-test-ubuntu-blockchain.yml index 04b4a8eb21..86eb38aef6 100644 --- a/.github/workflows/build-test-ubuntu-blockchain.yml +++ b/.github/workflows/build-test-ubuntu-blockchain.yml @@ -65,7 +65,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-ubuntu-core.yml b/.github/workflows/build-test-ubuntu-core.yml index 5a780a99d1..786aa0ac8f 100644 --- a/.github/workflows/build-test-ubuntu-core.yml +++ b/.github/workflows/build-test-ubuntu-core.yml @@ -65,7 +65,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-ubuntu-simulation.yml b/.github/workflows/build-test-ubuntu-simulation.yml index 18cce26e85..38a7cb9d10 100644 --- a/.github/workflows/build-test-ubuntu-simulation.yml +++ b/.github/workflows/build-test-ubuntu-simulation.yml @@ -65,7 +65,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory diff --git a/.github/workflows/build-test-ubuntu-wallet.yml b/.github/workflows/build-test-ubuntu-wallet.yml index bda52cb5a3..eb39ed73e3 100644 --- a/.github/workflows/build-test-ubuntu-wallet.yml +++ b/.github/workflows/build-test-ubuntu-wallet.yml @@ -14,7 +14,7 @@ jobs: build: name: Ubuntu Wallet Test runs-on: ${{ matrix.os }} - timeout-minutes: 50 + timeout-minutes: 40 strategy: fail-fast: false max-parallel: 4 @@ -65,7 +65,7 @@ jobs: with: repository: 'Chia-Network/test-cache' path: '.chia' - ref: '0.19.0' + ref: '0.20.0' fetch-depth: 1 - name: Link home directory @@ -102,9 +102,9 @@ jobs: - name: Test clvm code with pytest run: | . ./activate - ./venv/bin/py.test tests/clvm -v --durations 0 + ./venv/bin/py.test tests/clvm -s -v --durations 0 - name: Test blockchain code with pytest run: | . ./activate - ./venv/bin/py.test tests/wallet -v --durations 0 + ./venv/bin/py.test tests/wallet -s -v --durations 0 diff --git a/run-py-tests.sh b/run-py-tests.sh index 12e698be8a..622370deff 100755 --- a/run-py-tests.sh +++ b/run-py-tests.sh @@ -5,5 +5,6 @@ python3 -m venv venv . ./activate pip3 install . +py.test ./tests/blockchain -s -v py.test ./tests/core -s -v -py.test ./tests/wallet -s -v \ No newline at end of file +py.test ./tests/wallet -s -v diff --git a/setup.py b/setup.py index 07c65b250d..8b01976f2d 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup dependencies = [ "aiter==0.13.20191203", # Used for async generator tools "blspy==0.3.5", # Signature library - "chiavdf==0.15.1", # timelord and vdf verification + "chiavdf==0.9", # timelord and vdf verification "chiabip158==1.0", # bip158-style wallet filters "chiapos==0.12.45", # proof of space "clvm==0.9.3",