From a03fc2c1079753b63f810e6e889141b6e8f8ff9d Mon Sep 17 00:00:00 2001 From: James Campbell Date: Fri, 9 Aug 2024 16:16:46 +0200 Subject: [PATCH] Fix bug with removing initialize --- contracts/contracts/coordination/InfractionCollector.sol | 5 +---- deployment/constructor_params/lynx/infraction.yml | 2 ++ tests/test_infraction.py | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/contracts/contracts/coordination/InfractionCollector.sol b/contracts/contracts/coordination/InfractionCollector.sol index 1a4f312f..18159ec8 100644 --- a/contracts/contracts/coordination/InfractionCollector.sol +++ b/contracts/contracts/coordination/InfractionCollector.sol @@ -20,10 +20,7 @@ contract InfractionCollector is OwnableUpgradeable { // Mapping to keep track of reported infractions mapping(uint32 => mapping(address => mapping(InfractionType => bool))) public infractions; - constructor( - Coordinator _coordinator, - ITACoChildApplication _tacoChildApplication - ) { + constructor(Coordinator _coordinator, ITACoChildApplication _tacoChildApplication) { coordinator = _coordinator; tacoChildApplication = _tacoChildApplication; } diff --git a/deployment/constructor_params/lynx/infraction.yml b/deployment/constructor_params/lynx/infraction.yml index 7ad4b720..1f82aa82 100644 --- a/deployment/constructor_params/lynx/infraction.yml +++ b/deployment/constructor_params/lynx/infraction.yml @@ -9,9 +9,11 @@ artifacts: constants: # See deployment/artifacts/lynx.json COORDINATOR_PROXY: "0xE9e94499bB0f67b9DBD75506ec1735486DE57770" + TACO_CHILD_PROXY: "0x42F30AEc1A36995eEFaf9536Eb62BD751F982D32" contracts: - InfractionCollector: proxy: constructor: _coordinator: $COORDINATOR_PROXY + _tacoChildApplication: $TACO_CHILD_PROXY diff --git a/tests/test_infraction.py b/tests/test_infraction.py index c9a16630..829619bf 100644 --- a/tests/test_infraction.py +++ b/tests/test_infraction.py @@ -113,12 +113,10 @@ def global_allow_list(project, deployer, coordinator): @pytest.fixture def infraction_collector(project, deployer, coordinator, application, oz_dependency): - contract = project.InfractionCollector.deploy(sender=deployer) - encoded_initializer_function = contract.initialize.encode_input(coordinator.address, application.address) + contract = project.InfractionCollector.deploy(coordinator.address, application.address, sender=deployer) proxy = oz_dependency.TransparentUpgradeableProxy.deploy( contract.address, deployer, - encoded_initializer_function, sender=deployer, ) proxy_contract = project.InfractionCollector.at(proxy.address)