From 415c2ecdf886aeafd74ca715be168c0c62c6b382 Mon Sep 17 00:00:00 2001 From: Karel Moravec Date: Thu, 24 Oct 2024 22:51:18 +0200 Subject: [PATCH] feat: change error message --- contracts/contracts/errors/IPCErrors.sol | 2 +- contracts/contracts/gateway/GatewayMessengerFacet.sol | 4 ++-- contracts/contracts/lib/LibGateway.sol | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contracts/contracts/errors/IPCErrors.sol b/contracts/contracts/errors/IPCErrors.sol index d72127dde..564600ee7 100644 --- a/contracts/contracts/errors/IPCErrors.sol +++ b/contracts/contracts/errors/IPCErrors.sol @@ -80,7 +80,7 @@ error InvalidFederationPayload(); error DuplicatedGenesisValidator(); error NotEnoughGenesisValidators(); error ValidatorPowerChangeDenied(); -error CommonParentDoesNotExist(); +error UnroutableMessage(string reason); enum InvalidXnetMessageReason { Sender, diff --git a/contracts/contracts/gateway/GatewayMessengerFacet.sol b/contracts/contracts/gateway/GatewayMessengerFacet.sol index 2fa1f144f..cc2a39d87 100644 --- a/contracts/contracts/gateway/GatewayMessengerFacet.sol +++ b/contracts/contracts/gateway/GatewayMessengerFacet.sol @@ -5,7 +5,7 @@ import {GatewayActorModifiers} from "../lib/LibGatewayActorStorage.sol"; import {IpcEnvelope, CallMsg, IpcMsgKind} from "../structs/CrossNet.sol"; import {IPCMsgType} from "../enums/IPCMsgType.sol"; import {Subnet, SubnetID, AssetKind, IPCAddress} from "../structs/Subnet.sol"; -import {InvalidXnetMessage, InvalidXnetMessageReason, CannotSendCrossMsgToItself, MethodNotAllowed, CommonParentDoesNotExist} from "../errors/IPCErrors.sol"; +import {InvalidXnetMessage, InvalidXnetMessageReason, CannotSendCrossMsgToItself, MethodNotAllowed, UnroutableMessage} from "../errors/IPCErrors.sol"; import {SubnetIDHelper} from "../lib/SubnetIDHelper.sol"; import {LibGateway, CrossMessageValidationOutcome} from "../lib/LibGateway.sol"; import {FilAddress} from "fevmate/contracts/utils/FilAddress.sol"; @@ -74,7 +74,7 @@ contract GatewayMessengerFacet is GatewayActorModifiers { } else if (outcome == CrossMessageValidationOutcome.CannotSendToItself) { revert CannotSendCrossMsgToItself(); } else if (outcome == CrossMessageValidationOutcome.CommonParentNotExist) { - revert CommonParentDoesNotExist(); + revert UnroutableMessage("no common parent"); } } diff --git a/contracts/contracts/lib/LibGateway.sol b/contracts/contracts/lib/LibGateway.sol index 062ffaed2..34b235790 100644 --- a/contracts/contracts/lib/LibGateway.sol +++ b/contracts/contracts/lib/LibGateway.sol @@ -8,7 +8,7 @@ import {SubnetID, Subnet, AssetKind, Asset} from "../structs/Subnet.sol"; import {SubnetActorGetterFacet} from "../subnet/SubnetActorGetterFacet.sol"; import {CallMsg, IpcMsgKind, IpcEnvelope, OutcomeType, BottomUpMsgBatch, BottomUpMsgBatch, BottomUpCheckpoint, ParentFinality} from "../structs/CrossNet.sol"; import {Membership} from "../structs/Subnet.sol"; -import {CannotSendCrossMsgToItself, MethodNotAllowed, MaxMsgsPerBatchExceeded, InvalidXnetMessage ,OldConfigurationNumber, NotRegisteredSubnet, InvalidActorAddress, ParentFinalityAlreadyCommitted, InvalidXnetMessageReason, CommonParentDoesNotExist} from "../errors/IPCErrors.sol"; +import {CannotSendCrossMsgToItself, MethodNotAllowed, MaxMsgsPerBatchExceeded, InvalidXnetMessage ,OldConfigurationNumber, NotRegisteredSubnet, InvalidActorAddress, ParentFinalityAlreadyCommitted, InvalidXnetMessageReason, UnroutableMessage} from "../errors/IPCErrors.sol"; import {CrossMsgHelper} from "../lib/CrossMsgHelper.sol"; import {FilAddress} from "fevmate/contracts/utils/FilAddress.sol"; import {SubnetIDHelper} from "../lib/SubnetIDHelper.sol";