Merge pull request #1 from citizenwallet/refactor

Refactor

Author: acollette

src/lockers/AaveLocker.sol

@@ -41,12 +41,12 @@ contract AaveV3Locker is AbstractLocker {
         AAVE_POOL.supply(asset, amount, address(this), 0);
     }
 
-    function withdraw(address asset, uint256 amount) external override onlyOwner {
+    function withdraw(address asset, uint256 amount) external override onlyOwner returns (uint256 withdrawn) {
         // Decrease amount deposited.
         totalDeposited -= amount;
 
         // Withdraw asset from pool to the owner.
-        AAVE_POOL.withdraw(asset, amount, msg.sender);
+        withdrawn = AAVE_POOL.withdraw(asset, amount, msg.sender);
     }
 
     function collectYield(address asset) external override onlyOwner returns (uint256 yield) {

src/lockers/AbstractLocker.sol

@@ -42,7 +42,7 @@ abstract contract AbstractLocker is ILocker, Ownable {
 
     function deposit(address asset, uint256 amount) external virtual onlyOwner {}
 
-    function withdraw(address asset, uint256 amount) external virtual onlyOwner {}
+    function withdraw(address asset, uint256 amount) external virtual onlyOwner returns (uint256 withdrawn) {}
 
     function fullWithdraw(address asset) external virtual onlyOwner returns (uint256 principal, uint256 yield) {}
 

src/lockers/interfaces/ILocker.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.22;
 interface ILocker {
     function totalDeposited() external returns (uint256);
     function deposit(address asset, uint256 amount) external;
-    function withdraw(address asset, uint256 amount) external;
+    function withdraw(address asset, uint256 amount) external returns (uint256);
     function fullWithdraw(address asset) external returns (uint256, uint256);
     function collectYield(address asset) external returns (uint256);
     function getTotalValue(address asset) external returns (uint256);