fix: Update owner retrieval method in RLCAdapter and RLCOFT contracts to use OwnableUpgradeable

Le-Caignec · Le-Caignec · commit 0f7cbc68c98a · 2025-05-21T17:01:48.000+02:00
diff --git a/src/RLCAdapter.sol b/src/RLCAdapter.sol
@@ -39,7 +39,7 @@ contract RLCAdapter is OFTAdapterUpgradeable, UUPSUpgradeable, AccessControlDefa
         override(OwnableUpgradeable, AccessControlDefaultAdminRulesUpgradeable)
         returns (address)
     {
-        return AccessControlDefaultAdminRulesUpgradeable.owner();
+        return OwnableUpgradeable.owner();
     }
 
     function _authorizeUpgrade(address newImplementation) internal virtual override {}
diff --git a/src/RLCOFT.sol b/src/RLCOFT.sol
@@ -57,7 +57,7 @@ contract RLCOFT is OFTUpgradeable, UUPSUpgradeable, AccessControlDefaultAdminRul
         override(OwnableUpgradeable, AccessControlDefaultAdminRulesUpgradeable)
         returns (address)
     {
-        return AccessControlDefaultAdminRulesUpgradeable.owner();
+        return OwnableUpgradeable.owner();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ contract RLCAdapter is OFTAdapterUpgradeable, UUPSUpgradeable, AccessControlDefa`
`39`	`39`	`override(OwnableUpgradeable, AccessControlDefaultAdminRulesUpgradeable)`
`40`	`40`	`returns (address)`
`41`	`41`	`{`
`42`		`- return AccessControlDefaultAdminRulesUpgradeable.owner();`
	`42`	`+ return OwnableUpgradeable.owner();`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`function _authorizeUpgrade(address newImplementation) internal virtual override {}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ contract RLCOFT is OFTUpgradeable, UUPSUpgradeable, AccessControlDefaultAdminRul`
`57`	`57`	`override(OwnableUpgradeable, AccessControlDefaultAdminRulesUpgradeable)`
`58`	`58`	`returns (address)`
`59`	`59`	`{`
`60`		`- return AccessControlDefaultAdminRulesUpgradeable.owner();`
	`60`	`+ return OwnableUpgradeable.owner();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`