move setting of message helper into depeg product constructor

etherisc · Aug 17, 2023 · eb9022e · eb9022e
1 parent d2adc6c
commit eb9022e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/contracts/DepegProduct.sol b/contracts/DepegProduct.sol
@@ -125,7 +125,8 @@ contract DepegProduct is
         address priceDataProvider,
         address token,
         address registry,
-        uint256 riskpoolId
+        uint256 riskpoolId,
+        address depegMessageHelper
     )
         Product(productName, token, POLICY_FLOW, riskpoolId, registry)
     {
@@ -141,13 +142,7 @@ contract DepegProduct is
 
         _riskpool = DepegRiskpool(poolAddress);
         _treasury = TreasuryModule(_instanceService.getTreasuryAddress());
-    }
-
 
-    function setMessageHelper(address depegMessageHelper)
-        external
-        onlyOwner
-    {
         _messageHelper = DepegMessageHelper(depegMessageHelper);
     }
 

diff --git a/scripts/depeg_product.py b/scripts/depeg_product.py
@@ -10,6 +10,7 @@
     Contract, 
     DepegProduct,
     DepegRiskpool,
+    DepegMessageHelper
 )
 
 from scripts.util import (
@@ -200,13 +201,20 @@ def __init__(self,
 
         print('2) deploy product by product owner {}'.format(
             productOwner))
+
+        print('  a) deploy message helper')
+        messageHelper = DepegMessageHelper.deploy(
+            {'from': productOwner},
+            publish_source=publishSource)            
 
+        print('  a) deploy product')
         self.product = DepegProduct.deploy(
             s2b(name),
             priceDataProvider.address,
             erc20Token.address,
             registry,
             riskpool.getId(),
+            messageHelper,
             {'from': productOwner},
             publish_source=publishSource)
 

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -186,7 +186,6 @@ def usdc_feeder(usd1, productOwner) -> UsdcPriceDataProvider:
 @pytest.fixture(scope="module")
 def gifDepegDeploy(
     instance: GifInstance,
-    messageHelper: DepegMessageHelper,
     productOwner: Account, 
     investor: Account, 
     usdc_feeder,
@@ -203,9 +202,6 @@ def gifDepegDeploy(
         riskpoolKeeper, 
         riskpoolWallet)
 
-    product = gpc.getProduct().getContract()
-    product.setMessageHelper(messageHelper, {'from': productOwner})
-
     return gpc
 
 @pytest.fixture(scope="module")