fixes

ethereum/src/Relayer.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.24;
 import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
 import {IVerifier} from "./interfaces/IVerifier.sol";
 import {IRelayer} from "./interfaces/IRelayer.sol";
-//import  "./libraries/Environment.sol";
 
 contract Relayer is IRelayer {
     IVerifier private _verifier;

ethereum/src/libraries/Environment.sol

@@ -1,19 +1,5 @@
 pragma solidity ^0.8.24;
 
-/*
-address constant TREASURY_ADDRESS = address(
-    0x0165878A594ca255338adfa4d48449f69242Eb8F
-);
-address constant MESSAGE_QUEUE_ADDRESS = address(
-    0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
-);
-address constant RELAYER_ADDRESS = address(
-    0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9
-);
-address constant VERIFIER_ADDRESS = address(
-    0x5FbDB2315678afecb367f032d93F642f64180aa3
-);
-*/
 
 // ALICE
 bytes32 constant GRC_20_GATEWAY_ADDRESS = bytes32(

ethereum/test/MessageQueue.t.sol

@@ -34,35 +34,8 @@ contract MessageQueueTest is TestHelper {
 
 
     function setUp() public override {
+        super.setUp();
         vm.startPrank(OWNER, OWNER);
-
-        ProxyContract _relayer_proxy = new ProxyContract();
-
-        ProxyContract _message_queue_proxy = new ProxyContract();
-
-        ProxyContract _treasury_proxy = new ProxyContract();
-
-        erc20_token = new ERC20Mock("wVARA");
-
-        Verifier _verifier = new Verifier();
-
-        Relayer _relayer = new Relayer(address(_verifier));
-
-
-        ERC20Treasury _treasury = new ERC20Treasury(address(_message_queue_proxy));
-        MessageQueue _message_queue = new MessageQueue(address(_relayer_proxy));
-
-        verifier = IVerifier(address(_verifier));
-
-        relayer = Relayer(address(_relayer_proxy));
-        treasury = ERC20Treasury(address(_treasury_proxy));
-        message_queue = MessageQueue(address(_message_queue_proxy));
-
-        _relayer_proxy.upgradeToAndCall(address(_relayer), "");
-        _treasury_proxy.upgradeToAndCall(address(_treasury), "");
-        _message_queue_proxy.upgradeToAndCall(address(_message_queue), "");
-
-
         erc20_token.transfer(address(treasury), 100 * (10 ** 18));
 
         vm.stopPrank();