NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests on upgradeable contracts after transpilation

Browse Source 
(cherry picked from commit 0762479dd5)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>
This commit is contained in:
Francisco Giordano
2022-03-31 23:41:05 -03:00
committed by Hadrien Croubois
parent 6096b53841
commit a57bd14c0c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/mocks/crosschain/bridges.sol
View File

@ -41,7 +41,9 @@ contract BridgeAMBMock is BaseRelayMock {
* Arbitrum * Arbitrum
*/ */
contract BridgeArbitrumL1Mock is BaseRelayMock { contract BridgeArbitrumL1Mock is BaseRelayMock {
/// @custom:oz-upgrades-unsafe-allow state-variable-immutable state-variable-assignment
address public immutable inbox = address(new BridgeArbitrumL1Inbox()); address public immutable inbox = address(new BridgeArbitrumL1Inbox());
/// @custom:oz-upgrades-unsafe-allow state-variable-immutable state-variable-assignment
address public immutable outbox = address(new BridgeArbitrumL1Outbox()); address public immutable outbox = address(new BridgeArbitrumL1Outbox());
function activeOutbox() public view returns (address) { function activeOutbox() public view returns (address) {
@ -54,10 +56,12 @@ contract BridgeArbitrumL1Mock is BaseRelayMock {
} }
contract BridgeArbitrumL1Inbox { contract BridgeArbitrumL1Inbox {
/// @custom:oz-upgrades-unsafe-allow state-variable-immutable state-variable-assignment
address public immutable bridge = msg.sender; address public immutable bridge = msg.sender;
} }
contract BridgeArbitrumL1Outbox { contract BridgeArbitrumL1Outbox {
/// @custom:oz-upgrades-unsafe-allow state-variable-immutable state-variable-assignment
address public immutable bridge = msg.sender; address public immutable bridge = msg.sender;
function l2ToL1Sender() public view returns (address) { function l2ToL1Sender() public view returns (address) {

8
contracts/mocks/crosschain/receivers.sol
View File

@ -9,10 +9,14 @@ import "../../crosschain/arbitrum/CrossChainEnabledArbitrumL2.sol";
import "../../crosschain/optimism/CrossChainEnabledOptimism.sol"; import "../../crosschain/optimism/CrossChainEnabledOptimism.sol";
import "../../crosschain/polygon/CrossChainEnabledPolygonChild.sol"; import "../../crosschain/polygon/CrossChainEnabledPolygonChild.sol";
abstract contract Receiver is Ownable, CrossChainEnabled { abstract contract Receiver is CrossChainEnabled {
// we don't use Ownable because it messes up testing for the upgradeable contracts
/// @custom:oz-upgrades-unsafe-allow state-variable-immutable state-variable-assignment
address public immutable owner = msg.sender;
function crossChainRestricted() external onlyCrossChain {} function crossChainRestricted() external onlyCrossChain {}
function crossChainOwnerRestricted() external onlyCrossChainSender(owner()) {} function crossChainOwnerRestricted() external onlyCrossChainSender(owner) {}
} }
/** /**