From afd9679dd87155aee766a24ae00aecd5166509cf Mon Sep 17 00:00:00 2001 From: girazoki Date: Thu, 23 Jan 2025 18:02:12 +0100 Subject: [PATCH] put events in the interface --- overridden_contracts/src/Gateway.sol | 3 --- overridden_contracts/src/interfaces/IOGateway.sol | 6 ++++++ overridden_contracts/test/Gateway.t.sol | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/overridden_contracts/src/Gateway.sol b/overridden_contracts/src/Gateway.sol index 9d72e94..d1fc871 100644 --- a/overridden_contracts/src/Gateway.sol +++ b/overridden_contracts/src/Gateway.sol @@ -62,9 +62,6 @@ contract Gateway is IOGateway, IInitializable, IUpgradable { using Address for address; using SafeNativeTransfer for address payable; - event UnableToProcessIndividualSlash(IOGateway.Slash slash); - event UnableToProcessSlashMessage(); - address public immutable AGENT_EXECUTOR; // Verification state diff --git a/overridden_contracts/src/interfaces/IOGateway.sol b/overridden_contracts/src/interfaces/IOGateway.sol index 0b2791b..a203e35 100644 --- a/overridden_contracts/src/interfaces/IOGateway.sol +++ b/overridden_contracts/src/interfaces/IOGateway.sol @@ -27,6 +27,12 @@ interface IOGateway is IGateway { // Emitted when the middleware contract address is changed by the owner. event MiddlewareChanged(address indexed previousMiddleware, address indexed newMiddleware); + // Emitted when the middleware fails to apply an individual slash + event UnableToProcessIndividualSlash(IOGateway.Slash slash); + + // Emitted when the middleware fails to apply the slash message + event UnableToProcessSlashMessage(); + // Slash struct, used to decode slashes, which are identified by // operatorKey to be slashed // slashFraction to be applied as parts per billion diff --git a/overridden_contracts/test/Gateway.t.sol b/overridden_contracts/test/Gateway.t.sol index b7371f2..9b287c2 100644 --- a/overridden_contracts/test/Gateway.t.sol +++ b/overridden_contracts/test/Gateway.t.sol @@ -1027,7 +1027,7 @@ contract GatewayTest is Test { (Command command, bytes memory params) = makeReportSlashesCommand(); vm.expectEmit(true, true, true, true); - emit Gateway.UnableToProcessSlashMessage(); + emit IOGateway.UnableToProcessSlashMessage(); // Expect the gateway to emit `InboundMessageDispatched` vm.expectEmit(true, false, false, false); emit IGateway.InboundMessageDispatched(assetHubParaID.into(), 1, messageID, true); @@ -1050,7 +1050,7 @@ contract GatewayTest is Test { // Expect the gateway to emit `InboundMessageDispatched` vm.expectEmit(true, true, true, true); - emit Gateway.UnableToProcessSlashMessage(); + emit IOGateway.UnableToProcessSlashMessage(); vm.expectEmit(true, false, false, false); emit IGateway.InboundMessageDispatched(assetHubParaID.into(), 1, messageID, true); @@ -1076,7 +1076,7 @@ contract GatewayTest is Test { IOGateway.Slash({operatorKey: bytes32(uint256(1)), slashFraction: 500_000, timestamp: 1}); vm.expectEmit(true, true, true, true); - emit Gateway.UnableToProcessIndividualSlash(expectedSlash); + emit IOGateway.UnableToProcessIndividualSlash(expectedSlash); vm.expectEmit(true, false, false, false); emit IGateway.InboundMessageDispatched(assetHubParaID.into(), 1, messageID, true);