From 797abae55c8d60e4c74f8c78e6770058b2c7db9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Fri, 4 Feb 2022 14:43:44 +0100 Subject: [PATCH] fixed flake varialbe resultion/resolving issue --- tests/conftest.py | 14 +++++++++++++- tests/test_core.py | 3 +-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 4bcd4ef..af49f42 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,6 +14,7 @@ import os import copy import random import tempfile +import codecs from collections import namedtuple from logging import getLogger from logging.config import dictConfig @@ -31,7 +32,9 @@ from planetmint.common.crypto import (key_pair_from_ed25519_key, from planetmint.common.exceptions import DatabaseDoesNotExist from planetmint.lib import Block from tests.utils import gen_vote -# import tests.tendermint.conftest + +from tendermint.abci import types_pb2 as types +from tendermint.crypto import keys_pb2 TEST_DB_NAME = 'planetmint_test' @@ -42,6 +45,15 @@ USER_PRIVATE_KEY = '8eJ8q9ZQpReWyQT5aFCiwtZ5wDZC4eDnCen88p3tQ6ie' USER_PUBLIC_KEY = 'JEAkEJqLbbgDRAtMm8YAjGp759Aq2qTn9eaEHUj2XePE' +@pytest.fixture +def init_chain_request(): + pk = codecs.decode(b'VAgFZtYw8bNR5TMZHFOBDWk9cAmEu3/c6JgRBmddbbI=', + 'base64') + val_a = types.ValidatorUpdate(power=10, + pub_key=keys_pb2.PublicKey(ed25519=pk)) + return types.RequestInitChain(validators=[val_a]) + + def pytest_addoption(parser): from planetmint.backend.connection import BACKENDS diff --git a/tests/test_core.py b/tests/test_core.py index a5cd47c..6d61344 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -25,7 +25,6 @@ from planetmint.tendermint_utils import public_key_to_base64 from planetmint.version import __tm_supported_versions__ from tests.utils import generate_election, generate_validators -from tests.tendermint.conftest import init_chain_request pytestmark = pytest.mark.bdb @@ -334,7 +333,7 @@ def test_deliver_transfer_tx__double_spend_fails(b, init_chain_request): .sign([alice.private_key]) result = app.deliver_tx(encode_tx_to_bytes(tx_transfer)) - assert result.code == OkCode + assert result.code == OkCode double_spend = Transaction.transfer(tx.to_inputs(), [([carly.public_key], 1)],