rename stuff

master
lza_menace 2 years ago
parent 1d4271c8d4
commit 8ac0a5ef2c

@ -154,13 +154,13 @@ contract Main is Owned {
/// Get BOOMR token total supply
/// @return supply Amount of BOOMR tokens minted in total
function unaboomersMinted() public view returns (uint256) {
function unaboomersRadicalized() public view returns (uint256) {
return unaboomer.minted();
}
/// Get BOOMR kill count (unaboomers killed)
/// @return killCount Amount of BOOMR tokens "killed" (dead pfp)
function unaboomersBurned() public view returns (uint256) {
function unaboomersKilled() public view returns (uint256) {
return unaboomer.burned();
}
@ -228,8 +228,8 @@ contract Main is Owned {
/// @param _amount Amount of bombs to send to kill Unaboomers (dead pfps)
function sendBombs(uint256 _amount) external missionNotCompleted {
// Ensure _amount will not exceed wallet balance of bombs, Unaboomer supply, and active Unaboomers
uint256 supply = unaboomersMinted();
uint256 killed = unaboomersBurned();
uint256 supply = unaboomersRadicalized();
uint256 killed = unaboomersKilled();
require(_amount <= bombBalance(msg.sender), "not enough bombs");
require(_amount <= supply, "not enough supply");
require(_amount <= supply - killed, "not enough active boomers");

@ -57,7 +57,7 @@ contract UnaboomerTest is Test {
main.sendBombs(3);
main.sendBombs(3);
assertEq(main.leaderboard(main.leaderboardPointer()), killer);
assertEq(main.unaboomersBurned() > 0, true);
assertEq(main.unaboomersKilled() > 0, true);
console.log(main.killCount(killer));
}
@ -104,7 +104,7 @@ contract UnaboomerTest is Test {
bytes32 loc = bytes32(slot);
bytes32 mockedCurrentTokenId = bytes32(abi.encode(maxSupply - 1));
vm.store(address(boomr), loc, mockedCurrentTokenId);
assertEq(main.unaboomersMinted(), (maxSupply - 1));
assertEq(main.unaboomersRadicalized(), (maxSupply - 1));
startHoax(victim);
main.radicalizeBoomers{value: unaboomerPrice}(1);
vm.expectRevert(bytes("supply reached"));

Loading…
Cancel
Save