diff --git a/contracts/Bounty.sol b/contracts/Bounty.sol index 10f68cee1..f530ac6ad 100644 --- a/contracts/Bounty.sol +++ b/contracts/Bounty.sol @@ -1,5 +1,5 @@ pragma solidity ^0.4.0; -import './PullPaymentCapable.sol'; +import './PullPayment.sol'; import './Token.sol'; /* @@ -8,7 +8,7 @@ import './Token.sol'; * to be lower than its totalSupply, which would mean that it doesn't * have sufficient ether for everyone to withdraw. */ -contract Bounty is PullPaymentCapable { +contract Bounty is PullPayment { bool public claimed; mapping(address => address) public researchers; diff --git a/contracts/PullPayment.sol b/contracts/PullPayment.sol index 8629db3bd..5e3103e98 100644 --- a/contracts/PullPayment.sol +++ b/contracts/PullPayment.sol @@ -1,10 +1,10 @@ pragma solidity ^0.4.0; /* - * PullPaymentCapable + * PullPayment * Base contract supporting async send for pull payments. * Inherit from this contract and use asyncSend instead of send. */ -contract PullPaymentCapable { +contract PullPayment { mapping(address => uint) public payments; // store sent amount as credit to be pulled, called by payer diff --git a/contracts/examples/BadArrayUse.sol b/contracts/examples/BadArrayUse.sol index c698646f9..e534a81e0 100644 --- a/contracts/examples/BadArrayUse.sol +++ b/contracts/examples/BadArrayUse.sol @@ -1,8 +1,8 @@ -import '../PullPaymentCapable.sol'; +import '../PullPayment.sol'; // UNSAFE CODE, DO NOT USE! -contract BadArrayUse is PullPaymentCapable { +contract BadArrayUse is PullPayment { address[] employees; function payBonus() { diff --git a/contracts/examples/GoodArrayUse.sol b/contracts/examples/GoodArrayUse.sol index 492a9d352..00e0a58c1 100644 --- a/contracts/examples/GoodArrayUse.sol +++ b/contracts/examples/GoodArrayUse.sol @@ -1,6 +1,6 @@ -import '../PullPaymentCapable.sol'; +import '../PullPayment.sol'; -contract GoodArrayUse is PullPaymentCapable { +contract GoodArrayUse is PullPayment { address[] employees; mapping(address => uint) bonuses; diff --git a/contracts/examples/PullPaymentBid.sol b/contracts/examples/PullPaymentBid.sol index e4e22452a..89e538338 100644 --- a/contracts/examples/PullPaymentBid.sol +++ b/contracts/examples/PullPaymentBid.sol @@ -1,6 +1,6 @@ -import '../PullPaymentCapable.sol'; +import '../PullPayment.sol'; -contract PullPaymentBid is PullPaymentCapable { +contract PullPaymentBid is PullPayment { address public highestBidder; uint public highestBid; diff --git a/contracts/examples/PullPaymentCapableExample.sol b/contracts/examples/PullPaymentCapableExample.sol index 1925d69d6..00ddfa0eb 100644 --- a/contracts/examples/PullPaymentCapableExample.sol +++ b/contracts/examples/PullPaymentCapableExample.sol @@ -1,7 +1,7 @@ -import '../PullPaymentCapable.sol'; +import '../PullPayment.sol'; -// Example class using PullPaymentCapable -contract PullPaymentCapableExample is PullPaymentCapable { +// Example class using PullPayment +contract PullPaymentExample is PullPayment { // test helper function to call asyncSend function callSend(address dest, uint amount) external { asyncSend(dest, amount); diff --git a/contracts/examples/StoppableBid.sol b/contracts/examples/StoppableBid.sol index 072a06cc2..b8d69d081 100644 --- a/contracts/examples/StoppableBid.sol +++ b/contracts/examples/StoppableBid.sol @@ -1,13 +1,13 @@ -import '../PullPaymentCapable.sol'; +import '../PullPayment.sol'; import '../Stoppable.sol'; -contract StoppableBid is Stoppable, PullPaymentCapable { +contract StoppableBid is Stoppable, PullPayment { address public highestBidder; uint public highestBid; function StoppableBid(address _curator) Stoppable(_curator) - PullPaymentCapable() {} + PullPayment() {} function bid() external stopInEmergency { if (msg.value <= highestBid) throw;