NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SplitPayment improvements (#1417)

Browse Source 
* Renamed file, added events and set _addPayee to private

* unwanted file

* adjusted test

* adjusted test

* PaymentReceived event added

* Added event testing.

* Fix static tests

(cherry picked from commit a07499796a)
This commit is contained in:
cardmaniac992
2018-10-18 16:26:54 +02:00
committed by Leo Arias
parent 5f3ecd9c64
commit 6db4f0bc8f
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/payment/SplitPayment.sol → contracts/payment/PaymentSplitter.sol
View File

@ -3,13 +3,17 @@ pragma solidity ^0.4.24;
import "../math/SafeMath.sol";
/**
* @title SplitPayment
* @title PaymentSplitter
* @dev This contract can be used when payments need to be received by a group
* of people and split proportionately to some number of shares they own.
*/
contract SplitPayment {
contract PaymentSplitter {
using SafeMath for uint256;
event PayeeAdded(address account, uint256 shares);
event PaymentReleased(address to, uint256 amount);
event PaymentReceived(address from, uint256 amount);
uint256 private _totalShares;
uint256 private _totalReleased;
@ -32,7 +36,9 @@ contract SplitPayment {
/**
* @dev payable fallback
*/
function () external payable {}
function () external payable {
emit PaymentReceived(msg.sender, msg.value);
}
/**
* @return the total shares of the contract.
@ -89,6 +95,7 @@ contract SplitPayment {
_totalReleased = _totalReleased.add(payment);
account.transfer(payment);
emit PaymentReleased(account, payment);
}
/**
@ -96,7 +103,7 @@ contract SplitPayment {
* @param account The address of the payee to add.
* @param shares_ The number of shares owned by the payee.
*/
function _addPayee(address account, uint256 shares_) internal {
function _addPayee(address account, uint256 shares_) private {
require(account != address(0));
require(shares_ > 0);
require(_shares[account] == 0);
@ -104,5 +111,6 @@ contract SplitPayment {
_payees.push(account);
_shares[account] = shares_;
_totalShares = _totalShares.add(shares_);
emit PayeeAdded(account, shares_);
}
}