Skip to content

Commit 42f236e

Browse files
committed
rename dola to asset
1 parent f603bac commit 42f236e

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/Payroll.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ contract Payroll {
1111

1212
address public immutable treasuryAddress;
1313
address public immutable governance;
14-
IERC20 public immutable DOLA;
14+
IERC20 public immutable asset;
1515

1616
uint256 public constant SECONDS_PER_YEAR = 365 days;
1717

@@ -24,10 +24,10 @@ contract Payroll {
2424
event SetRecipient(address recipient, uint256 amount, uint256 endTime);
2525
event AmountWithdrawn(address recipient, uint256 amount);
2626

27-
constructor(address _treasuryAddress, address _governance, address _DOLA) {
27+
constructor(address _treasuryAddress, address _governance, address _asset) {
2828
treasuryAddress = _treasuryAddress;
2929
governance = _governance;
30-
DOLA = IERC20(_DOLA);
30+
asset = IERC20(_asset);
3131
}
3232

3333
function balanceOf(address _recipient) public view returns (uint256 bal) {
@@ -45,8 +45,8 @@ contract Payroll {
4545

4646
function setRecipient(address _recipient, uint256 _yearlyAmount, uint256 _endTime) external {
4747
updateRecipient(_recipient);
48-
require(msg.sender == governance, "DolaPayroll::setRecipient: only governance");
49-
require(_recipient != address(0), "DolaPayroll::setRecipient: zero address!");
48+
require(msg.sender == governance, "Payroll::setRecipient: only governance");
49+
require(_recipient != address(0), "Payroll::setRecipient: zero address!");
5050

5151
// endTime cannot be in the past
5252
if(_endTime < block.timestamp) {
@@ -70,7 +70,7 @@ contract Payroll {
7070

7171
uint256 withdrawAmount = unclaimed[msg.sender] > amount ? amount : unclaimed[msg.sender];
7272
unclaimed[msg.sender] -= withdrawAmount;
73-
require(DOLA.transferFrom(treasuryAddress, msg.sender, withdrawAmount), "DolaPayroll::withdraw: transfer failed");
73+
require(asset.transferFrom(treasuryAddress, msg.sender, withdrawAmount), "Payroll::withdraw: transfer failed");
7474

7575
emit AmountWithdrawn(msg.sender, withdrawAmount);
7676
}

test/Payroll.t.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ contract PayrollTest is Test {
3636
function test_constructor_sets_immutables() public {
3737
assertEq(payroll.treasuryAddress(), treasury);
3838
assertEq(payroll.governance(), governance);
39-
assertEq(address(payroll.DOLA()), address(dola));
39+
assertEq(address(payroll.asset()), address(dola));
4040
}
4141

4242
function test_setRecipient_only_governance() public {
4343
uint256 endTime = block.timestamp + 10;
4444
vm.prank(alice);
45-
vm.expectRevert(bytes("DolaPayroll::setRecipient: only governance"));
45+
vm.expectRevert(bytes("Payroll::setRecipient: only governance"));
4646
payroll.setRecipient(alice, 100, endTime);
4747
}
4848

4949
function test_setRecipient_zero_address_reverts() public {
5050
uint256 endTime = block.timestamp + 10;
5151
vm.prank(governance);
52-
vm.expectRevert(bytes("DolaPayroll::setRecipient: zero address!"));
52+
vm.expectRevert(bytes("Payroll::setRecipient: zero address!"));
5353
payroll.setRecipient(address(0), 100, endTime);
5454
}
5555

0 commit comments

Comments
 (0)