From b5285de77f5921075738c7a232ba8525efc51b52 Mon Sep 17 00:00:00 2001 From: benesjan Date: Mon, 4 Mar 2024 15:45:19 +0000 Subject: [PATCH] using type(uint32).max instead of 2**32 - 1 --- l1-contracts/src/core/messagebridge/NewInbox.sol | 2 +- l1-contracts/test/NewInbox.t.sol | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/l1-contracts/src/core/messagebridge/NewInbox.sol b/l1-contracts/src/core/messagebridge/NewInbox.sol index 1a8581db84f..a281c38359e 100644 --- a/l1-contracts/src/core/messagebridge/NewInbox.sol +++ b/l1-contracts/src/core/messagebridge/NewInbox.sol @@ -85,7 +85,7 @@ contract NewInbox { content: _content, secretHash: _secretHash, // TODO: nuke the following 2 values from the struct once the new message model is in place - deadline: 2 ** 32 - 1, + deadline: type(uint32).max, fee: 0 }); diff --git a/l1-contracts/test/NewInbox.t.sol b/l1-contracts/test/NewInbox.t.sol index 813636944ca..3442ebbbbda 100644 --- a/l1-contracts/test/NewInbox.t.sol +++ b/l1-contracts/test/NewInbox.t.sol @@ -38,7 +38,7 @@ contract NewInboxTest is Test { content: 0x2000000000000000000000000000000000000000000000000000000000000000, secretHash: 0x3000000000000000000000000000000000000000000000000000000000000000, fee: 0, - deadline: 0 + deadline: type(uint32).max }); } @@ -71,7 +71,7 @@ contract NewInboxTest is Test { _message.secretHash = bytes32(uint256(_message.secretHash) % Constants.P); // TODO: nuke the following 2 values from the struct once the new message model is in place - _message.deadline = 2 ** 32 - 1; + _message.deadline = type(uint32).max; _message.fee = 0; bytes32 leaf = _message.sha256ToField(); @@ -144,7 +144,7 @@ contract NewInboxTest is Test { message.recipient.version = version; // TODO: nuke the following 2 values from the struct once the new message model is in place - message.deadline = 2 ** 32 - 1; + message.deadline = type(uint32).max; message.fee = 0; inbox.insert(message.recipient, message.content, message.secretHash);