Mirroristas/planetmint
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint.git synced 2025-06-07 22:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into je_fixes

Browse Source
This commit is contained in:
Jürgen Eckel 2022-02-03 00:11:21 +01:00
commit bd495e1a2f
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
planetmint/web/server.py
View File

@ -16,8 +16,7 @@ from flask_cors import CORS
import gunicorn.app.base import gunicorn.app.base
from planetmint import utils from planetmint import utils
#from planetmint import Planetmint from planetmint import Planetmint
from planetmint.lib import Planetmint
from planetmint.web.routes import add_routes from planetmint.web.routes import add_routes
from planetmint.web.strip_content_type_middleware import StripContentTypeMiddleware from planetmint.web.strip_content_type_middleware import StripContentTypeMiddleware

1
tests/elections/test_election.py
View File

@ -7,7 +7,6 @@ from planetmint.elections.election import Election
from planetmint.migrations.chain_migration_election import ChainMigrationElection from planetmint.migrations.chain_migration_election import ChainMigrationElection
from planetmint.upsert_validator.validator_election import ValidatorElection from planetmint.upsert_validator.validator_election import ValidatorElection
@pytest.mark.bdb @pytest.mark.bdb
def test_process_block_concludes_all_elections(b): def test_process_block_concludes_all_elections(b):
validators = generate_validators([1] * 4) validators = generate_validators([1] * 4)