Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renamed totalShares in fairShare as it is already defined #84

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

renamed totalShares in fairShare as it is already defined #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions contracts/Moloch.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,17 +697,17 @@ contract Moloch is ReentrancyGuard {
unsafeAddToBalance(to, token, amount);
}

function fairShare(uint256 balance, uint256 shares, uint256 totalShares) internal pure returns (uint256) {
require(totalShares != 0);
function fairShare(uint256 balance, uint256 shares, uint256 totalSharesAndLoot) internal pure returns (uint256) {
require(totalSharesAndLoot != 0);

if (balance == 0) { return 0; }

uint256 prod = balance * shares;

if (prod / balance == shares) { // no overflow in multiplication above?
return prod / totalShares;
return prod / totalSharesAndLoot;
}

return (balance / totalShares) * shares;
return (balance / totalSharesAndLoot) * shares;
}
}