feat: add stateless variant (#42)

* feat: add stateless variant * fix: use proper error * fix: add comment * fix: add header * fix: add title * fix: better docs * fix: remove stateless again * fix: remove iownable
bgd-labs · Aug 8, 2024 · 6cbcb18 · 6cbcb18
1 parent 5d728d5
commit 6cbcb18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...control/UpgradableOwnableWithGuardian.sol → ...ontrol/UpgradeableOwnableWithGuardian.sol b/...control/UpgradableOwnableWithGuardian.sol → ...ontrol/UpgradeableOwnableWithGuardian.sol
@@ -8,7 +8,7 @@ import {IWithGuardian} from './interfaces/IWithGuardian.sol';
  * Forked version of https://github.com/bgd-labs/solidity-utils/blob/main/src/contracts/access-control/OwnableWithGuardian.sol
  * Relying on UpgradableOwnable & moving the storage to 7201
  */
-abstract contract UpgradableOwnableWithGuardian is OwnableUpgradeable, IWithGuardian {
+abstract contract UpgradeableOwnableWithGuardian is OwnableUpgradeable, IWithGuardian {
   /// @custom:storage-location erc7201:aave.storage.OwnableWithGuardian
   struct OwnableWithGuardian {
     address _guardian;

diff --git a/.../UpgradableOwnableWithGuardian.t copy.sol → test/UpgradeableOwnableWithGuardian.sol b/.../UpgradableOwnableWithGuardian.t copy.sol → test/UpgradeableOwnableWithGuardian.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.8.20;
 
 import 'forge-std/Test.sol';
-import {UpgradableOwnableWithGuardian} from '../src/contracts/access-control/UpgradableOwnableWithGuardian.sol';
+import {UpgradeableOwnableWithGuardian} from '../src/contracts/access-control/UpgradeableOwnableWithGuardian.sol';
 
-contract ImplOwnableWithGuardian is UpgradableOwnableWithGuardian {
+contract ImplOwnableWithGuardian is UpgradeableOwnableWithGuardian {
   function initialize(address owner, address guardian) public initializer {
     __Ownable_init(owner);
     __Ownable_With_Guardian_init(guardian);
@@ -16,7 +16,7 @@ contract ImplOwnableWithGuardian is UpgradableOwnableWithGuardian {
 }
 
 contract TestOfUpgradableOwnableWithGuardian is Test {
-  UpgradableOwnableWithGuardian public withGuardian;
+  UpgradeableOwnableWithGuardian public withGuardian;
 
   address owner = address(0x4);
   address guardian = address(0x8);
@@ -34,7 +34,7 @@ contract TestOfUpgradableOwnableWithGuardian is Test {
   function test_onlyGuardian() external {
     vm.expectRevert(
       abi.encodeWithSelector(
-        UpgradableOwnableWithGuardian.OnlyGuardianInvalidCaller.selector,
+        UpgradeableOwnableWithGuardian.OnlyGuardianInvalidCaller.selector,
         address(this)
       )
     );
@@ -44,7 +44,7 @@ contract TestOfUpgradableOwnableWithGuardian is Test {
   function test_onlyOwnerOrGuardian() external {
     vm.expectRevert(
       abi.encodeWithSelector(
-        UpgradableOwnableWithGuardian.OnlyGuardianOrOwnerInvalidCaller.selector,
+        UpgradeableOwnableWithGuardian.OnlyGuardianOrOwnerInvalidCaller.selector,
         address(this)
       )
     );
@@ -67,7 +67,7 @@ contract TestOfUpgradableOwnableWithGuardian is Test {
     vm.prank(eoa);
     vm.expectRevert(
       abi.encodeWithSelector(
-        UpgradableOwnableWithGuardian.OnlyGuardianOrOwnerInvalidCaller.selector,
+        UpgradeableOwnableWithGuardian.OnlyGuardianOrOwnerInvalidCaller.selector,
         eoa
       )
     );