From 195840d6785b341b73fc015eb5bd788decb76360 Mon Sep 17 00:00:00 2001
From: Theo <theo@noreply.org>
Date: Sun, 28 May 2023 11:09:35 +0300
Subject: [PATCH] Move proprietary information to source folder

---
 remappings.txt                           |  2 +-
 {test => src}/proprietary/Parameters.sol |  3 +++
 test/MockProposal.sol                    | 23 ++++++++++++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)
 rename {test => src}/proprietary/Parameters.sol (66%)

diff --git a/remappings.txt b/remappings.txt
index 4457480..7523b20 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,4 +1,4 @@
-@proprietary/=test/proprietary/
+@proprietary/=src/proprietary/
 @interfaces/=test/interfaces/
 @root/=src/
 @forge-std/=lib/forge-std/src/
diff --git a/test/proprietary/Parameters.sol b/src/proprietary/Parameters.sol
similarity index 66%
rename from test/proprietary/Parameters.sol
rename to src/proprietary/Parameters.sol
index 51398fa..6757c38 100644
--- a/test/proprietary/Parameters.sol
+++ b/src/proprietary/Parameters.sol
@@ -7,6 +7,9 @@ contract Parameters {
     address constant _governanceAddress = 0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce;
     address constant _governanceVaultAddress = 0x2F50508a8a3D323B91336FA3eA6ae50E55f32185;
     address constant _tokenAddress = 0x77777FeDdddFfC19Ff86DB637967013e6C6A116C;
+    address constant _feeManagerAddress = 0x5f6c97C6AD7bdd0AE7E0Dd4ca33A4ED3fDabD4D7;
+    address constant _ensAddress = 0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e;
+    address constant _relayerRegistryAddress = 0x58E8dCC13BE9780fC42E8723D8EaD4CF46943dF2;
 
     // Information about token
     uint256 constant _tornMaximumSupply = 10_000_000;
diff --git a/test/MockProposal.sol b/test/MockProposal.sol
index 767a40c..7f55d3f 100644
--- a/test/MockProposal.sol
+++ b/test/MockProposal.sol
@@ -2,15 +2,16 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import { Parameters } from "@proprietary/Parameters.sol";
 import { GovernancePatchUpgrade } from "@root/v4-patch/GovernancePatchUpgrade.sol";
-import { PatchProposal, PatchProposalContractsFactory } from "@root/v4-patch/PatchProposal.sol";
+import { PatchProposal } from "@root/v4-patch/PatchProposal.sol";
 import { TornadoStakingRewards } from "@root/v4-patch/TornadoStakingRewards.sol";
+import { RelayerRegistry } from "@root/v4-patch/RelayerRegistry.sol";
+import { AdminUpgradeableProxy } from "@root/v4-patch/AdminUpgradeableProxy.sol";
 import { ProposalUtils } from "./ProposalUtils.sol";
 
 import { Test } from "@forge-std/Test.sol";
 
-contract MockProposal is Parameters, Test, ProposalUtils {
+contract MockProposal is Test, ProposalUtils {
     modifier executeCurrentProposalBefore() {
         createAndExecuteProposal();
         _;
@@ -23,8 +24,20 @@ contract MockProposal is Parameters, Test, ProposalUtils {
     }
 
     function createAndExecuteProposal() public {
-        address patchProposalFactoryAddress = address(new PatchProposalContractsFactory());
-        address proposalAddress = address(new PatchProposal(patchProposalFactoryAddress));
+        TornadoStakingRewards governanceStakingImplementation =
+            new TornadoStakingRewards(_governanceAddress, _tokenAddress, _relayerRegistryAddress);
+
+        // We don't need initialization parameters to deploy Governance Staking Proxy contract
+        bytes memory empty;
+        AdminUpgradeableProxy governanceStakingProxy =
+            new AdminUpgradeableProxy(address(governanceStakingImplementation), _governanceAddress, empty);
+
+        RelayerRegistry relayerRegistryImplementation =
+        new RelayerRegistry(_tokenAddress, _governanceAddress, _ensAddress, address(governanceStakingProxy), _feeManagerAddress);
+
+        address proposalAddress = address(
+            new PatchProposal(address(governanceStakingProxy), address(relayerRegistryImplementation))
+        );
 
         proposeAndExecute(proposalAddress);
     }