Remove unused import of config to avoid select_backend db import (#1018)

* Remove unused import of config to avoid select_backend db import

- Importing nimbus-eth1 config.nim causes import of select_backend
which will default cause an import of kvstore_rocksdb and thus a
require rocksdb. Remove unused one to avoid rocksdb dependency
for Fluffy.
- Remove some whitespace in bridge_client (to make fluffy CI
trigger for sure).

* Use specific cache keys for fluffy CI workflow

* Disable Fluffy CI reproducibility test
This commit is contained in:
Kim De Mey 2022-03-29 15:51:48 +02:00 committed by GitHub
parent 4696a53302
commit 392a540eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions

View File

@ -59,7 +59,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: NimBinaries path: NimBinaries
key: 'nim-linux-amd64-${{ steps.versions.outputs.nimbus_build_system }}' key: 'nim-linux-amd64-${{ steps.versions.outputs.nimbus_build_system }}-fluffy'
- name: Build Nim and Nimbus-eth1 dependencies - name: Build Nim and Nimbus-eth1 dependencies
run: | run: |
@ -215,7 +215,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: external/dlls-${{ matrix.target.cpu }} path: external/dlls-${{ matrix.target.cpu }}
key: 'dlls-${{ matrix.target.cpu }}' key: 'dlls-${{ matrix.target.cpu }}-fluffy'
- name: Install DLLs dependencies (Windows) - name: Install DLLs dependencies (Windows)
if: > if: >
@ -247,7 +247,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: NimBinaries path: NimBinaries
key: 'nim-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}' key: 'nim-${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}-fluffy'
- name: Build Nim and Nimbus-eth1 dependencies - name: Build Nim and Nimbus-eth1 dependencies
run: | run: |
@ -272,7 +272,7 @@ jobs:
env CC=gcc make ${DEFAULT_MAKE_FLAGS} fluffy-tools env CC=gcc make ${DEFAULT_MAKE_FLAGS} fluffy-tools
build/fluffy --help build/fluffy --help
# CC is needed to select correct compiler 32/64 bit # CC is needed to select correct compiler 32/64 bit
env CC=gcc CXX=g++ make ${DEFAULT_MAKE_FLAGS} fluffy-test fluffy-test-reproducibility env CC=gcc CXX=g++ make ${DEFAULT_MAKE_FLAGS} fluffy-test
- name: Run fluffy tests (Macos) - name: Run fluffy tests (Macos)
if: runner.os == 'Macos' if: runner.os == 'Macos'
@ -282,7 +282,7 @@ jobs:
make ${DEFAULT_MAKE_FLAGS} fluffy-tools make ${DEFAULT_MAKE_FLAGS} fluffy-tools
build/fluffy --help build/fluffy --help
# "-static" option will not work for osx unless static system libraries are provided # "-static" option will not work for osx unless static system libraries are provided
make ${DEFAULT_MAKE_FLAGS} fluffy-test fluffy-test-reproducibility make ${DEFAULT_MAKE_FLAGS} fluffy-test
- name: Run fluffy testnet - name: Run fluffy testnet
run: | run: |

View File

@ -11,7 +11,6 @@
import import
std/[json, macros, options, sets, strformat, tables], std/[json, macros, options, sets, strformat, tables],
../../stateless/[witness_from_tree, witness_types], ../../stateless/[witness_from_tree, witness_types],
../config,
../constants, ../constants,
../db/[db_chain, accounts_cache], ../db/[db_chain, accounts_cache],
../errors, ../errors,