Skip to content

Commit

Permalink
feat: removed addWant
Browse files Browse the repository at this point in the history
  • Loading branch information
GalloDaSballo committed Jan 19, 2022
1 parent 4f0ffb2 commit a9ad104
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
12 changes: 0 additions & 12 deletions contracts/RemBadger.sol
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import "../interfaces/setth/IGac.sol";
V1.Rem
* RemBadger Version
* Allows for one time dilution of ppfs by minting extra shares (briked after)
* AddedWant event to track increase in ppfs
* DepositBricked to track when deposits can no longer be done (irreversible)
*/

Expand Down Expand Up @@ -71,8 +70,6 @@ contract RemBadger is ERC20Upgradeable, SettAccessControlDefended, PausableUpgra

event FullPricePerShareUpdated(uint256 value, uint256 indexed timestamp, uint256 indexed blockNumber);

event AddedWant(address indexed from, uint256 value, uint256 indexed timestamp, uint256 indexed blockNumber);

event DepositBricked(uint256 indexed timestamp);

modifier whenNotPaused() override {
Expand Down Expand Up @@ -133,15 +130,6 @@ contract RemBadger is ERC20Upgradeable, SettAccessControlDefended, PausableUpgra
brickDeposits();
}

/// @dev Transfer funds from caller to this contract
/// @notice This will increase pricePerShare
function addWant(uint256 amount) external {
uint256 balanceBefore = token.balanceOf(address(this));
token.safeTransferFrom(msg.sender, address(this), amount);
uint256 balanceAfter = token.balanceOf(address(this));
emit AddedWant(msg.sender, balanceAfter.sub(balanceBefore), block.timestamp, block.number);
}

/// ===== Modifiers =====

function _onlyController() internal view {
Expand Down
5 changes: 2 additions & 3 deletions tests/test_remBadger_lifecycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def test_lifecycle_for_rem_badger(deployer, sett, strategy, controller, want, go

assert want.balanceOf(sett) == 0

want.approve(sett, MaxUint256, {"from": deployer})
assert sett.getPricePerFullShare() == 1e18
assert sett.totalSupply() == 0

Expand All @@ -42,15 +41,15 @@ def test_lifecycle_for_rem_badger(deployer, sett, strategy, controller, want, go
print("Diluted PPFS")
print(last_ppfs)

sett.addWant(depositAmount, {"from": deployer})
want.transfer(sett, depositAmount, {"from": deployer})

assert sett.getPricePerFullShare() > last_ppfs
last_ppfs = sett.getPricePerFullShare()

print("New ppfs 1")
print(sett.getPricePerFullShare())

sett.addWant(restOfTokens, {"from": deployer})
want.transfer(sett, restOfTokens, {"from": deployer})

assert sett.getPricePerFullShare() > last_ppfs

Expand Down

0 comments on commit a9ad104

Please sign in to comment.