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

Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

Browse Source 
v2.1.1
This commit is contained in:
Francisco Giordano
2019-01-18 15:33:51 -03:00
parent bce2d68e7f ae02103e47
commit a221c17fb2
237 changed files with 8562 additions and 4937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/payment/PullPayment.sol
View File

@ -1,8 +1,8 @@
pragma solidity ^0.4.24;
pragma solidity ^0.5.0;
import "zos-lib/contracts/Initializable.sol";
import "./Escrow.sol";
import "./escrow/Escrow.sol";
/**
* @title PullPayment
@ -12,7 +12,7 @@ import "./Escrow.sol";
contract PullPayment is Initializable {
Escrow private _escrow;
function initialize() public initializer {
function initialize() internal initializer {
// conditional added to make initializer idempotent in case of diamond inheritance
if (address(_escrow) == address(0)) {
_escrow = new Escrow();
@ -24,7 +24,7 @@ contract PullPayment is Initializable {
* @dev Withdraw accumulated balance.
* @param payee Whose balance will be withdrawn.
*/
function withdrawPayments(address payee) public {
function withdrawPayments(address payable payee) public {
_escrow.withdraw(payee);
}