Fix imports for moved tests

This commit is contained in:
Adam Kelly 2021-03-17 09:03:32 -07:00 committed by Justin England
parent 153aa55688
commit 1c4c1d148a
7 changed files with 19 additions and 17 deletions

View File

@ -12,22 +12,11 @@ from src.types.peer_info import PeerInfo
from src.util.hash import std_hash
from src.util.ints import uint16
from tests.core.fixtures import default_400_blocks, default_1000_blocks, default_10000_blocks, empty_blockchain
from tests.core.node_height import node_height_exactly
from tests.setup_nodes import bt, self_hostname, setup_n_nodes, setup_two_nodes, test_constants
from tests.time_out_assert import time_out_assert
def node_height_at_least(node, h):
if node.full_node.blockchain.get_peak() is not None:
return node.full_node.blockchain.get_peak().height >= h
return False
def node_height_exactly(node, h):
if node.full_node.blockchain.get_peak() is not None:
return node.full_node.blockchain.get_peak().height == h
return False
@pytest.fixture(scope="session")
def event_loop():
loop = asyncio.get_event_loop()

View File

@ -31,9 +31,10 @@ from src.util.hash import std_hash
from src.util.ints import uint8, uint16, uint32, uint64
from src.util.vdf_prover import get_vdf_info_and_proof
from src.util.wallet_tools import WalletTool
from tests.connection_utils import add_dummy_connection, connect_and_get_peer
from tests.core.full_node.test_coin_store import get_future_reward_coins
from tests.core.full_node.test_full_sync import node_height_at_least
from tests.core.node_height import node_height_at_least
from tests.setup_nodes import bt, self_hostname, setup_simulators_and_wallets, test_constants
from tests.time_out_assert import time_out_assert, time_out_assert_custom_interval, time_out_messages

View File

@ -14,7 +14,9 @@ from src.types.spend_bundle import SpendBundle
from src.util.clvm import int_to_bytes
from src.util.condition_tools import conditions_for_solution
from src.util.ints import uint64
from tests.core.full_node.test_full_node import connect_and_get_peer, node_height_at_least
from tests.connection_utils import connect_and_get_peer
from tests.core.node_height import node_height_at_least
from tests.setup_nodes import bt, setup_simulators_and_wallets
from tests.time_out_assert import time_out_assert

View File

@ -12,7 +12,7 @@ from src.protocols import full_node_protocol
from src.types.peer_info import PeerInfo
from src.util.ints import uint16
from src.wallet.transaction_record import TransactionRecord
from tests.core.full_node.test_full_node import connect_and_get_peer
from tests.connection_utils import connect_and_get_peer
from tests.setup_nodes import bt, self_hostname, setup_simulators_and_wallets
from tests.time_out_assert import time_out_assert
from tests.core.fixtures import (

View File

@ -6,7 +6,7 @@ import pytest
from src.protocols import full_node_protocol
from src.types.peer_info import PeerInfo
from src.util.ints import uint16
from tests.core.full_node.test_full_node import connect_and_get_peer
from tests.connection_utils import connect_and_get_peer
from tests.setup_nodes import bt, self_hostname, setup_two_nodes, test_constants
from tests.time_out_assert import time_out_assert

10
tests/core/node_height.py Normal file
View File

@ -0,0 +1,10 @@
def node_height_at_least(node, h):
if node.full_node.blockchain.get_peak() is not None:
return node.full_node.blockchain.get_peak().height >= h
return False
def node_height_exactly(node, h):
if node.full_node.blockchain.get_peak() is not None:
return node.full_node.blockchain.get_peak().height == h
return False

View File

@ -3,7 +3,7 @@ import pytest
from src.types.peer_info import PeerInfo
from src.util.block_tools import BlockTools
from src.util.ints import uint16
from tests.core.full_node.test_full_sync import node_height_at_least
from tests.core.node_height import node_height_at_least
from tests.setup_nodes import self_hostname, setup_full_node, setup_full_system, test_constants
from tests.time_out_assert import time_out_assert