tests

Author: thedavidmeister

src/concrete/deploy/ERC20PriceOracleReceiptVaultCloneDeployer.sol

@@ -23,7 +23,9 @@ struct ERC20PriceOracleReceiptVaultCloneDeployerConfig {
 }
 
 contract ERC20PriceOracleReceiptVaultCloneDeployer {
-    event Deployment(address sender, address erc20PriceOracleReceiptVault, address receipt);
+    event ERC20PriceOracleReceiptVaultCloneDeployerDeployment(
+        address sender, address erc20PriceOracleReceiptVault, address receipt
+    );
 
     address public immutable I_RECEIPT_IMPLEMENTATION;
     address public immutable I_ERC20_PRICE_ORACLE_RECEIPT_VAULT_IMPLEMENTATION;
@@ -56,7 +58,9 @@ contract ERC20PriceOracleReceiptVaultCloneDeployer {
             revert InitializeVaultFailed();
         }
 
-        emit Deployment(msg.sender, address(erc20PriceOracleReceiptVault), address(receipt));
+        emit ERC20PriceOracleReceiptVaultCloneDeployerDeployment(
+            msg.sender, address(erc20PriceOracleReceiptVault), address(receipt)
+        );
 
         return erc20PriceOracleReceiptVault;
     }

test/src/concrete/deploy/ERC20PriceOracleReceiptVaultCloneDeployer.newERC20PriceOracleReceiptVault.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std/Test.sol";
+import {Test, Vm} from "forge-std/Test.sol";
 
 import {
     ERC20PriceOracleReceiptVaultCloneDeployer,
@@ -34,7 +34,11 @@ contract ERC20PriceOracleReceiptVaultCloneDeployerNewERC20PriceOracleReceiptVaul
         deployer.newERC20PriceOracleReceiptVault(config);
     }
 
-    function testNewERC20PriceOracleReceiptVaultSuccess(ERC20PriceOracleReceiptVaultConfigV2 memory config) external {
+    function testNewERC20PriceOracleReceiptVaultSuccess(
+        address alice,
+        ERC20PriceOracleReceiptVaultConfigV2 memory config
+    ) external {
+        vm.assume(alice.code.length == 0);
         vm.assume(config.receiptVaultConfig.receipt == address(0));
         ReceiptContract receiptImplementation = new ReceiptContract();
         ERC20PriceOracleReceiptVault erc20PriceOracleReceiptVaultImplementation = new ERC20PriceOracleReceiptVault();
@@ -44,7 +48,29 @@ contract ERC20PriceOracleReceiptVaultCloneDeployerNewERC20PriceOracleReceiptVaul
                 erc20PriceOracleReceiptVaultImplementation: address(erc20PriceOracleReceiptVaultImplementation)
             })
         );
+        vm.startPrank(alice);
+        vm.recordLogs();
         ERC20PriceOracleReceiptVault vault = deployer.newERC20PriceOracleReceiptVault(config);
+        Vm.Log[] memory logs = vm.getRecordedLogs();
+        vm.stopPrank();
+
+        bool eventFound = false;
+        bytes32 eventTopic = keccak256("ERC20PriceOracleReceiptVaultCloneDeployerDeployment(address,address,address)");
+        address eventSender;
+        address eventVault;
+        address eventReceipt;
+        for (uint256 i = 0; i < logs.length; i++) {
+            if (logs[i].topics[0] == eventTopic) {
+                (eventSender, eventVault, eventReceipt) = abi.decode(logs[i].data, (address, address, address));
+                eventFound = true;
+                break;
+            }
+        }
+        assertTrue(eventFound, "ERC20PriceOracleReceiptVaultCloneDeployerDeployment event log not found");
+        assertEq(eventSender, alice);
+        assertEq(eventVault, address(vault));
+        assertEq(eventReceipt, address(vault.receipt()));
+
         assert(address(vault) != address(0));
         assert(vault.asset() == config.receiptVaultConfig.asset);
     }

test/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.newOffchainAssetReceiptVault.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std/Test.sol";
+import {Test, Vm} from "forge-std/Test.sol";
 
 import {
     OffchainAssetReceiptVaultBeaconSetDeployer,
@@ -50,7 +50,10 @@ contract OffchainAssetReceiptVaultBeaconSetDeployerNewOffchainAssetReceiptVaultT
         deployer.newOffchainAssetReceiptVault(config);
     }
 
-    function testNewOffchainAssetReceiptVault(OffchainAssetReceiptVaultConfigV2 memory config) external {
+    function testNewOffchainAssetReceiptVault(address alice, OffchainAssetReceiptVaultConfigV2 memory config)
+        external
+    {
+        vm.assume(alice.code.length == 0);
         vm.assume(config.receiptVaultConfig.receipt == address(0));
         vm.assume(config.initialAdmin != address(0));
         vm.assume(config.receiptVaultConfig.asset == address(0));
@@ -65,8 +68,28 @@ contract OffchainAssetReceiptVaultBeaconSetDeployerNewOffchainAssetReceiptVaultT
             })
         );
 
-        // expectEmit
+        vm.startPrank(alice);
+        vm.recordLogs();
         OffchainAssetReceiptVault offchainAssetReceiptVault = deployer.newOffchainAssetReceiptVault(config);
+        Vm.Log[] memory logs = vm.getRecordedLogs();
+        vm.stopPrank();
+
+        bool eventFound = false;
+        bytes32 eventTopic = keccak256("OffchainAssetReceiptVaultBeaconSetDeployerDeployment(address,address,address)");
+        address eventSender;
+        address eventVault;
+        address eventReceipt;
+        for (uint256 i = 0; i < logs.length; i++) {
+            if (logs[i].topics[0] == eventTopic) {
+                (eventSender, eventVault, eventReceipt) = abi.decode(logs[i].data, (address, address, address));
+                eventFound = true;
+                break;
+            }
+        }
+        assertTrue(eventFound, "OffchainAssetReceiptVaultBeaconSetDeployerDeployment event log not found");
+        assertEq(eventSender, alice);
+        assertEq(eventVault, address(offchainAssetReceiptVault));
+        assertEq(eventReceipt, address(offchainAssetReceiptVault.receipt()));
 
         assertEq(
             address(OffchainAssetReceiptVault(payable(offchainAssetReceiptVault)).receipt().manager()),