From f67efa0db56dffea1676dbe5f2e9ff708fff5cb0 Mon Sep 17 00:00:00 2001 From: Pedro Valido <80268365+pedrovalido@users.noreply.github.com> Date: Sun, 6 Oct 2024 13:02:58 +0100 Subject: [PATCH] chore: fix nits --- scripts/deploy.py | 2 +- tests/base/test_ve_sugar.py | 2 +- tests/test_factory_registry.py | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/deploy.py b/scripts/deploy.py index bfbb528..f93e89c 100644 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -37,7 +37,7 @@ def main(): os.getenv(f'VOTER_{chain_id}'), {'from': account} ) - + if 'registry' in contract_name: FactoryRegistry.deploy( account, diff --git a/tests/base/test_ve_sugar.py b/tests/base/test_ve_sugar.py index 071fdc9..ba39224 100644 --- a/tests/base/test_ve_sugar.py +++ b/tests/base/test_ve_sugar.py @@ -21,7 +21,7 @@ def VeNFTStruct(sugar_contract): def test_initial_state(sugar_contract): - assert sugar_contract.voter() == os.getenv('VOTER_8453')) + assert sugar_contract.voter() == os.getenv('VOTER_8453') assert sugar_contract.dist() == \ os.getenv('DIST_8453') assert sugar_contract.ve() is not None diff --git a/tests/test_factory_registry.py b/tests/test_factory_registry.py index f75c14d..119166b 100644 --- a/tests/test_factory_registry.py +++ b/tests/test_factory_registry.py @@ -1,7 +1,7 @@ import os import pytest -from brownie import accounts, FactoryRegistry, reverts +from web3.constants import ADDRESS_ZERO @pytest.fixture @@ -9,13 +9,14 @@ def factory_registry(FactoryRegistry, accounts): # Deploy the contract using the first test account as the owner yield FactoryRegistry.at(os.getenv('REGISTRY_34443')) + def test_initial_state(factory_registry): - assert factory_registry.owner() == "0xd42C7914cF8dc24a1075E29C283C581bd1b0d3D3" + assert factory_registry.owner() ==\ + "0xd42C7914cF8dc24a1075E29C283C581bd1b0d3D3" def test_approve(factory_registry, accounts): owner = factory_registry.owner() - non_owner = "0x9999999999999999999999999999999999999999" pool_factory = "0x1111111111111111111111111111111111111111" pool_factory_count = factory_registry.pool_factory_count() @@ -25,6 +26,7 @@ def test_approve(factory_registry, accounts): assert factory_registry.poolFactories(0) == pool_factory assert factory_registry.pool_factory_exists(pool_factory) + def test_unapprove(factory_registry, accounts): owner = factory_registry.owner() pool_factory = "0x1111111111111111111111111111111111111111" @@ -40,7 +42,8 @@ def test_unapprove(factory_registry, accounts): assert factory_registry.pool_factory_count() == pool_factory_count assert not factory_registry.pool_factory_exists(pool_factory) + def test_factories_to_pool_factory(factory_registry): pool_factory = "0x1111111111111111111111111111111111111111" result = factory_registry.factoriesToPoolFactory(pool_factory) - assert result == ("0x0000000000000000000000000000000000000000", pool_factory) + assert result == [ADDRESS_ZERO, pool_factory]