diff --git a/.github/workflows/build-test-macos-blockchain.yml b/.github/workflows/build-test-macos-blockchain.yml
deleted file mode 100644
index 380288bf05..0000000000
--- a/.github/workflows/build-test-macos-blockchain.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS blockchain Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS blockchain Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_blockchain
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test blockchain code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/blockchain/test_blockchain.py tests/blockchain/test_blockchain_transactions.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-clvm.yml b/.github/workflows/build-test-macos-clvm.yml
deleted file mode 100644
index b40dc953e2..0000000000
--- a/.github/workflows/build-test-macos-clvm.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS clvm Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS clvm Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_clvm
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test clvm code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/clvm/test_chialisp_deserialization.py tests/clvm/test_clvm_compilation.py tests/clvm/test_clvm_step.py tests/clvm/test_program.py tests/clvm/test_puzzle_compression.py tests/clvm/test_puzzle_drivers.py tests/clvm/test_puzzles.py tests/clvm/test_serialized_program.py tests/clvm/test_singletons.py tests/clvm/test_spend_sim.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-cmds.yml b/.github/workflows/build-test-macos-core-cmds.yml
deleted file mode 100644
index ba1d2e11b9..0000000000
--- a/.github/workflows/build-test-macos-core-cmds.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-cmds Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-cmds Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-cmds
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-cmds code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/cmds/test_keys.py tests/core/cmds/test_wallet.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-consensus.yml b/.github/workflows/build-test-macos-core-consensus.yml
deleted file mode 100644
index b71db9933a..0000000000
--- a/.github/workflows/build-test-macos-core-consensus.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-consensus Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-consensus Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-consensus
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-consensus code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/consensus/test_pot_iterations.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-custom_types.yml b/.github/workflows/build-test-macos-core-custom_types.yml
deleted file mode 100644
index e2cb0df0e4..0000000000
--- a/.github/workflows/build-test-macos-core-custom_types.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-custom_types Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-custom_types Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-custom_types
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-custom_types code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/custom_types/test_coin.py tests/core/custom_types/test_proof_of_space.py tests/core/custom_types/test_spend_bundle.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-daemon.yml b/.github/workflows/build-test-macos-core-daemon.yml
deleted file mode 100644
index bdbedf2f12..0000000000
--- a/.github/workflows/build-test-macos-core-daemon.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-daemon Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-daemon Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-daemon
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-    - name: Install timelord
-      run: |
-        . ./activate
-        sh install-timelord.sh -n
-        ./vdf_bench square_asm 400000
-
-    - name: Test core-daemon code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/core/daemon/test_daemon.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-full_node-full_sync.yml b/.github/workflows/build-test-macos-core-full_node-full_sync.yml
deleted file mode 100644
index c2e15bfd56..0000000000
--- a/.github/workflows/build-test-macos-core-full_node-full_sync.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-full_node-full_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-full_node-full_sync Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node-full_sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node-full_sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/full_node/full_sync/test_full_sync.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-full_node-stores.yml b/.github/workflows/build-test-macos-core-full_node-stores.yml
deleted file mode 100644
index 4239950e21..0000000000
--- a/.github/workflows/build-test-macos-core-full_node-stores.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-full_node-stores Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-full_node-stores Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node-stores
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node-stores code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/full_node/stores/test_block_store.py tests/core/full_node/stores/test_coin_store.py tests/core/full_node/stores/test_full_node_store.py tests/core/full_node/stores/test_hint_store.py tests/core/full_node/stores/test_sync_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-full_node.yml b/.github/workflows/build-test-macos-core-full_node.yml
deleted file mode 100644
index 192ead7a1d..0000000000
--- a/.github/workflows/build-test-macos-core-full_node.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-full_node Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-full_node Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/full_node/test_address_manager.py tests/core/full_node/test_block_height_map.py tests/core/full_node/test_conditions.py tests/core/full_node/test_full_node.py tests/core/full_node/test_generator_tools.py tests/core/full_node/test_hint_management.py tests/core/full_node/test_mempool.py tests/core/full_node/test_mempool_performance.py tests/core/full_node/test_node_load.py tests/core/full_node/test_peer_store_resolver.py tests/core/full_node/test_performance.py tests/core/full_node/test_transactions.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-server.yml b/.github/workflows/build-test-macos-core-server.yml
deleted file mode 100644
index c9c3732992..0000000000
--- a/.github/workflows/build-test-macos-core-server.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-server Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-server Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-server
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-server code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/core/server/test_dos.py tests/core/server/test_rate_limits.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-ssl.yml b/.github/workflows/build-test-macos-core-ssl.yml
deleted file mode 100644
index 95db9d247a..0000000000
--- a/.github/workflows/build-test-macos-core-ssl.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-ssl Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-ssl Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-ssl
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-ssl code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/ssl/test_ssl.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core-util.yml b/.github/workflows/build-test-macos-core-util.yml
deleted file mode 100644
index c7628a1ec4..0000000000
--- a/.github/workflows/build-test-macos-core-util.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core-util Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core-util Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-util
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-util code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/util/test_cached_bls.py tests/core/util/test_config.py tests/core/util/test_db_wrapper.py tests/core/util/test_file_keyring_synchronization.py tests/core/util/test_files.py tests/core/util/test_jsonify.py tests/core/util/test_keychain.py tests/core/util/test_keyring_wrapper.py tests/core/util/test_lru_cache.py tests/core/util/test_significant_bits.py tests/core/util/test_streamable.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-core.yml b/.github/workflows/build-test-macos-core.yml
deleted file mode 100644
index 879f7ef144..0000000000
--- a/.github/workflows/build-test-macos-core.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS core Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS core Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/core/test_coins.py tests/core/test_cost_calculation.py tests/core/test_crawler_rpc.py tests/core/test_daemon_rpc.py tests/core/test_db_conversion.py tests/core/test_db_validation.py tests/core/test_farmer_harvester_rpc.py tests/core/test_filter.py tests/core/test_full_node_rpc.py tests/core/test_merkle_set.py tests/core/test_setproctitle.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-farmer_harvester.yml b/.github/workflows/build-test-macos-farmer_harvester.yml
deleted file mode 100644
index cbfba8f560..0000000000
--- a/.github/workflows/build-test-macos-farmer_harvester.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS farmer_harvester Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS farmer_harvester Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_farmer_harvester
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test farmer_harvester code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/farmer_harvester/test_farmer_harvester.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-generator.yml b/.github/workflows/build-test-macos-generator.yml
deleted file mode 100644
index 4a4deb4109..0000000000
--- a/.github/workflows/build-test-macos-generator.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS generator Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS generator Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_generator
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test generator code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/generator/test_compression.py tests/generator/test_generator_types.py tests/generator/test_list_to_batches.py tests/generator/test_rom.py tests/generator/test_scan.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-plot_sync.yml b/.github/workflows/build-test-macos-plot_sync.yml
deleted file mode 100644
index 8e30928bfc..0000000000
--- a/.github/workflows/build-test-macos-plot_sync.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS plot_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS plot_sync Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_plot_sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test plot_sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/plot_sync/test_delta.py tests/plot_sync/test_plot_sync.py tests/plot_sync/test_receiver.py tests/plot_sync/test_sender.py tests/plot_sync/test_sync_simulated.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-plotting.yml b/.github/workflows/build-test-macos-plotting.yml
deleted file mode 100644
index 8a7321c6c5..0000000000
--- a/.github/workflows/build-test-macos-plotting.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS plotting Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS plotting Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_plotting
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test plotting code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/plotting/test_plot_manager.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-pools.yml b/.github/workflows/build-test-macos-pools.yml
deleted file mode 100644
index 36acc5a5cf..0000000000
--- a/.github/workflows/build-test-macos-pools.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS pools Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS pools Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_pools
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test pools code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/pools/test_pool_cmdline.py tests/pools/test_pool_config.py tests/pools/test_pool_puzzles_lifecycle.py tests/pools/test_pool_rpc.py tests/pools/test_pool_wallet.py tests/pools/test_wallet_pool_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-simulation.yml b/.github/workflows/build-test-macos-simulation.yml
deleted file mode 100644
index 44c020d00a..0000000000
--- a/.github/workflows/build-test-macos-simulation.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS simulation Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS simulation Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_simulation
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-    - name: Install timelord
-      run: |
-        . ./activate
-        sh install-timelord.sh -n
-        ./vdf_bench square_asm 400000
-
-    - name: Test simulation code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/simulation/test_simulation.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-tools.yml b/.github/workflows/build-test-macos-tools.yml
deleted file mode 100644
index 76bbbb3ec4..0000000000
--- a/.github/workflows/build-test-macos-tools.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS tools Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS tools Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_tools
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test tools code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/tools/test_full_sync.py tests/tools/test_run_block.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-util.yml b/.github/workflows/build-test-macos-util.yml
deleted file mode 100644
index e418f60ebf..0000000000
--- a/.github/workflows/build-test-macos-util.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS util Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS util Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_util
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test util code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/util/test_chunks.py tests/util/test_full_block_utils.py tests/util/test_lock_queue.py tests/util/test_misc.py tests/util/test_network.py tests/util/test_network_protocol_files.py tests/util/test_network_protocol_json.py tests/util/test_network_protocol_test.py tests/util/test_paginator.py tests/util/test_struct_stream.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet-cat_wallet.yml b/.github/workflows/build-test-macos-wallet-cat_wallet.yml
deleted file mode 100644
index eef358b7b4..0000000000
--- a/.github/workflows/build-test-macos-wallet-cat_wallet.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet-cat_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet-cat_wallet Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-cat_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-cat_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/cat_wallet/test_cat_lifecycle.py tests/wallet/cat_wallet/test_cat_outer_puzzle.py tests/wallet/cat_wallet/test_cat_wallet.py tests/wallet/cat_wallet/test_offer_lifecycle.py tests/wallet/cat_wallet/test_trades.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet-did_wallet.yml b/.github/workflows/build-test-macos-wallet-did_wallet.yml
deleted file mode 100644
index 4e79b94a85..0000000000
--- a/.github/workflows/build-test-macos-wallet-did_wallet.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet-did_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet-did_wallet Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-did_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-did_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/did_wallet/test_did.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet-nft_wallet.yml b/.github/workflows/build-test-macos-wallet-nft_wallet.yml
deleted file mode 100644
index 6106672165..0000000000
--- a/.github/workflows/build-test-macos-wallet-nft_wallet.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet-nft_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet-nft_wallet Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-nft_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-nft_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/nft_wallet/test_nft_1_offers.py tests/wallet/nft_wallet/test_nft_lifecycle.py tests/wallet/nft_wallet/test_nft_offers.py tests/wallet/nft_wallet/test_nft_puzzles.py tests/wallet/nft_wallet/test_nft_wallet.py tests/wallet/nft_wallet/test_ownership_outer_puzzle.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet-rl_wallet.yml b/.github/workflows/build-test-macos-wallet-rl_wallet.yml
deleted file mode 100644
index 37992f513d..0000000000
--- a/.github/workflows/build-test-macos-wallet-rl_wallet.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet-rl_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet-rl_wallet Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-rl_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-rl_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/rl_wallet/test_rl_rpc.py tests/wallet/rl_wallet/test_rl_wallet.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet-rpc.yml b/.github/workflows/build-test-macos-wallet-rpc.yml
deleted file mode 100644
index 76cebf8e75..0000000000
--- a/.github/workflows/build-test-macos-wallet-rpc.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet-rpc Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet-rpc Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-rpc
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-rpc code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/rpc/test_dl_wallet_rpc.py tests/wallet/rpc/test_wallet_rpc.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet-simple_sync.yml b/.github/workflows/build-test-macos-wallet-simple_sync.yml
deleted file mode 100644
index b2e9f7e8a7..0000000000
--- a/.github/workflows/build-test-macos-wallet-simple_sync.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet-simple_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet-simple_sync Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-simple_sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-simple_sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/simple_sync/test_simple_sync_protocol.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet-sync.yml b/.github/workflows/build-test-macos-wallet-sync.yml
deleted file mode 100644
index 4d3ce576ad..0000000000
--- a/.github/workflows/build-test-macos-wallet-sync.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet-sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet-sync Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/sync/test_wallet_sync.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-wallet.yml b/.github/workflows/build-test-macos-wallet.yml
deleted file mode 100644
index 37bb5c84f7..0000000000
--- a/.github/workflows/build-test-macos-wallet.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS wallet Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/wallet/test_bech32m.py tests/wallet/test_chialisp.py tests/wallet/test_coin_selection.py tests/wallet/test_nft_store.py tests/wallet/test_puzzle_store.py tests/wallet/test_singleton.py tests/wallet/test_singleton_lifecycle.py tests/wallet/test_singleton_lifecycle_fast.py tests/wallet/test_taproot.py tests/wallet/test_wallet.py tests/wallet/test_wallet_blockchain.py tests/wallet/test_wallet_interested_store.py tests/wallet/test_wallet_key_val_store.py tests/wallet/test_wallet_retry.py tests/wallet/test_wallet_store.py tests/wallet/test_wallet_user_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-macos-weight_proof.yml b/.github/workflows/build-test-macos-weight_proof.yml
deleted file mode 100644
index c09c039fc0..0000000000
--- a/.github/workflows/build-test-macos-weight_proof.yml
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS weight_proof Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS weight_proof Tests
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_weight_proof
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test weight_proof code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" tests/weight_proof/test_weight_proof.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-blockchain.yml b/.github/workflows/build-test-ubuntu-blockchain.yml
deleted file mode 100644
index 30aa4b83f3..0000000000
--- a/.github/workflows/build-test-ubuntu-blockchain.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu blockchain Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu blockchain Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_blockchain
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test blockchain code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/blockchain/test_blockchain.py tests/blockchain/test_blockchain_transactions.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-clvm.yml b/.github/workflows/build-test-ubuntu-clvm.yml
deleted file mode 100644
index 486fc78f7a..0000000000
--- a/.github/workflows/build-test-ubuntu-clvm.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu clvm Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu clvm Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_clvm
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test clvm code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/clvm/test_chialisp_deserialization.py tests/clvm/test_clvm_compilation.py tests/clvm/test_clvm_step.py tests/clvm/test_program.py tests/clvm/test_puzzle_compression.py tests/clvm/test_puzzle_drivers.py tests/clvm/test_puzzles.py tests/clvm/test_serialized_program.py tests/clvm/test_singletons.py tests/clvm/test_spend_sim.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-cmds.yml b/.github/workflows/build-test-ubuntu-core-cmds.yml
deleted file mode 100644
index c3f6c13368..0000000000
--- a/.github/workflows/build-test-ubuntu-core-cmds.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-cmds Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-cmds Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-cmds
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-cmds code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/core/cmds/test_keys.py tests/core/cmds/test_wallet.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-consensus.yml b/.github/workflows/build-test-ubuntu-core-consensus.yml
deleted file mode 100644
index 3eeb13ccdc..0000000000
--- a/.github/workflows/build-test-ubuntu-core-consensus.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-consensus Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-consensus Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-consensus
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-consensus code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/core/consensus/test_pot_iterations.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-custom_types.yml b/.github/workflows/build-test-ubuntu-core-custom_types.yml
deleted file mode 100644
index 25ee1e4eaf..0000000000
--- a/.github/workflows/build-test-ubuntu-core-custom_types.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-custom_types Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-custom_types Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-custom_types
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-custom_types code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/core/custom_types/test_coin.py tests/core/custom_types/test_proof_of_space.py tests/core/custom_types/test_spend_bundle.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-daemon.yml b/.github/workflows/build-test-ubuntu-core-daemon.yml
deleted file mode 100644
index 5622829ca8..0000000000
--- a/.github/workflows/build-test-ubuntu-core-daemon.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-daemon Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-daemon Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-daemon
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-    - name: Install timelord
-      run: |
-        . ./activate
-        sh install-timelord.sh -n
-        ./vdf_bench square_asm 400000
-
-    - name: Test core-daemon code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/core/daemon/test_daemon.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-full_node-full_sync.yml b/.github/workflows/build-test-ubuntu-core-full_node-full_sync.yml
deleted file mode 100644
index fb819785dd..0000000000
--- a/.github/workflows/build-test-ubuntu-core-full_node-full_sync.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-full_node-full_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-full_node-full_sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node-full_sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node-full_sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/core/full_node/full_sync/test_full_sync.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-full_node-stores.yml b/.github/workflows/build-test-ubuntu-core-full_node-stores.yml
deleted file mode 100644
index faff4bffec..0000000000
--- a/.github/workflows/build-test-ubuntu-core-full_node-stores.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-full_node-stores Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-full_node-stores Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node-stores
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node-stores code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" -p monitor tests/core/full_node/stores/test_block_store.py tests/core/full_node/stores/test_coin_store.py tests/core/full_node/stores/test_full_node_store.py tests/core/full_node/stores/test_hint_store.py tests/core/full_node/stores/test_sync_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-    - name: Check resource usage
-      run: |
-        sqlite3 -readonly -separator " " .pymon "select item,cpu_usage,total_time,mem_usage from TEST_METRICS order by mem_usage desc;" >metrics.out
-        ./tests/check_pytest_monitor_output.py <metrics.out
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-full_node.yml b/.github/workflows/build-test-ubuntu-core-full_node.yml
deleted file mode 100644
index 53443a8d67..0000000000
--- a/.github/workflows/build-test-ubuntu-core-full_node.yml
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-full_node Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-full_node Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark" -p monitor tests/core/full_node/test_address_manager.py tests/core/full_node/test_block_height_map.py tests/core/full_node/test_conditions.py tests/core/full_node/test_full_node.py tests/core/full_node/test_generator_tools.py tests/core/full_node/test_hint_management.py tests/core/full_node/test_mempool.py tests/core/full_node/test_mempool_performance.py tests/core/full_node/test_node_load.py tests/core/full_node/test_peer_store_resolver.py tests/core/full_node/test_performance.py tests/core/full_node/test_transactions.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-    - name: Check resource usage
-      run: |
-        sqlite3 -readonly -separator " " .pymon "select item,cpu_usage,total_time,mem_usage from TEST_METRICS order by mem_usage desc;" >metrics.out
-        ./tests/check_pytest_monitor_output.py <metrics.out
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-server.yml b/.github/workflows/build-test-ubuntu-core-server.yml
deleted file mode 100644
index 0332a8ddf0..0000000000
--- a/.github/workflows/build-test-ubuntu-core-server.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-server Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-server Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-server
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-server code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/core/server/test_dos.py tests/core/server/test_rate_limits.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-ssl.yml b/.github/workflows/build-test-ubuntu-core-ssl.yml
deleted file mode 100644
index df62c56d4f..0000000000
--- a/.github/workflows/build-test-ubuntu-core-ssl.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-ssl Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-ssl Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-ssl
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-ssl code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/core/ssl/test_ssl.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core-util.yml b/.github/workflows/build-test-ubuntu-core-util.yml
deleted file mode 100644
index 5ac35e8721..0000000000
--- a/.github/workflows/build-test-ubuntu-core-util.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core-util Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core-util Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-util
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core-util code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/core/util/test_cached_bls.py tests/core/util/test_config.py tests/core/util/test_db_wrapper.py tests/core/util/test_file_keyring_synchronization.py tests/core/util/test_files.py tests/core/util/test_jsonify.py tests/core/util/test_keychain.py tests/core/util/test_keyring_wrapper.py tests/core/util/test_lru_cache.py tests/core/util/test_significant_bits.py tests/core/util/test_streamable.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-core.yml b/.github/workflows/build-test-ubuntu-core.yml
deleted file mode 100644
index afccda6dd4..0000000000
--- a/.github/workflows/build-test-ubuntu-core.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu core Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu core Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test core code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/core/test_coins.py tests/core/test_cost_calculation.py tests/core/test_crawler_rpc.py tests/core/test_daemon_rpc.py tests/core/test_db_conversion.py tests/core/test_db_validation.py tests/core/test_farmer_harvester_rpc.py tests/core/test_filter.py tests/core/test_full_node_rpc.py tests/core/test_merkle_set.py tests/core/test_setproctitle.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-farmer_harvester.yml b/.github/workflows/build-test-ubuntu-farmer_harvester.yml
deleted file mode 100644
index 7b0f579a91..0000000000
--- a/.github/workflows/build-test-ubuntu-farmer_harvester.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu farmer_harvester Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu farmer_harvester Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_farmer_harvester
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test farmer_harvester code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/farmer_harvester/test_farmer_harvester.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-generator.yml b/.github/workflows/build-test-ubuntu-generator.yml
deleted file mode 100644
index ea4dede57f..0000000000
--- a/.github/workflows/build-test-ubuntu-generator.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu generator Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu generator Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_generator
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test generator code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/generator/test_compression.py tests/generator/test_generator_types.py tests/generator/test_list_to_batches.py tests/generator/test_rom.py tests/generator/test_scan.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-plot_sync.yml b/.github/workflows/build-test-ubuntu-plot_sync.yml
deleted file mode 100644
index 335fc92341..0000000000
--- a/.github/workflows/build-test-ubuntu-plot_sync.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu plot_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu plot_sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_plot_sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test plot_sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/plot_sync/test_delta.py tests/plot_sync/test_plot_sync.py tests/plot_sync/test_receiver.py tests/plot_sync/test_sender.py tests/plot_sync/test_sync_simulated.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-plotting.yml b/.github/workflows/build-test-ubuntu-plotting.yml
deleted file mode 100644
index 6e411bb2f6..0000000000
--- a/.github/workflows/build-test-ubuntu-plotting.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu plotting Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu plotting Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_plotting
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test plotting code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/plotting/test_plot_manager.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-pools.yml b/.github/workflows/build-test-ubuntu-pools.yml
deleted file mode 100644
index 9e99bdc68b..0000000000
--- a/.github/workflows/build-test-ubuntu-pools.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu pools Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu pools Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_pools
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test pools code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark"  tests/pools/test_pool_cmdline.py tests/pools/test_pool_config.py tests/pools/test_pool_puzzles_lifecycle.py tests/pools/test_pool_rpc.py tests/pools/test_pool_wallet.py tests/pools/test_wallet_pool_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-simulation.yml b/.github/workflows/build-test-ubuntu-simulation.yml
deleted file mode 100644
index c0a463f82c..0000000000
--- a/.github/workflows/build-test-ubuntu-simulation.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu simulation Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu simulation Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_simulation
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-    - name: Install timelord
-      run: |
-        . ./activate
-        sh install-timelord.sh -n
-        ./vdf_bench square_asm 400000
-
-    - name: Test simulation code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/simulation/test_simulation.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-tools.yml b/.github/workflows/build-test-ubuntu-tools.yml
deleted file mode 100644
index e9538ee0ae..0000000000
--- a/.github/workflows/build-test-ubuntu-tools.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu tools Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu tools Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_tools
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test tools code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/tools/test_full_sync.py tests/tools/test_run_block.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-util.yml b/.github/workflows/build-test-ubuntu-util.yml
deleted file mode 100644
index c9fe8c0c59..0000000000
--- a/.github/workflows/build-test-ubuntu-util.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu util Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu util Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_util
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test util code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/util/test_chunks.py tests/util/test_full_block_utils.py tests/util/test_lock_queue.py tests/util/test_misc.py tests/util/test_network.py tests/util/test_network_protocol_files.py tests/util/test_network_protocol_json.py tests/util/test_network_protocol_test.py tests/util/test_paginator.py tests/util/test_struct_stream.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet-cat_wallet.yml b/.github/workflows/build-test-ubuntu-wallet-cat_wallet.yml
deleted file mode 100644
index 75e79d1533..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet-cat_wallet.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet-cat_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet-cat_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-cat_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-cat_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/wallet/cat_wallet/test_cat_lifecycle.py tests/wallet/cat_wallet/test_cat_outer_puzzle.py tests/wallet/cat_wallet/test_cat_wallet.py tests/wallet/cat_wallet/test_offer_lifecycle.py tests/wallet/cat_wallet/test_trades.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet-did_wallet.yml b/.github/workflows/build-test-ubuntu-wallet-did_wallet.yml
deleted file mode 100644
index 74eaec74b2..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet-did_wallet.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet-did_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet-did_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-did_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-did_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/wallet/did_wallet/test_did.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet-nft_wallet.yml b/.github/workflows/build-test-ubuntu-wallet-nft_wallet.yml
deleted file mode 100644
index 34fca5581a..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet-nft_wallet.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet-nft_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet-nft_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-nft_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-nft_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/wallet/nft_wallet/test_nft_1_offers.py tests/wallet/nft_wallet/test_nft_lifecycle.py tests/wallet/nft_wallet/test_nft_offers.py tests/wallet/nft_wallet/test_nft_puzzles.py tests/wallet/nft_wallet/test_nft_wallet.py tests/wallet/nft_wallet/test_ownership_outer_puzzle.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet-rl_wallet.yml b/.github/workflows/build-test-ubuntu-wallet-rl_wallet.yml
deleted file mode 100644
index 3c4478bcf5..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet-rl_wallet.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet-rl_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet-rl_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-rl_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-rl_wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/wallet/rl_wallet/test_rl_rpc.py tests/wallet/rl_wallet/test_rl_wallet.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet-rpc.yml b/.github/workflows/build-test-ubuntu-wallet-rpc.yml
deleted file mode 100644
index 29d11f9653..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet-rpc.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet-rpc Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet-rpc Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-rpc
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-rpc code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/wallet/rpc/test_dl_wallet_rpc.py tests/wallet/rpc/test_wallet_rpc.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet-simple_sync.yml b/.github/workflows/build-test-ubuntu-wallet-simple_sync.yml
deleted file mode 100644
index db270a7a33..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet-simple_sync.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet-simple_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet-simple_sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-simple_sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-simple_sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/wallet/simple_sync/test_simple_sync_protocol.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet-sync.yml b/.github/workflows/build-test-ubuntu-wallet-sync.yml
deleted file mode 100644
index 80ce08fd99..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet-sync.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet-sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet-sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-sync
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-sync code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark"  tests/wallet/sync/test_wallet_sync.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-wallet.yml b/.github/workflows/build-test-ubuntu-wallet.yml
deleted file mode 100644
index 9181e07868..0000000000
--- a/.github/workflows/build-test-ubuntu-wallet.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/wallet/test_bech32m.py tests/wallet/test_chialisp.py tests/wallet/test_coin_selection.py tests/wallet/test_nft_store.py tests/wallet/test_puzzle_store.py tests/wallet/test_singleton.py tests/wallet/test_singleton_lifecycle.py tests/wallet/test_singleton_lifecycle_fast.py tests/wallet/test_taproot.py tests/wallet/test_wallet.py tests/wallet/test_wallet_blockchain.py tests/wallet/test_wallet_interested_store.py tests/wallet/test_wallet_key_val_store.py tests/wallet/test_wallet_retry.py tests/wallet/test_wallet_store.py tests/wallet/test_wallet_user_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-ubuntu-weight_proof.yml b/.github/workflows/build-test-ubuntu-weight_proof.yml
deleted file mode 100644
index 12a4b58cb3..0000000000
--- a/.github/workflows/build-test-ubuntu-weight_proof.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu weight_proof Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu weight_proof Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_weight_proof
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-# Omitted installing Timelord
-
-    - name: Test weight_proof code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 4 -m "not benchmark"  tests/weight_proof/test_weight_proof.py
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-# Omitted resource usage check
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-blockchain.yml b/.github/workflows/build-test-windows-blockchain.yml
deleted file mode 100644
index 27df1db6b3..0000000000
--- a/.github/workflows/build-test-windows-blockchain.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows blockchain Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows blockchain Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_blockchain
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test blockchain code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/blockchain/test_blockchain.py tests/blockchain/test_blockchain_transactions.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-clvm.yml b/.github/workflows/build-test-windows-clvm.yml
deleted file mode 100644
index 76470c0f36..0000000000
--- a/.github/workflows/build-test-windows-clvm.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows clvm Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows clvm Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_clvm
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test clvm code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/clvm/test_chialisp_deserialization.py tests/clvm/test_clvm_compilation.py tests/clvm/test_clvm_step.py tests/clvm/test_program.py tests/clvm/test_puzzle_compression.py tests/clvm/test_puzzle_drivers.py tests/clvm/test_puzzles.py tests/clvm/test_serialized_program.py tests/clvm/test_singletons.py tests/clvm/test_spend_sim.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-cmds.yml b/.github/workflows/build-test-windows-core-cmds.yml
deleted file mode 100644
index 40ce7a823c..0000000000
--- a/.github/workflows/build-test-windows-core-cmds.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-cmds Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-cmds Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-cmds
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-cmds code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/cmds/test_keys.py tests/core/cmds/test_wallet.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-consensus.yml b/.github/workflows/build-test-windows-core-consensus.yml
deleted file mode 100644
index 88acbe3efc..0000000000
--- a/.github/workflows/build-test-windows-core-consensus.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-consensus Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-consensus Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-consensus
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-consensus code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/consensus/test_pot_iterations.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-custom_types.yml b/.github/workflows/build-test-windows-core-custom_types.yml
deleted file mode 100644
index 715a161228..0000000000
--- a/.github/workflows/build-test-windows-core-custom_types.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-custom_types Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-custom_types Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-custom_types
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-custom_types code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/custom_types/test_coin.py tests/core/custom_types/test_proof_of_space.py tests/core/custom_types/test_spend_bundle.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-daemon.yml b/.github/workflows/build-test-windows-core-daemon.yml
deleted file mode 100644
index b34ea0b616..0000000000
--- a/.github/workflows/build-test-windows-core-daemon.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-daemon Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-daemon Test
-    if: false
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-daemon
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-    - name: Install timelord
-      run: |
-        . ./activate
-        sh install-timelord.sh -n
-        ./vdf_bench square_asm 400000
-
-    - name: Test core-daemon code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/core/daemon/test_daemon.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-full_node-full_sync.yml b/.github/workflows/build-test-windows-core-full_node-full_sync.yml
deleted file mode 100644
index ce760b7f67..0000000000
--- a/.github/workflows/build-test-windows-core-full_node-full_sync.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-full_node-full_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-full_node-full_sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node-full_sync
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node-full_sync code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/full_node/full_sync/test_full_sync.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-full_node-stores.yml b/.github/workflows/build-test-windows-core-full_node-stores.yml
deleted file mode 100644
index 4cad49f1e7..0000000000
--- a/.github/workflows/build-test-windows-core-full_node-stores.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-full_node-stores Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-full_node-stores Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node-stores
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node-stores code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/full_node/stores/test_block_store.py tests/core/full_node/stores/test_coin_store.py tests/core/full_node/stores/test_full_node_store.py tests/core/full_node/stores/test_hint_store.py tests/core/full_node/stores/test_sync_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-full_node.yml b/.github/workflows/build-test-windows-core-full_node.yml
deleted file mode 100644
index 768d59af62..0000000000
--- a/.github/workflows/build-test-windows-core-full_node.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-full_node Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-full_node Test
-    if: false
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-full_node
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-full_node code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/full_node/test_address_manager.py tests/core/full_node/test_block_height_map.py tests/core/full_node/test_conditions.py tests/core/full_node/test_full_node.py tests/core/full_node/test_generator_tools.py tests/core/full_node/test_hint_management.py tests/core/full_node/test_mempool.py tests/core/full_node/test_mempool_performance.py tests/core/full_node/test_node_load.py tests/core/full_node/test_peer_store_resolver.py tests/core/full_node/test_performance.py tests/core/full_node/test_transactions.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-server.yml b/.github/workflows/build-test-windows-core-server.yml
deleted file mode 100644
index 51fc88b99f..0000000000
--- a/.github/workflows/build-test-windows-core-server.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-server Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-server Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-server
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-server code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/core/server/test_dos.py tests/core/server/test_rate_limits.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-ssl.yml b/.github/workflows/build-test-windows-core-ssl.yml
deleted file mode 100644
index 0f00f2065b..0000000000
--- a/.github/workflows/build-test-windows-core-ssl.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-ssl Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-ssl Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-ssl
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-ssl code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/ssl/test_ssl.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core-util.yml b/.github/workflows/build-test-windows-core-util.yml
deleted file mode 100644
index b3ce25c714..0000000000
--- a/.github/workflows/build-test-windows-core-util.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core-util Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core-util Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core-util
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core-util code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/util/test_cached_bls.py tests/core/util/test_config.py tests/core/util/test_db_wrapper.py tests/core/util/test_file_keyring_synchronization.py tests/core/util/test_files.py tests/core/util/test_jsonify.py tests/core/util/test_keychain.py tests/core/util/test_keyring_wrapper.py tests/core/util/test_lru_cache.py tests/core/util/test_significant_bits.py tests/core/util/test_streamable.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-core.yml b/.github/workflows/build-test-windows-core.yml
deleted file mode 100644
index b3a3812007..0000000000
--- a/.github/workflows/build-test-windows-core.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows core Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows core Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_core
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test core code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/core/test_coins.py tests/core/test_cost_calculation.py tests/core/test_crawler_rpc.py tests/core/test_daemon_rpc.py tests/core/test_db_conversion.py tests/core/test_db_validation.py tests/core/test_farmer_harvester_rpc.py tests/core/test_filter.py tests/core/test_full_node_rpc.py tests/core/test_merkle_set.py tests/core/test_setproctitle.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-farmer_harvester.yml b/.github/workflows/build-test-windows-farmer_harvester.yml
deleted file mode 100644
index fa4942ec91..0000000000
--- a/.github/workflows/build-test-windows-farmer_harvester.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows farmer_harvester Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows farmer_harvester Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_farmer_harvester
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test farmer_harvester code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/farmer_harvester/test_farmer_harvester.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-generator.yml b/.github/workflows/build-test-windows-generator.yml
deleted file mode 100644
index 41fe955eab..0000000000
--- a/.github/workflows/build-test-windows-generator.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows generator Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows generator Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_generator
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test generator code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/generator/test_compression.py tests/generator/test_generator_types.py tests/generator/test_list_to_batches.py tests/generator/test_rom.py tests/generator/test_scan.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-plot_sync.yml b/.github/workflows/build-test-windows-plot_sync.yml
deleted file mode 100644
index b1976c9dfe..0000000000
--- a/.github/workflows/build-test-windows-plot_sync.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows plot_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows plot_sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_plot_sync
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test plot_sync code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/plot_sync/test_delta.py tests/plot_sync/test_plot_sync.py tests/plot_sync/test_receiver.py tests/plot_sync/test_sender.py tests/plot_sync/test_sync_simulated.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-plotting.yml b/.github/workflows/build-test-windows-plotting.yml
deleted file mode 100644
index f36bf34ec2..0000000000
--- a/.github/workflows/build-test-windows-plotting.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows plotting Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows plotting Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_plotting
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test plotting code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/plotting/test_plot_manager.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-pools.yml b/.github/workflows/build-test-windows-pools.yml
deleted file mode 100644
index 7f84c274f9..0000000000
--- a/.github/workflows/build-test-windows-pools.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows pools Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows pools Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_pools
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test pools code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/pools/test_pool_cmdline.py tests/pools/test_pool_config.py tests/pools/test_pool_puzzles_lifecycle.py tests/pools/test_pool_rpc.py tests/pools/test_pool_wallet.py tests/pools/test_wallet_pool_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-simulation.yml b/.github/workflows/build-test-windows-simulation.yml
deleted file mode 100644
index 4d73994fd2..0000000000
--- a/.github/workflows/build-test-windows-simulation.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows simulation Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows simulation Test
-    if: false
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_simulation
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-    - name: Install timelord
-      run: |
-        . ./activate
-        sh install-timelord.sh -n
-        ./vdf_bench square_asm 400000
-
-    - name: Test simulation code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/simulation/test_simulation.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-tools.yml b/.github/workflows/build-test-windows-tools.yml
deleted file mode 100644
index f27204cb6f..0000000000
--- a/.github/workflows/build-test-windows-tools.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows tools Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows tools Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_tools
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test tools code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/tools/test_full_sync.py tests/tools/test_run_block.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-util.yml b/.github/workflows/build-test-windows-util.yml
deleted file mode 100644
index a69a60ea37..0000000000
--- a/.github/workflows/build-test-windows-util.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows util Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows util Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_util
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test util code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/util/test_chunks.py tests/util/test_full_block_utils.py tests/util/test_lock_queue.py tests/util/test_misc.py tests/util/test_network.py tests/util/test_network_protocol_files.py tests/util/test_network_protocol_json.py tests/util/test_network_protocol_test.py tests/util/test_paginator.py tests/util/test_struct_stream.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet-cat_wallet.yml b/.github/workflows/build-test-windows-wallet-cat_wallet.yml
deleted file mode 100644
index 9192d80e74..0000000000
--- a/.github/workflows/build-test-windows-wallet-cat_wallet.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet-cat_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet-cat_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-cat_wallet
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-cat_wallet code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/cat_wallet/test_cat_lifecycle.py tests/wallet/cat_wallet/test_cat_outer_puzzle.py tests/wallet/cat_wallet/test_cat_wallet.py tests/wallet/cat_wallet/test_offer_lifecycle.py tests/wallet/cat_wallet/test_trades.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet-did_wallet.yml b/.github/workflows/build-test-windows-wallet-did_wallet.yml
deleted file mode 100644
index c0810cc98a..0000000000
--- a/.github/workflows/build-test-windows-wallet-did_wallet.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet-did_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet-did_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 50
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-did_wallet
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-did_wallet code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/did_wallet/test_did.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet-nft_wallet.yml b/.github/workflows/build-test-windows-wallet-nft_wallet.yml
deleted file mode 100644
index c70191a3e2..0000000000
--- a/.github/workflows/build-test-windows-wallet-nft_wallet.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet-nft_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet-nft_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-nft_wallet
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-nft_wallet code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/nft_wallet/test_nft_1_offers.py tests/wallet/nft_wallet/test_nft_lifecycle.py tests/wallet/nft_wallet/test_nft_offers.py tests/wallet/nft_wallet/test_nft_puzzles.py tests/wallet/nft_wallet/test_nft_wallet.py tests/wallet/nft_wallet/test_ownership_outer_puzzle.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet-rl_wallet.yml b/.github/workflows/build-test-windows-wallet-rl_wallet.yml
deleted file mode 100644
index 1bc4a27355..0000000000
--- a/.github/workflows/build-test-windows-wallet-rl_wallet.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet-rl_wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet-rl_wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-rl_wallet
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-# Omitted checking out blocks and plots repo Chia-Network/test-cache
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-rl_wallet code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/rl_wallet/test_rl_rpc.py tests/wallet/rl_wallet/test_rl_wallet.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet-rpc.yml b/.github/workflows/build-test-windows-wallet-rpc.yml
deleted file mode 100644
index f113be5bef..0000000000
--- a/.github/workflows/build-test-windows-wallet-rpc.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet-rpc Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet-rpc Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-rpc
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-rpc code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/rpc/test_dl_wallet_rpc.py tests/wallet/rpc/test_wallet_rpc.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet-simple_sync.yml b/.github/workflows/build-test-windows-wallet-simple_sync.yml
deleted file mode 100644
index 2d3e14d16c..0000000000
--- a/.github/workflows/build-test-windows-wallet-simple_sync.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet-simple_sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet-simple_sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-simple_sync
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-simple_sync code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/simple_sync/test_simple_sync_protocol.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet-sync.yml b/.github/workflows/build-test-windows-wallet-sync.yml
deleted file mode 100644
index 566984958d..0000000000
--- a/.github/workflows/build-test-windows-wallet-sync.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet-sync Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet-sync Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet-sync
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet-sync code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 0 -m "not benchmark" tests/wallet/sync/test_wallet_sync.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-wallet.yml b/.github/workflows/build-test-windows-wallet.yml
deleted file mode 100644
index 46445c05f0..0000000000
--- a/.github/workflows/build-test-windows-wallet.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows wallet Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows wallet Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_wallet
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test wallet code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/wallet/test_bech32m.py tests/wallet/test_chialisp.py tests/wallet/test_coin_selection.py tests/wallet/test_nft_store.py tests/wallet/test_puzzle_store.py tests/wallet/test_singleton.py tests/wallet/test_singleton_lifecycle.py tests/wallet/test_singleton_lifecycle_fast.py tests/wallet/test_taproot.py tests/wallet/test_wallet.py tests/wallet/test_wallet_blockchain.py tests/wallet/test_wallet_interested_store.py tests/wallet/test_wallet_key_val_store.py tests/wallet/test_wallet_retry.py tests/wallet/test_wallet_store.py tests/wallet/test_wallet_user_store.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/build-test-windows-weight_proof.yml b/.github/workflows/build-test-windows-weight_proof.yml
deleted file mode 100644
index 300b09f328..0000000000
--- a/.github/workflows/build-test-windows-weight_proof.yml
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows weight_proof Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows weight_proof Test
-    if: true
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_weight_proof
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-# Omitted installing Timelord
-
-    - name: Test weight_proof code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10  -n 2 -m "not benchmark" tests/weight_proof/test_weight_proof.py
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/.github/workflows/test-single.yml b/.github/workflows/test-single.yml
new file mode 100644
index 0000000000..7b85c25b3b
--- /dev/null
+++ b/.github/workflows/test-single.yml
@@ -0,0 +1,227 @@
+name: test
+
+# This reusable workflow structure was chosen for the sole purpose of working around
+# the 256 job per matrix limit.  The initial total test job count was 290.  This
+# approach shifts the 256 limit to be per OS rather than overall.  A simpler single
+# regular workflow with matrixing against the OS would be preferred.
+
+on:
+  workflow_call:
+    inputs:
+      emoji:
+        required: true
+        type: string
+      matrix:
+        required: true
+        type: string
+      name:
+        required: true
+        type: string
+      file_name:
+        required: true
+        type: string
+      concurrency_name:
+        required: true
+        type: string
+      configuration:
+        required: true
+        type: string
+      runs-on:
+        required: true
+        type: string
+
+
+concurrency:
+  # SHA is added to the end if on `main` to let all main workflows run
+  group: ${{ github.ref }}-${{ github.workflow }}-${{ inputs.concurrency_name }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: ${{ matrix.os.emoji }} ${{ matrix.configuration.name }} - ${{ matrix.python.name }}
+    runs-on: ${{ matrix.os.runs-on }}
+    timeout-minutes: ${{ matrix.configuration.job_timeout }}
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration: ${{ fromJson(inputs.configuration) }}
+        os:
+          - emoji: ${{ inputs.emoji }}
+            matrix: ${{ inputs.matrix }}
+            name: ${{ inputs.name }}
+            file_name: ${{ inputs.file_name }}
+            runs-on: ${{ inputs.runs-on }}
+        python:
+          - name: '3.7'
+            file_name: '3.7'
+            action: '3.7'
+            apt: '3.7'
+            install_sh: '3.7'
+            matrix: '3.7'
+          - name: '3.8'
+            file_name: '3.8'
+            action: '3.8'
+            apt: '3.8'
+            install_sh: '3.8'
+            matrix: '3.8'
+          - name: '3.9'
+            file_name: '3.9'
+            action: '3.9'
+            apt: '3.9'
+            install_sh: '3.9'
+            matrix: '3.9'
+          - name: '3.10'
+            file_name: '3.10'
+            action: '3.10'
+            apt: '3.10'
+            install_sh: '3.10'
+            matrix: '3.10'
+        exclude:
+          - os:
+              matrix: macos
+            python:
+              matrix: '3.7'
+          - os:
+              matrix: macos
+            python:
+              matrix: '3.8'
+          - os:
+              matrix: windows
+            configuration:
+              install_timelord: true
+          - os:
+              matrix: windows
+            configuration:
+              name: core.full_node
+
+    env:
+      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
+      JOB_FILE_NAME: tests_${{ matrix.os.file_name }}_python-${{ matrix.python.file_name }}_${{ matrix.configuration.name }}
+
+    steps:
+      - name: Configure git
+        run: |
+          git config --global core.autocrlf false
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Python environment
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python.action }}
+
+      - name: Create keychain for CI use (macOS)
+        if: matrix.os.matrix == 'macos'
+        run: |
+          security create-keychain -p foo chiachain
+          security default-keychain -s chiachain
+          security unlock-keychain -p foo chiachain
+          security set-keychain-settings -t 7200 -u chiachain
+
+      - name: Cache npm (Ubuntu)
+        if: matrix.os.matrix == 'ubuntu'
+        uses: actions/cache@v3
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: Cache pip
+        uses: actions/cache@v3
+        with:
+          # Note that new runners may break this https://github.com/actions/cache/issues/292
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Cache test blocks and plots
+        if: matrix.configuration.checkout_blocks_and_plots
+        uses: actions/cache@v3
+        id: test-blocks-plots
+        with:
+          path: |
+            ${{ github.workspace }}/.chia/blocks
+            ${{ github.workspace }}/.chia/test-plots
+          key: 0.29.0
+
+      - name: Checkout test blocks and plots (macOS, Ubuntu)
+        if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (matrix.os.matrix == 'ubuntu' || matrix.os.matrix == 'macos')
+        run: |
+          wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
+          mkdir ${{ github.workspace }}/.chia
+          mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
+
+      - name: Checkout test blocks and plots (Windows)
+        if: steps.test-blocks-plots.outputs.cache-hit != 'true' && matrix.os.matrix == 'windows'
+        run: |
+          Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
+          mkdir ${{ github.workspace }}/.chia
+          mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
+
+      - name: Install boost (macOS)
+        if: matrix.os.matrix == 'macos'
+        run: |
+          brew install boost
+
+      - name: Run install script (macOS, Ubuntu)
+        if: matrix.os.matrix == 'macos' || matrix.os.matrix == 'ubuntu'
+        env:
+          INSTALL_PYTHON_VERSION: ${{ matrix.python.install_sh }}
+        run: |
+          sh install.sh -d
+          echo "$(cd venv/bin/; pwd)" >> $GITHUB_PATH
+          echo "VIRTUAL_ENV=$(cd venv/; pwd)" >> $GITHUB_ENV
+
+      - name: Run install script (Windows)
+        if: matrix.os.matrix == 'windows'
+        env:
+          INSTALL_PYTHON_VERSION: ${{ matrix.python.install_sh }}
+        run: |
+          ./Install.ps1 -d
+          (Resolve-Path venv/Scripts/).Path >> $Env:GITHUB_PATH
+          $env_path = (Resolve-Path venv/).Path
+          Write-Output "VIRTUAL_ENV=$env_path" >> $Env:GITHUB_ENV
+
+      - name: Install timelord
+        if: matrix.configuration.install_timelord
+        run: |
+          sh install-timelord.sh -n
+          ./vdf_bench square_asm 400000
+
+      - name: Test blockchain code with pytest
+        env:
+          ENABLE_PYTEST_MONITOR: ${{ matrix.os.matrix == 'ubuntu' && matrix.configuration.enable_pytest_monitor || '' }}
+        run: |
+          coverage run --rcfile=.coveragerc --module pytest --durations=10 ${{ matrix.configuration.pytest_parallel_args[matrix.os.matrix] }} -m "not benchmark" ${{ env.ENABLE_PYTEST_MONITOR }} ${{ matrix.configuration.test_files }}
+
+      - name: Process coverage data
+        run: |
+          coverage combine --rcfile=.coveragerc
+          coverage xml --rcfile=.coveragerc -o coverage.xml
+          mkdir coverage_reports
+          cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
+          cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
+          coverage report --rcfile=.coveragerc --show-missing
+
+      - name: Publish coverage
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage
+          path: coverage_reports/*
+          if-no-files-found: error
+
+      - name: Check resource usage
+        if: matrix.os.matrix == 'ubuntu' && matrix.configuration.check_resource_usage
+        run: |
+          sqlite3 -readonly -separator " " .pymon "select item,cpu_usage,total_time,mem_usage from TEST_METRICS order by mem_usage desc;" >metrics.out
+          ./tests/check_pytest_monitor_output.py <metrics.out
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000000..f347ac022b
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,77 @@
+name: test
+
+on:
+  push:
+    branches:
+    - long_lived/**
+    - main
+    - release/**
+    tags:
+    - '**'
+  pull_request:
+    branches:
+    - '**'
+  workflow_dispatch: null
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}--${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
+  cancel-in-progress: true
+
+jobs:
+  configure:
+    name: Configure matrix
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup Python environment
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+
+      - name: Generate matrix configuration
+        id: configure
+        run: |
+          python tests/build-job-matrix.py --per directory --verbose > matrix.json
+          cat matrix.json
+          echo ::set-output name=configuration::$(cat matrix.json)
+          echo ::set-output name=steps::$(cat some.json)
+
+    outputs:
+      configuration: ${{ steps.configure.outputs.configuration }}
+
+  macos:
+    uses: ./.github/workflows/test-single.yml
+    needs: configure
+    with:
+      emoji: 🍎
+      matrix: macos
+      name: macOS
+      file_name: macos
+      concurrency_name: macos
+      configuration: ${{ needs.configure.outputs.configuration }}
+      runs-on: macos-latest
+  ubuntu:
+    uses: ./.github/workflows/test-single.yml
+    needs: configure
+    with:
+      emoji: 🐧
+      matrix: ubuntu
+      name: Ubuntu
+      file_name: ubuntu
+      concurrency_name: ubuntu
+      configuration: ${{ needs.configure.outputs.configuration }}
+      runs-on: ubuntu-latest
+  windows:
+    uses: ./.github/workflows/test-single.yml
+    needs: configure
+    with:
+      emoji: 🪟
+      matrix: windows
+      name: Windows
+      file_name: windows
+      concurrency_name: windows
+      configuration: ${{ needs.configure.outputs.configuration }}
+      runs-on: windows-latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4b1c4e0099..b2a890c288 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +1,6 @@
 repos:
 -   repo: local
     hooks:
-    -   id: build-workflows
-        name: Validate github action workflows
-        entry: ./tests/build-workflows.py --fail-on-update
-        language: python
-        pass_filenames: false
-        additional_dependencies: [typing-extensions]
     -   id: check-sql
         name: Validate SQL statements
         entry: ./tests/check_sql_statements.py
diff --git a/tests/build-job-matrix.py b/tests/build-job-matrix.py
new file mode 100644
index 0000000000..944c587ff2
--- /dev/null
+++ b/tests/build-job-matrix.py
@@ -0,0 +1,122 @@
+import argparse
+import json
+import logging
+import types
+from pathlib import Path
+from typing import Any, Dict, List
+
+import testconfig
+
+root_path = Path(__file__).parent.resolve()
+project_root_path = root_path.parent
+
+
+def skip(path: Path) -> bool:
+    return any(part.startswith(("_", ".")) for part in path.parts)
+
+
+def subdirs(per: str) -> List[Path]:
+    dirs: List[Path]
+
+    if per == "directory":
+        glob_pattern = "**/"
+    elif per == "file":
+        glob_pattern = "**/test_*.py"
+    else:
+        raise Exception(f"Unrecognized per: {per!r}")
+
+    paths = [path for path in root_path.rglob(glob_pattern) if not skip(path=path)]
+
+    if per == "directory":
+        filtered_paths = []
+        for path in paths:
+            relative_path = path.relative_to(root_path)
+            logging.info(f"Considering: {relative_path}")
+            if len([f for f in path.glob("test_*.py")]) == 0:
+                logging.info(f"Skipping {relative_path}: no tests collected")
+                continue
+
+            filtered_paths.append(path)
+
+        paths = filtered_paths
+
+    return sorted(paths)
+
+
+def module_dict(module: types.ModuleType) -> Dict[str, Any]:
+    return {k: v for k, v in module.__dict__.items() if not k.startswith("_")}
+
+
+def dir_config(dir: Path) -> Dict[str, Any]:
+    import importlib
+
+    module_name = ".".join([*dir.relative_to(root_path).parts, "config"])
+    try:
+        return module_dict(importlib.import_module(module_name))
+    except ModuleNotFoundError:
+        return {}
+
+
+# Overwrite with directory specific values
+def update_config(parent: Dict[str, Any], child: Dict[str, Any]) -> Dict[str, Any]:
+    if child is None:
+        return parent
+    conf = child
+    for k, v in parent.items():
+        if k not in child:
+            conf[k] = v
+    return conf
+
+
+# args
+arg_parser = argparse.ArgumentParser(description="Generate GitHub test matrix configuration")
+arg_parser.add_argument("--per", type=str, choices=["directory", "file"], required=True)
+arg_parser.add_argument("--verbose", "-v", action="store_true")
+args = arg_parser.parse_args()
+
+if args.verbose:
+    logging.basicConfig(format="%(asctime)s:%(message)s", level=logging.DEBUG)
+
+# main
+test_paths = subdirs(per=args.per)
+
+configuration = []
+
+for path in test_paths:
+    if path.is_dir():
+        test_files = sorted(path.glob("test_*.py"))
+        test_file_paths = [file.relative_to(project_root_path) for file in test_files]
+        paths_for_cli = " ".join(path.as_posix() for path in test_file_paths)
+    else:
+        paths_for_cli = path.relative_to(project_root_path).as_posix()
+
+    conf = update_config(module_dict(testconfig), dir_config(path))
+
+    # TODO: design a configurable system for this
+    process_count = {
+        "macos": {False: 0, True: 4}.get(conf["parallel"], conf["parallel"]),
+        "ubuntu": {False: 0, True: 4}.get(conf["parallel"], conf["parallel"]),
+        "windows": {False: 0, True: 2}.get(conf["parallel"], conf["parallel"]),
+    }
+    pytest_parallel_args = {os: f" -n {count}" for os, count in process_count.items()}
+
+    for_matrix = {
+        "check_resource_usage": conf["check_resource_usage"],
+        "enable_pytest_monitor": "-p monitor" if conf["check_resource_usage"] else "",
+        "job_timeout": conf["job_timeout"],
+        "pytest_parallel_args": pytest_parallel_args,
+        "checkout_blocks_and_plots": conf["checkout_blocks_and_plots"],
+        "install_timelord": conf["install_timelord"],
+        "test_files": paths_for_cli,
+        "name": ".".join(path.relative_to(root_path).with_suffix("").parts),
+    }
+    for_matrix = dict(sorted(for_matrix.items()))
+    configuration.append(for_matrix)
+
+
+configuration_json = json.dumps(configuration)
+
+for line in json.dumps(configuration, indent=4).splitlines():
+    logging.info(line)
+
+print(f"{configuration_json}")
diff --git a/tests/build-workflows.py b/tests/build-workflows.py
deleted file mode 100755
index ed261877f8..0000000000
--- a/tests/build-workflows.py
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/env python3
-
-# Run from the current directory.
-
-import argparse
-import sys
-
-import testconfig
-import logging
-from pathlib import Path
-from typing import Dict, List
-
-root_path = Path(__file__).parent.resolve()
-
-
-def subdirs() -> List[Path]:
-    dirs: List[Path] = []
-    for r in root_path.iterdir():
-        if r.is_dir():
-            dirs.extend(Path(r).rglob("**/"))
-    return [d for d in dirs if not (any(c.startswith("_") for c in d.parts) or any(c.startswith(".") for c in d.parts))]
-
-
-def module_dict(module):
-    return {k: v for k, v in module.__dict__.items() if not k.startswith("_")}
-
-
-def dir_config(dir):
-    import importlib
-
-    module_name = ".".join([*dir.relative_to(root_path).parts, "config"])
-    try:
-        return module_dict(importlib.import_module(module_name))
-    except ModuleNotFoundError:
-        return {}
-
-
-def read_file(filename: Path) -> str:
-    return filename.read_bytes().decode("utf8")
-
-
-# Input file
-def workflow_yaml_template_text(os):
-    return read_file(Path(root_path / f"runner_templates/build-test-{os}"))
-
-
-# Output files
-def workflow_yaml_file(dir, os, test_name):
-    return Path(dir / f"build-test-{os}-{test_name}.yml")
-
-
-# String function from test dir to test name
-def test_name(dir):
-    return "-".join(dir.relative_to(root_path).parts)
-
-
-def transform_template(template_text, replacements):
-    t = template_text
-    for r, v in replacements.items():
-        t = t.replace(r, v)
-    return t
-
-
-# Replace with update_config
-def generate_replacements(conf, dir):
-    replacements = {
-        "INSTALL_TIMELORD": read_file(Path(root_path / "runner_templates/install-timelord.include.yml")).rstrip(),
-        "CHECKOUT_TEST_BLOCKS_AND_PLOTS": read_file(
-            Path(root_path / "runner_templates/checkout-test-plots.include.yml")
-        ).rstrip(),
-        "CHECK_RESOURCE_USAGE": read_file(
-            Path(root_path / "runner_templates/check-resource-usage.include.yml")
-        ).rstrip(),
-        "ENABLE_PYTEST_MONITOR": "",
-        "TEST_FILES": "",
-        "TEST_NAME": "",
-        "PYTEST_PARALLEL_ARGS": "",
-        "RUN": "true",
-    }
-
-    # TODO: design a configurable system for this
-    if os == "windows":
-        xdist_numprocesses = {False: 0, True: 2}.get(conf["parallel"], conf["parallel"])
-    else:
-        xdist_numprocesses = {False: 0, True: 4}.get(conf["parallel"], conf["parallel"])
-
-    replacements["PYTEST_PARALLEL_ARGS"] = f" -n {xdist_numprocesses}"
-
-    if not conf["checkout_blocks_and_plots"]:
-        replacements[
-            "CHECKOUT_TEST_BLOCKS_AND_PLOTS"
-        ] = "# Omitted checking out blocks and plots repo Chia-Network/test-cache"
-    if not conf["install_timelord"]:
-        replacements["INSTALL_TIMELORD"] = "# Omitted installing Timelord"
-    if conf["job_timeout"]:
-        replacements["JOB_TIMEOUT"] = str(conf["job_timeout"])
-    test_files = sorted(dir.glob("test_*.py"))
-    test_file_paths = [file.relative_to(root_path.parent).as_posix() for file in test_files]
-    replacements["TEST_FILES"] = " ".join(test_file_paths)
-    replacements["TEST_NAME"] = test_name(dir)
-    if "test_name" in conf:
-        replacements["TEST_NAME"] = conf["test_name"]
-    if conf["check_resource_usage"]:
-        replacements["ENABLE_PYTEST_MONITOR"] = "-p monitor"
-    else:
-        replacements["CHECK_RESOURCE_USAGE"] = "# Omitted resource usage check"
-    for var in conf["custom_vars"]:
-        replacements[var] = conf[var] if var in conf else ""
-    if os in conf["os_skip"] or (conf["install_timelord"] and os == "windows"):
-        # TODO: enable timelord for windows, and stop skipping
-        replacements["RUN"] = "false"
-    return replacements
-
-
-# Overwrite with directory specific values
-def update_config(parent, child):
-    if child is None:
-        return parent
-    conf = child
-    for k, v in parent.items():
-        if k not in child:
-            conf[k] = v
-    return conf
-
-
-def dir_path(string):
-    p = Path(root_path / string)
-    if p.is_dir():
-        return p
-    else:
-        raise NotADirectoryError(string)
-
-
-# args
-arg_parser = argparse.ArgumentParser(description="Build github workflows")
-arg_parser.add_argument("--output-dir", "-d", default="../.github/workflows", type=dir_path)
-arg_parser.add_argument("--fail-on-update", "-f", action="store_true")
-arg_parser.add_argument("--verbose", "-v", action="store_true")
-args = arg_parser.parse_args()
-
-if args.verbose:
-    logging.basicConfig(format="%(asctime)s:%(message)s", level=logging.DEBUG)
-
-# main
-test_dirs = subdirs()
-current_workflows: Dict[Path, str] = {
-    file: read_file(file) for file in args.output_dir.iterdir() if str(file).endswith(".yml")
-}
-changed: bool = False
-
-for os in testconfig.oses:
-    template_text = workflow_yaml_template_text(os)
-    for dir in test_dirs:
-        if len([f for f in Path(root_path / dir).glob("test_*.py")]) == 0:
-            logging.info(f"Skipping {dir}: no tests collected")
-            continue
-        conf = update_config(module_dict(testconfig), dir_config(dir))
-        replacements = generate_replacements(conf, dir)
-        txt = transform_template(template_text, replacements)
-        # remove trailing whitespace from lines and assure a single EOF at EOL
-        txt = "\n".join(line.rstrip() for line in txt.rstrip().splitlines()) + "\n"
-        logging.info(f"Writing {os}-{test_name(dir)}")
-        workflow_yaml_path: Path = workflow_yaml_file(args.output_dir, os, test_name(dir))
-        if workflow_yaml_path not in current_workflows or current_workflows[workflow_yaml_path] != txt:
-            changed = True
-        workflow_yaml_path.write_bytes(txt.encode("utf8"))
-
-if changed:
-    print("New workflow updates available.")
-    if args.fail_on_update:
-        sys.exit(1)
-else:
-    print("Nothing to do.")
diff --git a/tests/runner_templates/__init__.py b/tests/runner_templates/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/runner_templates/build-test-macos b/tests/runner_templates/build-test-macos
deleted file mode 100644
index e43fb310cf..0000000000
--- a/tests/runner_templates/build-test-macos
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: MacOS TEST_NAME Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: MacOS TEST_NAME Tests
-    if: RUN
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: JOB_TIMEOUT
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.9', '3.10']
-        os: [macOS-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_TEST_NAME
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Create keychain for CI use
-      run: |
-        security create-keychain -p foo chiachain
-        security default-keychain -s chiachain
-        security unlock-keychain -p foo chiachain
-        security set-keychain-settings -t 7200 -u chiachain
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        # Note that new runners may break this https://github.com/actions/cache/issues/292
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-CHECKOUT_TEST_BLOCKS_AND_PLOTS
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        brew install boost
-        sh install.sh -d
-
-INSTALL_TIMELORD
-
-    - name: Test TEST_NAME code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10 PYTEST_PARALLEL_ARGS -m "not benchmark" TEST_FILES
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/tests/runner_templates/build-test-ubuntu b/tests/runner_templates/build-test-ubuntu
deleted file mode 100644
index ca93263c0e..0000000000
--- a/tests/runner_templates/build-test-ubuntu
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Ubuntu TEST_NAME Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Ubuntu TEST_NAME Test
-    if: RUN
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: JOB_TIMEOUT
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [ubuntu-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_TEST_NAME
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-CHECKOUT_TEST_BLOCKS_AND_PLOTS
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        sh install.sh -d
-
-INSTALL_TIMELORD
-
-    - name: Test TEST_NAME code with pytest
-      run: |
-        . ./activate
-        venv/bin/coverage run --rcfile=.coveragerc --module pytest --durations=10 PYTEST_PARALLEL_ARGS -m "not benchmark" ENABLE_PYTEST_MONITOR TEST_FILES
-
-    - name: Process coverage data
-      run: |
-        venv/bin/coverage combine --rcfile=.coveragerc .coverage.*
-        venv/bin/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/bin/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-CHECK_RESOURCE_USAGE
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/tests/runner_templates/build-test-windows b/tests/runner_templates/build-test-windows
deleted file mode 100644
index a571cb8b30..0000000000
--- a/tests/runner_templates/build-test-windows
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
-name: Windows TEST_NAME Test
-
-on:
-  push:
-    branches:
-      - 'long_lived/**'
-      - main
-      - 'release/**'
-    tags:
-        - '**'
-  pull_request:
-    branches:
-      - '**'
-
-concurrency:
-  # SHA is added to the end if on `main` to let all main workflows run
-  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    name: Windows TEST_NAME Test
-    if: RUN
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: JOB_TIMEOUT
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
-        os: [windows-latest]
-    env:
-      CHIA_ROOT: ${{ github.workspace }}/.chia/mainnet
-      JOB_FILE_NAME: tests_${{ matrix.os }}_python-${{ matrix.python-version }}_TEST_NAME
-
-    steps:
-    - name: Configure git
-      run: |
-        git config --global core.autocrlf false
-
-    - name: Checkout Code
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Setup Python environment
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Cache npm
-      uses: actions/cache@v3
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Get pip cache dir
-      id: pip-cache
-      run: |
-        echo "::set-output name=dir::$(pip cache dir)"
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-CHECKOUT_TEST_BLOCKS_AND_PLOTS
-
-    - name: Run install script
-      env:
-        INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
-      run: |
-        ./Install.ps1 -d
-
-INSTALL_TIMELORD
-
-    - name: Test TEST_NAME code with pytest
-      run: |
-        ./venv/Scripts/activate.ps1
-        venv/Scripts/coverage run --rcfile=.coveragerc --module pytest --durations=10 PYTEST_PARALLEL_ARGS -m "not benchmark" TEST_FILES
-
-    - name: Process coverage data
-      run: |
-        venv/Scripts/coverage combine --rcfile=.coveragerc
-        venv/Scripts/coverage xml --rcfile=.coveragerc -o coverage.xml
-        mkdir coverage_reports
-        cp .coverage "coverage_reports/.coverage.${{ env.JOB_FILE_NAME }}"
-        cp coverage.xml "coverage_reports/coverage.${{ env.JOB_FILE_NAME }}.xml"
-        venv/Scripts/coverage report --rcfile=.coveragerc --show-missing
-
-    - name: Publish coverage
-      uses: actions/upload-artifact@v3
-      with:
-        name: coverage
-        path: coverage_reports/*
-        if-no-files-found: error
-
-#
-# THIS FILE IS GENERATED. SEE https://github.com/Chia-Network/chia-blockchain/tree/main/tests#readme
-#
diff --git a/tests/runner_templates/check-resource-usage.include.yml b/tests/runner_templates/check-resource-usage.include.yml
deleted file mode 100644
index ee33af3aa5..0000000000
--- a/tests/runner_templates/check-resource-usage.include.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-    - name: Check resource usage
-      run: |
-        sqlite3 -readonly -separator " " .pymon "select item,cpu_usage,total_time,mem_usage from TEST_METRICS order by mem_usage desc;" >metrics.out
-        ./tests/check_pytest_monitor_output.py <metrics.out
diff --git a/tests/runner_templates/checkout-test-plots.include.yml b/tests/runner_templates/checkout-test-plots.include.yml
deleted file mode 100644
index a511c81b1b..0000000000
--- a/tests/runner_templates/checkout-test-plots.include.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-    - name: Cache test blocks and plots
-      uses: actions/cache@v2
-      id: test-blocks-plots
-      with:
-        path: |
-          ${{ github.workspace }}/.chia/blocks
-          ${{ github.workspace }}/.chia/test-plots
-        key: 0.29.0
-
-    - name: Checkout test blocks and plots (Linux, macOS)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && (startswith(matrix.os, 'ubuntu') || startswith(matrix.os, 'macos'))
-      run: |
-        wget -qO- https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.tar.gz | tar xzf -
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
-
-    - name: Checkout test blocks and plots (Windows)
-      if: steps.test-blocks-plots.outputs.cache-hit != 'true' && startswith(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -OutFile blocks_and_plots.zip https://github.com/Chia-Network/test-cache/archive/refs/tags/0.29.0.zip; Expand-Archive blocks_and_plots.zip -DestinationPath .
-        mkdir ${{ github.workspace }}/.chia
-        mv ${{ github.workspace }}/test-cache-0.29.0/* ${{ github.workspace }}/.chia
diff --git a/tests/runner_templates/install-timelord.include.yml b/tests/runner_templates/install-timelord.include.yml
deleted file mode 100644
index 0fbdcf20e8..0000000000
--- a/tests/runner_templates/install-timelord.include.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-    - name: Install timelord
-      run: |
-        . ./activate
-        sh install-timelord.sh -n
-        ./vdf_bench square_asm 400000
diff --git a/tests/testconfig.py b/tests/testconfig.py
index 8bf25da916..d9cd46d461 100644
--- a/tests/testconfig.py
+++ b/tests/testconfig.py
@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-from typing import List, Union
+from typing import TYPE_CHECKING, List, Union
 
-from typing_extensions import Literal
+if TYPE_CHECKING:
+    from typing_extensions import Literal
 
-Oses = Literal["macos", "ubuntu", "windows"]
-# Github actions template config.
-oses: List[Oses] = ["macos", "ubuntu", "windows"]
+    Oses = Literal["macos", "ubuntu", "windows"]
 
 # Defaults are conservative.
 parallel: Union[bool, int, Literal["auto"]] = False