fix: somes-fixes (#61)

Author: Le-Caignec

test/e2e/IexecLayerZeroBridgeScript.t.sol

@@ -23,7 +23,7 @@ contract IexecLayerZeroBridgeScriptTest is Test {
     bytes32 salt = keccak256("salt");
 
     IexecLayerZeroBridgeDeploy public deployer;
-    address private liquidityUnifier;
+    address private rlcLiquidityUnifier;
     address private rlcCrosschainToken;
 
     // Forks ID
@@ -39,7 +39,7 @@ contract IexecLayerZeroBridgeScriptTest is Test {
 
         // Setup Ethereum Mainnet fork
         vm.selectFork(sepoliaFork);
-        liquidityUnifier = new RLCLiquidityUnifierDeployScript().deploy(
+        rlcLiquidityUnifier = new RLCLiquidityUnifierDeployScript().deploy(
             params.rlcToken, admin, upgrader, params.createxFactory, keccak256("salt")
         );
 
@@ -48,11 +48,15 @@ contract IexecLayerZeroBridgeScriptTest is Test {
         rlcCrosschainToken = new RLCCrosschainTokenDeployScript().deploy(
             "iEx.ec Network Token", "RLC", admin, admin, params.createxFactory, salt
         );
+
+        //Add label to make logs more readable
+        vm.label(address(rlcCrosschainToken), "rlcCrosschainToken");
+        vm.label(address(rlcLiquidityUnifier), "rlcLiquidityUnifier");
     }
 
     function testFork_Deployment_WithApproval() public {
         vm.selectFork(sepoliaFork);
-        _test_Deployment(true, liquidityUnifier);
+        _test_Deployment(true, rlcLiquidityUnifier);
     }
 
     function testFork_Deployment_WithoutApproval() public {
@@ -73,6 +77,7 @@ contract IexecLayerZeroBridgeScriptTest is Test {
                 salt
             )
         );
+        vm.label(address(iexecLayerZeroBridge), "iexecLayerZeroBridge");
 
         assertEq(iexecLayerZeroBridge.owner(), admin);
         assertEq(iexecLayerZeroBridge.token(), requireApproval ? params.rlcToken : rlcCrosschainToken);

test/units/RLCCrosschainToken.t.sol

@@ -22,16 +22,20 @@ contract RLCCrosschainTokenTest is Test {
 
     function test_Deploy() public {
         address crosschainTokenAddress = deployer.deploy(name, symbol, admin, upgrader, createx, salt);
-        RLCCrosschainToken crossChainToken = RLCCrosschainToken(crosschainTokenAddress);
-        assertEq(crossChainToken.name(), name);
-        assertEq(crossChainToken.symbol(), symbol);
-        assertEq(crossChainToken.owner(), admin);
-        assertEq(crossChainToken.hasRole(crossChainToken.DEFAULT_ADMIN_ROLE(), admin), true);
-        assertEq(crossChainToken.hasRole(crossChainToken.UPGRADER_ROLE(), upgrader), true);
+        RLCCrosschainToken rlcCrosschainToken = RLCCrosschainToken(crosschainTokenAddress);
+        assertEq(rlcCrosschainToken.name(), name);
+        assertEq(rlcCrosschainToken.symbol(), symbol);
+        assertEq(rlcCrosschainToken.owner(), admin);
+        assertEq(rlcCrosschainToken.hasRole(rlcCrosschainToken.DEFAULT_ADMIN_ROLE(), admin), true);
+        assertEq(rlcCrosschainToken.hasRole(rlcCrosschainToken.UPGRADER_ROLE(), upgrader), true);
 
         // Make sure the contract has been initialized.
         vm.expectRevert(abi.encodeWithSelector(Initializable.InvalidInitialization.selector));
-        crossChainToken.initialize(name, symbol, admin, upgrader);
+        rlcCrosschainToken.initialize(name, symbol, admin, upgrader);
+
+        //Add label to make logs more readable
+        vm.label(address(rlcCrosschainToken), "rlcCrosschainToken");
+
         // TODO check that the proxy address is saved.
     }