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

PullPayment rename fixes

Browse Source
This commit is contained in:
Michael J. Curry
2016-10-12 13:53:38 -04:00
parent 25d0ed0006
commit 21fb7463c7
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/Bounty.sol
View File

@ -1,5 +1,5 @@
pragma solidity ^0.4.0; pragma solidity ^0.4.0;
import './PullPaymentCapable.sol'; import './PullPayment.sol';
import './Token.sol'; import './Token.sol';
/* /*
@ -8,7 +8,7 @@ import './Token.sol';
* to be lower than its totalSupply, which would mean that it doesn't * to be lower than its totalSupply, which would mean that it doesn't
* have sufficient ether for everyone to withdraw. * have sufficient ether for everyone to withdraw.
*/ */
contract Bounty is PullPaymentCapable { contract Bounty is PullPayment {
bool public claimed; bool public claimed;
mapping(address => address) public researchers; mapping(address => address) public researchers;

4
contracts/PullPayment.sol
View File

@ -1,10 +1,10 @@
pragma solidity ^0.4.0; pragma solidity ^0.4.0;
/* /*
* PullPaymentCapable * PullPayment
* Base contract supporting async send for pull payments. * Base contract supporting async send for pull payments.
* Inherit from this contract and use asyncSend instead of send. * Inherit from this contract and use asyncSend instead of send.
*/ */
contract PullPaymentCapable { contract PullPayment {
mapping(address => uint) public payments; mapping(address => uint) public payments;
// store sent amount as credit to be pulled, called by payer // store sent amount as credit to be pulled, called by payer

4
contracts/examples/BadArrayUse.sol
View File

@ -1,8 +1,8 @@
import '../PullPaymentCapable.sol'; import '../PullPayment.sol';
// UNSAFE CODE, DO NOT USE! // UNSAFE CODE, DO NOT USE!
contract BadArrayUse is PullPaymentCapable { contract BadArrayUse is PullPayment {
address[] employees; address[] employees;
function payBonus() { function payBonus() {

4
contracts/examples/GoodArrayUse.sol
View File

@ -1,6 +1,6 @@
import '../PullPaymentCapable.sol'; import '../PullPayment.sol';
contract GoodArrayUse is PullPaymentCapable { contract GoodArrayUse is PullPayment {
address[] employees; address[] employees;
mapping(address => uint) bonuses; mapping(address => uint) bonuses;

4
contracts/examples/PullPaymentBid.sol
View File

@ -1,6 +1,6 @@
import '../PullPaymentCapable.sol'; import '../PullPayment.sol';
contract PullPaymentBid is PullPaymentCapable { contract PullPaymentBid is PullPayment {
address public highestBidder; address public highestBidder;
uint public highestBid; uint public highestBid;

6
contracts/examples/PullPaymentCapableExample.sol
View File

@ -1,7 +1,7 @@
import '../PullPaymentCapable.sol'; import '../PullPayment.sol';
// Example class using PullPaymentCapable // Example class using PullPayment
contract PullPaymentCapableExample is PullPaymentCapable { contract PullPaymentExample is PullPayment {
// test helper function to call asyncSend // test helper function to call asyncSend
function callSend(address dest, uint amount) external { function callSend(address dest, uint amount) external {
asyncSend(dest, amount); asyncSend(dest, amount);

6
contracts/examples/StoppableBid.sol
View File

@ -1,13 +1,13 @@
import '../PullPaymentCapable.sol'; import '../PullPayment.sol';
import '../Stoppable.sol'; import '../Stoppable.sol';
contract StoppableBid is Stoppable, PullPaymentCapable { contract StoppableBid is Stoppable, PullPayment {
address public highestBidder; address public highestBidder;
uint public highestBid; uint public highestBid;
function StoppableBid(address _curator) function StoppableBid(address _curator)
Stoppable(_curator) Stoppable(_curator)
PullPaymentCapable() {} PullPayment() {}
function bid() external stopInEmergency { function bid() external stopInEmergency {
if (msg.value <= highestBid) throw; if (msg.value <= highestBid) throw;